projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
37669 Fix typo
[freeside.git]
/
httemplate
/
pref
/
pref-process.html
diff --git
a/httemplate/pref/pref-process.html
b/httemplate/pref/pref-process.html
index
6b94f71
..
68f0f6e
100644
(file)
--- a/
httemplate/pref/pref-process.html
+++ b/
httemplate/pref/pref-process.html
@@
-13,34
+13,35
@@
if ( FS::Conf->new->exists('disable_acl_changes') ) {
}
my $error = '';
}
my $error = '';
-my $access_user = '';
-if ( grep { $cgi->param($_) !~ /^\s*$/ }
- qw(_password new_password new_password2)
+if ( FS::Auth->auth_class->can('change_password')
+ && grep { $cgi->param($_) !~ /^\s*$/ }
+ qw(_password new_password new_password2)
) {
) {
- $access_user = qsearchs( 'access_user', {
- 'username' => getotaker,
- '_password' => scalar($cgi->param('_password')),
- } );
+ if ( $cgi->param('new_password') ne $cgi->param('new_password2') ) {
+ $error = "New passwords don't match";
- $error = 'Current password incorrect; password not changed'
-
unless $access_user
;
+ } elsif ( ! length($cgi->param('new_password')) ) {
+
$error = 'No new password entered'
;
- $error ||= "New passwords don't match"
- unless $cgi->param('new_password') eq $cgi->param('new_password2');
+ } elsif ( ! FS::Auth->authenticate( $FS::CurrentUser::CurrentUser,
+ scalar($cgi->param('_password')) )
+ ) {
+ $error = 'Current password incorrect; password not changed';
- $error ||= "No new password entered"
- unless length($cgi->param('new_password'));
+ } else {
- $access_user->_password($cgi->param('new_password')) unless $error;
+ $error = $FS::CurrentUser::CurrentUser->change_password(
+ scalar($cgi->param('new_password'))
+ );
-} else {
-
- $access_user = $FS::CurrentUser::CurrentUser;
+ }
}
}
+my $access_user = $FS::CurrentUser::CurrentUser;
+
#well, if you got your password change wrong, you don't get anything else
#changed right now. but it should be sticky on the form
unless ( $error ) { # if ($access_user) {
#well, if you got your password change wrong, you don't get anything else
#changed right now. but it should be sticky on the form
unless ( $error ) { # if ($access_user) {
@@
-53,6
+54,8
@@
unless ( $error ) { # if ($access_user) {
spreadsheet_format mobile_menu
enable_fuzzy_on_exact
disable_html_editor disable_enter_submit_onetimecharge
spreadsheet_format mobile_menu
enable_fuzzy_on_exact
disable_html_editor disable_enter_submit_onetimecharge
+ enable_mask_clipboard_hack dashboard_customers
+ customer_view_emails
email_address
snom-ip snom-username snom-password
vonage-fromnumber vonage-username vonage-password
email_address
snom-ip snom-username snom-password
vonage-fromnumber vonage-username vonage-password
@@
-82,7
+85,7
@@
if ( !$error and ($FS::TicketSystem::system || '') eq 'RT_Internal' ) {
FS::TicketSystem->init;
my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
# Bypass RT ModifySelf ACL
FS::TicketSystem->init;
my $UserObj = FS::TicketSystem->session('')->{'CurrentUser'}->UserObj;
# Bypass RT ModifySelf ACL
- $UserObj->CurrentUser( RT::SystemUser );
+ $UserObj->CurrentUser(
$
RT::SystemUser );
if ( $UserObj->Lang ne $locale ) {
my ($val, $msg) = $UserObj->SetLang($locale);
$error = $msg if !$val;
if ( $UserObj->Lang ne $locale ) {
my ($val, $msg) = $UserObj->SetLang($locale);
$error = $msg if !$val;