# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Members;
-use Koha::Borrower::Modifications;
+use C4::Form::MessagingPreferences;
+use Koha::AuthUtils;
+use Koha::Patrons;
+use Koha::Patron::Consent;
+use Koha::Patron::Modifications;
my $cgi = new CGI;
my $dbh = C4::Context->dbh;
}
my $token = $cgi->param('token');
-my $m = Koha::Borrower::Modifications->new( verification_token => $token );
+my $m = Koha::Patron::Modifications->find( { verification_token => $token } );
my ( $template, $borrowernumber, $cookie );
-if ( $m->Verify() ) {
+
+if (
+ $m # The token exists and the email is unique if requested
+ and not(
+ C4::Context->preference('PatronSelfRegistrationEmailMustBeUnique')
+ and Koha::Patrons->search( { email => $m->email } )->count
+ )
+ )
+{
( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "opac-registration-confirmation.tmpl",
+ template_name => "opac-registration-confirmation.tt",
type => "opac",
query => $cgi,
authnotrequired => 1,
}
);
- $template->param(
- OpacPasswordChange => C4::Context->preference('OpacPasswordChange') );
-
- my $borrower = $m->GetModifications();
+ my $patron_attrs = $m->unblessed;
+ $patron_attrs->{password} ||= Koha::AuthUtils::generate_password;
+ my $consent_dt = delete $patron_attrs->{gdpr_proc_consent};
+ $patron_attrs->{categorycode} ||= C4::Context->preference('PatronSelfRegistrationDefaultCategory');
+ delete $patron_attrs->{timestamp};
+ delete $patron_attrs->{verification_token};
+ delete $patron_attrs->{changed_fields};
+ my $patron = Koha::Patron->new( $patron_attrs )->store;
- my $password;
- ( $borrowernumber, $password ) = AddMember_Opac(%$borrower);
+ Koha::Patron::Consent->new({ borrowernumber => $patron->borrowernumber, type => 'GDPR_PROCESSING', given_on => $consent_dt })->store if $consent_dt;
- if ($borrowernumber) {
- $m->DelModifications();
+ if ($patron) {
+ $m->delete();
+ C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences');
- $template->param( password_cleartext => $password );
- $template->param(
- borrower => GetMember( borrowernumber => $borrowernumber ) );
+ $template->param( password_cleartext => $patron->plain_text_password );
+ $template->param( borrower => $patron );
$template->param(
PatronSelfRegistrationAdditionalInstructions =>
C4::Context->preference(
'PatronSelfRegistrationAdditionalInstructions')
);
+
+ my ($theme, $news_lang, $availablethemes) = C4::Templates::themelanguage(C4::Context->config('opachtdocs'),'opac-registration-confirmation.tt','opac',$cgi);
+ $template->param( news_lang => $news_lang );
}
}
else {
( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "opac-registration-invalid.tmpl",
+ template_name => "opac-registration-invalid.tt",
type => "opac",
query => $cgi,
authnotrequired => 1,