@@ -, +, @@ --- installer/install.pl | 8 ++++---- installer/onboarding.pl | 4 +--- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt | 3 +-- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) --- a/installer/install.pl +++ a/installer/install.pl @@ -194,8 +194,8 @@ elsif ( $step && $step == 2 ) { # Check if user has all necessary grants on this database... my $rq = $dbh->do( "SELECT u.usesuper - FROM pg_catalog.pg_user as u - WHERE u.usename = \'$info{user}\';" + FROM pg_catalog.pg_user as u + WHERE u.usename = \'$info{user}\';" ); if ( $rq == 1 ) { $template->param( "checkgrantaccess" => 1 ); @@ -439,8 +439,8 @@ elsif ( $step && $step == 3 ) { elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT * - FROM information_schema.tables - WHERE table_schema='public' and table_type='BASE TABLE';" + FROM information_schema.tables + WHERE table_schema='public' and table_type='BASE TABLE';" ); } $rq->execute; --- a/installer/onboarding.pl +++ a/installer/onboarding.pl @@ -166,7 +166,7 @@ elsif ( $step && $step == 1 ) { ; # Use a regular expression to check the value of the inputted branchcode #Create a new library object and store the branchcode and @fields array values in this new library object - my $library = Koha::Library->new( + $library = Koha::Library->new( { branchcode => $branchcode, ( map { $_ => scalar $input->param($_) || undef } @fields ) @@ -304,8 +304,6 @@ elsif ( $step && $step == 3 ) { my @messages; my @errors; my $nok = $input->param('nok'); - my $firstpassword = $input->param('password'); - my $secondpassword = $input->param('password2'); my $cardnumber = $input->param('cardnumber'); my $borrowernumber = $input->param('borrowernumber'); my $userid = $input->param('userid'); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -11,7 +11,7 @@