[freeside-commits] branch master updated. 697ce57e2b1f31adb3b938dead83e160e8d115c0

[Ivan]

The branch, master has been updated
       via  697ce57e2b1f31adb3b938dead83e160e8d115c0 (commit)
      from  bb9d757fad2caf10437ddea9feee3a15e5ec3a3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 697ce57e2b1f31adb3b938dead83e160e8d115c0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 10 12:45:04 2013 -0800

    don't generate random sip_password values if you set it to fixed+blank, RT#25239

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index 887f7be..eb06dc1 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' ) {

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/svc_phone.pm |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)