X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcontact.pm;h=148fa6157f01c02f87457b9b0088479cb90eb70c;hb=9813252ec987e72242efa564c7a927b111f9222a;hp=4a1fb39bae49e683c6c9d771cc64ca2bc2103d84;hpb=97105665715dd56465db126082919a319c71c2e2;p=freeside.git diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm index 4a1fb39ba..148fa6157 100644 --- a/FS/FS/contact.pm +++ b/FS/FS/contact.pm @@ -1,7 +1,9 @@ package FS::contact; -use base qw( FS::Record ); +use base qw( FS::Password_Mixin + FS::Record ); use strict; +use vars qw( $skip_fuzzyfiles ); use Scalar::Util qw( blessed ); use FS::Record qw( qsearch qsearchs dbh ); use FS::prospect_main; @@ -12,6 +14,9 @@ use FS::contact_phone; use FS::contact_email; use FS::queue; use FS::cust_pkg; +use FS::phone_type; #for cgi_contact_fields + +$skip_fuzzyfiles = 0; =head1 NAME @@ -34,8 +39,9 @@ FS::contact - Object methods for contact records =head1 DESCRIPTION -An FS::contact object represents an example. FS::contact inherits from -FS::Record. The following fields are currently supported: +An FS::contact object represents an specific contact person for a prospect or +customer. FS::contact inherits from FS::Record. The following fields are +currently supported: =over 4 @@ -94,15 +100,13 @@ disabled =item new HASHREF -Creates a new example. To add the example to the database, see L<"insert">. +Creates a new contact. To add the contact to the database, see L<"insert">. Note that this stores the hash reference, not a distinct copy of the hash it points to. You can ask the object for a copy with the I method. =cut -# the new method can be inherited from FS::Record, if a table method is defined - sub table { 'contact'; } =item insert @@ -126,6 +130,8 @@ sub insert { my $dbh = dbh; my $error = $self->SUPER::insert; + $error ||= $self->insert_password_history; + if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; @@ -166,7 +172,7 @@ sub insert { } - #unless ( $import || $skip_fuzzyfiles ) { + unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) { #warn " queueing fuzzyfiles update\n" # if $DEBUG > 1; $error = $self->queue_fuzzyfiles_update; @@ -174,9 +180,9 @@ sub insert { $dbh->rollback if $oldAutoCommit; return "updating fuzzy search cache: $error"; } - #} + } - if ( $self->selfservice_access ) { + if ( $self->selfservice_access && ! length($self->_password) ) { my $error = $self->send_reset_email( queue=>1 ); if ( $error ) { $dbh->rollback if $oldAutoCommit; @@ -196,8 +202,6 @@ Delete this record from the database. =cut -# the delete method can be inherited from FS::Record - sub delete { my $self = shift; @@ -229,7 +233,8 @@ sub delete { } } - my $error = $self->SUPER::delete; + my $error = $self->delete_password_history + || $self->SUPER::delete; if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; @@ -267,12 +272,15 @@ sub replace { my $dbh = dbh; my $error = $self->SUPER::replace($old); + if ( $old->_password ne $self->_password ) { + $error ||= $self->insert_password_history; + } if ( $error ) { $dbh->rollback if $oldAutoCommit; return $error; } - foreach my $pf ( grep { /^phonetypenum(\d+)$/ && $self->get($_) } + foreach my $pf ( grep { /^phonetypenum(\d+)$/ } keys %{ $self->hashref } ) { $pf =~ /^phonetypenum(\d+)$/ or die "wtf (daily, the)"; my $phonetypenum = $1; @@ -280,10 +288,26 @@ sub replace { my %cp = ( 'contactnum' => $self->contactnum, 'phonetypenum' => $phonetypenum, ); - my $contact_phone = qsearchs('contact_phone', \%cp) - || new FS::contact_phone \%cp; + my $contact_phone = qsearchs('contact_phone', \%cp); + + my $pv = $self->get($pf); + $pv =~ s/\s//g; + + #if new value is empty, delete old entry + if (!$pv) { + if ($contact_phone) { + $error = $contact_phone->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + next; + } + + $contact_phone ||= new FS::contact_phone \%cp; - my %cpd = _parse_phonestring( $self->get($pf) ); + my %cpd = _parse_phonestring( $pv ); $contact_phone->set( $_ => $cpd{$_} ) foreach keys %cpd; my $method = $contact_phone->contactphonenum ? 'replace' : 'insert'; @@ -323,7 +347,7 @@ sub replace { } - #unless ( $import || $skip_fuzzyfiles ) { + unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) { #warn " queueing fuzzyfiles update\n" # if $DEBUG > 1; $error = $self->queue_fuzzyfiles_update; @@ -331,7 +355,7 @@ sub replace { $dbh->rollback if $oldAutoCommit; return "updating fuzzy search cache: $error"; } - #} + } if ( ( $old->selfservice_access eq '' && $self->selfservice_access && ! $self->_password @@ -352,7 +376,15 @@ sub replace { } -#i probably belong in contact_phone.pm +=item _parse_phonestring PHONENUMBER_STRING + +Subroutine, takes a string and returns a list (suitable for assigning to a hash) +with keys 'countrycode', 'phonenum' and 'extension' + +(Should probably be moved to contact_phone.pm, hence the initial underscore.) + +=cut + sub _parse_phonestring { my $value = shift; @@ -415,15 +447,12 @@ sub queue_fuzzyfiles_update { =item check -Checks all fields to make sure this is a valid example. If there is +Checks all fields to make sure this is a valid contact. If there is an error, returns the error, otherwise returns false. Called by the insert and replace methods. =cut -# the check method should currently be supplied - FS::Record contains some -# data checking routines - sub check { my $self = shift; @@ -458,6 +487,13 @@ sub check { $self->SUPER::check; } +=item line + +Returns a formatted string representing this contact, including name, title and +comment. + +=cut + sub line { my $self = shift; my $data = $self->first. ' '. $self->last; @@ -480,6 +516,23 @@ sub contact_class { qsearchs('contact_class', { 'classnum' => $self->classnum } ); } +=item firstlast + +Returns a formatted string representing this contact, with just the name. + +=cut + +sub firstlast { + my $self = shift; + $self->first . ' ' . $self->last; +} + +=item contact_classname + +Returns the name of this contact's class (see L). + +=cut + sub contact_classname { my $self = shift; my $contact_class = $self->contact_class or return ''; @@ -506,6 +559,13 @@ sub cust_pkg { qsearch('cust_pkg', { 'contactnum' => $self->contactnum } ); } +=item by_selfservice_email EMAILADDRESS + +Alternate search constructor (class method). Given an email address, +returns the contact for that address, or the empty string if no contact +has that email address. + +=cut sub by_selfservice_email { my($class, $email) = @_; @@ -554,9 +614,22 @@ sub authenticate_password { } +=item change_password NEW_PASSWORD + +Changes the contact's selfservice access password to NEW_PASSWORD. This does +not check password policy rules (see C) and will return +an error only if editing the record fails for some reason. + +If NEW_PASSWORD is the same as the existing password, this does nothing. + +=cut + sub change_password { my($self, $new_password) = @_; + # do nothing if the password is unchanged + return if $self->authenticate_password($new_password); + $self->change_password_fields( $new_password ); $self->replace; @@ -602,7 +675,10 @@ sub send_reset_email { 'svcnum' => $opt{'svcnum'}, }; - my $timeout = '24 hours'; #? + + my $conf = new FS::Conf; + my $timeout = + ($conf->config('selfservice-password_reset_hours') || 24 ). ' hours'; my $reset_session_id; do { @@ -654,6 +730,31 @@ sub myaccount_cache { } ); } +=item cgi_contact_fields + +Returns a list reference containing the set of contact fields used in the web +interface for one-line editing (i.e. excluding contactnum, prospectnum, custnum +and locationnum, as well as password fields, but including fields for +contact_email and contact_phone records.) + +=cut + +sub cgi_contact_fields { + #my $class = shift; + + my @contact_fields = qw( + classnum first last title comment emailaddress selfservice_access + ); + + push @contact_fields, 'phonetypenum'. $_->phonetypenum + foreach qsearch({table=>'phone_type', order_by=>'weight'}); + + \@contact_fields; + +} + +use FS::phone_type; + =back =head1 BUGS