projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix noisy but harmless redeclaration
[freeside.git]
/
FS
/
FS
/
svc_phone.pm
diff --git
a/FS/FS/svc_phone.pm
b/FS/FS/svc_phone.pm
index
5d102ce
..
30572ec
100644
(file)
--- a/
FS/FS/svc_phone.pm
+++ b/
FS/FS/svc_phone.pm
@@
-2,7
+2,7
@@
package FS::svc_phone;
use strict;
use base qw( FS::svc_Domain_Mixin FS::location_Mixin FS::svc_Common );
use strict;
use base qw( FS::svc_Domain_Mixin FS::location_Mixin FS::svc_Common );
-use vars qw( $DEBUG $me @pw_set $conf );
+use vars qw( $DEBUG $me @pw_set $conf
$phone_name_max
);
use Data::Dumper;
use Scalar::Util qw( blessed );
use FS::Conf;
use Data::Dumper;
use Scalar::Util qw( blessed );
use FS::Conf;
@@
-23,6
+23,7
@@
$DEBUG = 0;
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::svc_acct'} = sub {
$conf = new FS::Conf;
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::svc_acct'} = sub {
$conf = new FS::Conf;
+ $phone_name_max = $conf->config('svc_phone-phone_name-max_length');
};
=head1 NAME
};
=head1 NAME
@@
-383,6
+384,10
@@
sub check {
;
return $error if $error;
;
return $error if $error;
+ return 'Name ('. $self->phone_name.
+ ") is longer than $phone_name_max characters"
+ if $phone_name_max && length($self->phone_name) > $phone_name_max;
+
$self->countrycode(1) unless $self->countrycode;
unless ( length($self->sip_password) ) {
$self->countrycode(1) unless $self->countrycode;
unless ( length($self->sip_password) ) {