From: ivan <ivan>
Date: Tue, 1 Feb 2011 10:50:19 +0000 (+0000)
Subject: add username-pound config
X-Git-Tag: freeside_2_1_2~86
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b4e895b6ad85777e03e13948a86a8ce954d70a9b;p=freeside.git

add username-pound config
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c13915baf..76bb55451 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4262,6 +4262,13 @@ and customer address. Include units.',
 		     ],
   },
 
+  { 
+    'key'         => 'username-pound',
+    'section'     => 'username',
+    'description' => 'Allow the pound character (#) in usernames.',
+    'type'        => 'checkbox',
+  },
+
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 528c30b52..57441e9ff 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -9,7 +9,7 @@ use vars qw( $DEBUG $me $conf $skip_fuzzyfiles
              $username_ampersand $username_letter $username_letterfirst
              $username_noperiod $username_nounderscore $username_nodash
              $username_uppercase $username_percent $username_colon
-             $username_slash $username_equals
+             $username_slash $username_equals $username_pound
              $password_noampersand $password_noexclamation
              $warning_template $warning_from $warning_subject $warning_mimetype
              $warning_cc
@@ -77,6 +77,7 @@ FS::UID->install_callback( sub {
   $username_colon = $conf->exists('username-colon');
   $username_slash = $conf->exists('username-slash');
   $username_equals = $conf->exists('username-equals');
+  $username_pound = $conf->exists('username-pound');
   $password_noampersand = $conf->exists('password-noexclamation');
   $password_noexclamation = $conf->exists('password-noexclamation');
   $dirhash = $conf->config('dirhash') || 0;
@@ -1247,7 +1248,7 @@ sub check {
 
   my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
 
-  $recref->{username} =~ /^([a-z0-9_\-\.\&\%\:\/\=]{$usernamemin,$ulen})$/i
+  $recref->{username} =~ /^([a-z0-9_\-\.\&\%\:\/\=\#]{$usernamemin,$ulen})$/i
     or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
   $recref->{username} = $1;
 
@@ -1283,6 +1284,10 @@ sub check {
   unless ( $username_equals ) {
     $recref->{username} =~ /\=/ and return gettext('illegal_username');
   }
+  unless ( $username_pound ) {
+    $recref->{username} =~ /\#/ and return gettext('illegal_username');
+  }
+
 
   $recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
   $recref->{popnum} = $1;