projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45c72d1
)
RT# 75817 - fixed selecting random password on custmain page
author
Christopher Burger
<burgerc@freeside.biz>
Tue, 25 Sep 2018 17:19:46 +0000
(13:19 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Tue, 25 Sep 2018 17:19:46 +0000
(13:19 -0400)
FS/FS/Conf.pm
patch
|
blob
|
history
httemplate/elements/change_password.html
patch
|
blob
|
history
httemplate/elements/random_pass.html
patch
|
blob
|
history
httemplate/misc/process/change-password.html
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
302bae7
..
fd05231
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-1814,7
+1814,7
@@
and customer address. Include units.',
{
'key' => 'passwordmin',
'section' => 'password',
{
'key' => 'passwordmin',
'section' => 'password',
- 'description' => 'Minimum password length (default
6
)',
+ 'description' => 'Minimum password length (default
8
)',
'type' => 'text',
},
'type' => 'text',
},
diff --git
a/httemplate/elements/change_password.html
b/httemplate/elements/change_password.html
index
65b7d85
..
068d7d7
100644
(file)
--- a/
httemplate/elements/change_password.html
+++ b/
httemplate/elements/change_password.html
@@
-44,7
+44,8
@@
function <%$pre%>toggle(toggle, clear) {
if (clear) {
document.getElementById('<%$pre%>password').value = '';
document.getElementById('<%$pre%>password_result').innerHTML = '';
if (clear) {
document.getElementById('<%$pre%>password').value = '';
document.getElementById('<%$pre%>password_result').innerHTML = '';
-}
+ document.getElementById('<%$change_button_id%>').disabled = true;
+ }
document.getElementById('<%$pre%>div').style.display =
toggle ? 'inline-block' : 'none';
% if (!$opt{'no_label_display'}) {
document.getElementById('<%$pre%>div').style.display =
toggle ? 'inline-block' : 'none';
% if (!$opt{'no_label_display'}) {
diff --git
a/httemplate/elements/random_pass.html
b/httemplate/elements/random_pass.html
index
778aa20
..
3a632b9
100644
(file)
--- a/
httemplate/elements/random_pass.html
+++ b/
httemplate/elements/random_pass.html
@@
-19,6
+19,7
@@
function <% $id %>randomPass() {
for(var j, x, i = pass.length; i; j = Math.floor(Math.random() * i), x = pass[--i], pass[i] = pass[j], pass[j] = x);
pass = pass.join('');
document.getElementById('<% $id %>').value = pass;
for(var j, x, i = pass.length; i; j = Math.floor(Math.random() * i), x = pass[--i], pass[i] = pass[j], pass[j] = x);
pass = pass.join('');
document.getElementById('<% $id %>').value = pass;
+ document.getElementById('<% $id %>_result').innerHTML = '<IMG SRC="<% $p %>images/tick.png" style="width: 1em; display: inline-block; padding-right: .5em"> <SPAN STYLE="color: green;">Password valid!</SPAN>';
% if ($submitid) {
document.getElementById('<% $submitid %>').disabled = false;
% }
% if ($submitid) {
document.getElementById('<% $submitid %>').disabled = false;
% }
diff --git
a/httemplate/misc/process/change-password.html
b/httemplate/misc/process/change-password.html
index
37ad6d9
..
1c746a4
100644
(file)
--- a/
httemplate/misc/process/change-password.html
+++ b/
httemplate/misc/process/change-password.html
@@
-18,7
+18,15
@@
<% $cgi->redirect($fsurl.'view/svc_acct.cgi?'.$cgi->query_string) %>
% }
% elsif ($contactnum) {
<% $cgi->redirect($fsurl.'view/svc_acct.cgi?'.$cgi->query_string) %>
% }
% elsif ($contactnum) {
- <% $cgi->redirect($fsurl.'view/cust_main.cgi?'.$cgi->param('custnum')) %>
+% my $freeside_status = "Contact ".$contact->{'Hash'}->{'first'}." ".$contact->{'Hash'}->{'last'}." password updated.";
+ <% $cgi->redirect( -uri => popurl(3). "view/cust_main.cgi?". $cgi->param('custnum'),
+ -cookie => CGI::Cookie->new(
+ -name => 'freeside_status',
+ -value => mt($freeside_status),
+ -expires => '+5m',
+ ),
+ )
+%>
% }
% }
% }
% }
@@
-30,6
+38,7
@@
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
+my $contact;
$cgi->param('svcnum') =~ /^(\d+)$/ or die "illegal svcnum" if $cgi->param('svcnum');
my $svcnum = $1;
$cgi->param('svcnum') =~ /^(\d+)$/ or die "illegal svcnum" if $cgi->param('svcnum');
my $svcnum = $1;
@@
-65,7
+74,7
@@
if ($svcnum) {
$cgi->delete('password');
}
elsif ($contactnum) {
$cgi->delete('password');
}
elsif ($contactnum) {
-
my
$contact = qsearchs('contact', { 'contactnum' => $contactnum } )
+ $contact = qsearchs('contact', { 'contactnum' => $contactnum } )
or return { 'error' => "Contact not found" . $contactnum };
$error = $contact->is_password_allowed($newpass)
or return { 'error' => "Contact not found" . $contactnum };
$error = $contact->is_password_allowed($newpass)