diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-12-10 12:45:04 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-12-10 12:45:04 -0800 |
| commit | 697ce57e2b1f31adb3b938dead83e160e8d115c0 (patch) | |
| tree | 91607a78a6633ee9ad36c17ae5eee1eb3912baec | |
| parent | bb9d757fad2caf10437ddea9feee3a15e5ec3a3b (diff) | |
don't generate random sip_password values if you set it to fixed+blank, RT#25239
| -rw-r--r-- | FS/FS/svc_phone.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm index 887f7bed3..eb06dc15e 100644 --- a/FS/FS/svc_phone.pm +++ b/FS/FS/svc_phone.pm @@ -239,7 +239,7 @@ Class method which returns an SQL fragment to search for the given string. sub search_sql { my( $class, $string ) = @_; - my $conf = new FS::Conf; + #my $conf = new FS::Conf; if ( $conf->exists('svc_phone-allow_alpha_phonenum') ) { $string =~ s/\W//g; @@ -464,7 +464,11 @@ and replace methods. sub check { my $self = shift; - my $conf = new FS::Conf; + #my $conf = new FS::Conf; + + my $x = $self->setfixed; + return $x unless ref($x); + my $part_svc = $x; my $phonenum = $self->phonenum; my $phonenum_check_method; @@ -546,8 +550,9 @@ sub check { return "SIP password must be shorter than $passwordmax characters" if length($self->sip_password) > $passwordmax; - } else { # option for this? + } elsif ( $part_svc->part_svc_column('sip_password')->columnflag ne 'F' ) { + # option for this? $self->sip_password( join('', map $pw_set[ int(rand $#pw_set) ], (1..min($passwordmax,16)) ) ); @@ -648,7 +653,7 @@ sub radius_check { my $self = shift; my %check = (); - my $conf = new FS::Conf; + #my $conf = new FS::Conf; my $password; if ( $conf->config('svc_phone-radius-password') eq 'countrycode_phonenum' ) { |