From: ivan <ivan>
Date: Mon, 5 Oct 2009 23:36:08 +0000 (+0000)
Subject: remove annoying warning: Use of uninitialized value $FS::svc_acct::passwordmin in... 
X-Git-Tag: root_of_svc_elec_features~806
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=5a7134df962defd3d7771a77952be07d1610959a

remove annoying warning: Use of uninitialized value $FS::svc_acct::passwordmin in pattern match (m//) at /usr/local/share/perl/5.10.0/FS/svc_acct.pm line 60.
---

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9f54317c6..1b1265476 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -57,7 +57,10 @@ FS::UID->install_callback( sub {
   $usernamemin = $conf->config('usernamemin') || 2;
   $usernamemax = $conf->config('usernamemax');
   $passwordmin = $conf->config('passwordmin'); # || 6;
-  $passwordmin = ( $passwordmin =~ /\d+/ ) ? $passwordmin : 6; #blank->6, keep 0
+  #blank->6, keep 0
+  $passwordmin = ( defined($passwordmin) && $passwordmin =~ /\d+/ )
+                   ? $passwordmin
+                   : 6;
   $passwordmax = $conf->config('passwordmax') || 8;
   $username_letter = $conf->exists('username-letter');
   $username_letterfirst = $conf->exists('username-letterfirst');