X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=installer%2Finstall.pl;h=459606d4cf49de07c9d1226644ece202181a1347;hb=70abd7698f02a7da791490607f43df9f781390d2;hp=91a5b01d83b49b6bc87fbb132d1aeaaa02044ecf;hpb=4339c8585abf6baa7af67a8dd6806222ec7fe8a6;p=koha_ffzg diff --git a/installer/install.pl b/installer/install.pl index 91a5b01d83..459606d4cf 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -1,16 +1,37 @@ -#!/usr/bin/perl -w # please develop with -w +#!/usr/bin/perl -#use diagnostics; +# This file is part of Koha. +# +# Copyright (C) YEAR YOURNAME-OR-YOUREMPLOYER +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use strict; +use warnings; +use diagnostics; + +use C4::InstallAuth; +use CGI qw ( -utf8 ); +use POSIX qw(strftime); -# use Install; -use InstallAuth; use C4::Context; use C4::Output; -use C4::Languages; - -use strict; # please develop with the strict pragma +use C4::Templates; +use C4::Languages qw(getAllLanguages getTranslatedLanguages); +use C4::Installer; -use CGI; +use Koha; my $query = new CGI; my $step = $query->param('step'); @@ -21,11 +42,11 @@ my ( $template, $loggedinuser, $cookie ); my $all_languages = getAllLanguages(); if ( defined($language) ) { - setlanguagecookie( $query, $language, "install.pl?step=1" ); + C4::Templates::setlanguagecookie( $query, $language, "install.pl?step=1" ); } ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "installer/step" . ( $step ? $step : 1 ) . ".tmpl", + template_name => "installer/step" . ( $step ? $step : 1 ) . ".tt", query => $query, type => "intranet", authnotrequired => 0, @@ -33,137 +54,81 @@ if ( defined($language) ) { } ); +my $installer = C4::Installer->new(); my %info; $info{'dbname'} = C4::Context->config("database"); -$info{'dbms'} = - ( C4::Context->config("db_scheme") +$info{'dbms'} = ( + C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") - : "mysql" ); + : "mysql" +); $info{'hostname'} = C4::Context->config("hostname"); -$info{'port'} = C4::Context->config("port"); +$info{'port'} = C4::Context->config("port"); $info{'user'} = C4::Context->config("user"); $info{'password'} = C4::Context->config("pass"); +$info{'tls'} = C4::Context->config("tls"); + if ($info{'tls'} && $info{'tls'} eq 'yes'){ + $info{'ca'} = C4::Context->config('ca'); + $info{'cert'} = C4::Context->config('cert'); + $info{'key'} = C4::Context->config('key'); + $info{'tlsoptions'} = ";mysql_ssl=1;mysql_ssl_client_key=".$info{key}.";mysql_ssl_client_cert=".$info{cert}.";mysql_ssl_ca_file=".$info{ca}; + $info{'tlscmdline'} = " --ssl-cert ". $info{cert} . " --ssl-key " . $info{key} . " --ssl-ca ".$info{ca}." " + } + my $dbh = DBI->connect( "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}" - . ( $info{port} ? ";port=$info{port}" : "" ), + . ( $info{port} ? ";port=$info{port}" : "" ) + . ( $info{tlsoptions} ? $info{tlsoptions} : "" ), $info{'user'}, $info{'password'} ); if ( $step && $step == 1 ) { - #First Step + + #First Step (for both fresh installations and upgrades) #Checking ALL perl Modules and services needed are installed. #Whenever there is an error, adding a report to the page - $template->param( language => 1 ); - my $problem; - - unless ( $] >= 5.006001 ) { # Bug 179 - $template->param( "problems" => 1, "perlversion" => 1 ); - $problem = 1; - } - - # We could here use a special find - my @missing = (); - unless ( eval { require ZOOM } ) { - push @missing, { name => "ZOOM" }; - } - unless ( eval { require LWP::Simple } ) { - push @missing, { name => "LWP::Simple" }; - } - unless ( eval { require XML::Simple } ) { - push @missing, { name => "XML::Simple" }; - } - unless ( eval { require MARC::File::XML } ) { - push @missing, { name => "MARC::File::XML" }; - } - unless ( eval { require MARC::File::USMARC } ) { - push @missing, { name => "MARC::File::USMARC" }; - } - unless ( eval { require DBI } ) { - push @missing, { name => "DBI" }; - } - unless ( eval { require Date::Manip } ) { - push @missing, { name => "Date::Manip" }; - } - unless ( eval { require DBD::mysql } ) { - push @missing, { name => "DBD::mysql" }; - } - unless ( eval { require HTML::Template::Pro } ) { - push @missing, { name => "HTML::Template::Pro" }; - } - unless ( eval { require Date::Calc } ) { - push @missing, { name => "Date::Calc" }; - } - unless ( eval { require Digest::MD5 } ) { - push @missing, { name => "Digest::MD5" }; - } - unless ( eval { require MARC::Record } ) { - push @missing, { name => "MARC::Record" }; - } - unless ( eval { require Mail::Sendmail } ) { - push @missing, { name => "Mail::Sendmail", usagemail => 1 }; - } - unless ( eval { require List::MoreUtils } ) { - push @missing, { name => "List::MoreUtils" }; - } - unless ( eval { require XML::RSS } ) { - push @missing, { name => "XML::RSS" }; - } - unless ( eval { require CGI::Carp } ) { - push @missing, { name => "CGI::Carp" }; - } - - -# The following modules are not mandatory, depends on how the library want to use Koha - unless ( eval { require PDF::API2 } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::API2", usagebarcode => 1 }; - } - } - unless ( eval { require GD::Barcorde } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, - { name => "GD::Barcode", usagebarcode => 1, usagespine => 1 }; - } - } - unless ( eval { require Data::Random } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Data::Random", usagebarcode => 1 }; - } - } - unless ( eval { require PDF::Reuse::Barcode } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::Reuse::Barcode", usagebarcode => 1 }; - } - } - unless ( eval { require PDF::Report } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "PDF::Report", usagebarcode => 1 }; - } - } - unless ( eval { require Net::LDAP } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Algorithm::CheckDigits", usagebarcode => 1 }; - } - } - unless ( eval { require GD::Barcode::UPCE } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "GD::Barcode::UPCE", usagepine => 1 }; - } - } - unless ( eval { require Net::LDAP } ) { - if ( $#missing >= 0 ) { # only when $#missing >= 0 so this isn't fatal - push @missing, { name => "Net::LDAP", usageLDAP => 1 }; + my $op = $query->param('op') || 'noop'; + $template->param( language => 1 ); + my $checkmodule = 1; + $template->param( 'checkmodule' => 1 ) + ; # we start with the assumption that there are no problems and set this to 0 if there are + + unless ( $] >= 5.010000 ) { # Bug 7375 + $template->param( problems => 1, perlversion => 1, checkmodule => 0 ); + $checkmodule = 0; + } + + my $perl_modules = C4::Installer::PerlModules->new; + $perl_modules->versions_info; + + my $modules = $perl_modules->get_attr('missing_pm'); + if ( scalar(@$modules) ) { + my @components = (); + foreach (@$modules) { + my ( $module, $stats ) = each %$_; + $checkmodule = 0 if $stats->{'required'}; + push( + @components, + { + name => $module, + version => $stats->{'min_ver'}, + require => $stats->{'required'}, + usage => $stats->{'usage'}, + } + ); } + @components = sort { $a->{'name'} cmp $b->{'name'} } @components; + $template->param( + missing_modules => \@components, + checkmodule => $checkmodule, + op => $op + ); } - $template->param( missings => \@missing ) if ( scalar(@missing) > 0 ); - $template->param( 'checkmodule' => 1 ) - unless ( scalar(@missing) && $problem ); - } elsif ( $step && $step == 2 ) { -# -#STEP 2 Check Database connection and access -# + + #STEP 2 Check Database connection and access + $template->param(%info); my $checkdb = $query->param("checkdb"); $template->param( 'dbconnection' => $checkdb ); @@ -180,15 +145,18 @@ elsif ( $step && $step == 2 ) { $template->param( 'checkdatabasecreated' => 1 ); } - #Check if user have all necessary grants on this database. - my $rq = - $dbh->prepare( - "SHOW GRANTS FOR \'$info{user}\'\@'$info{hostname}'"); + # Check if user have all necessary grants on this database. + # CURRENT_USER is ANSI SQL, and doesn't require mysql table + # privileges, making the % check pointless, since they + # couldn't even check GRANTS if they couldn't connect. + my $rq = $dbh->prepare('SHOW GRANTS FOR CURRENT_USER'); $rq->execute; my $grantaccess; while ( my ($line) = $rq->fetchrow ) { my $dbname = $info{dbname}; - if ( $line =~ m/$dbname/ || index( $line, '*.*' ) > 0 ) { + if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/ + || index( $line, '*.*' ) > 0 ) + { $grantaccess = 1 if ( index( $line, 'ALL PRIVILEGES' ) > 0 @@ -201,45 +169,29 @@ elsif ( $step && $step == 2 ) { ); } } - unless ($grantaccess) { - $rq = - $dbh->prepare("SHOW GRANTS FOR \'$info{user}\'\@'\%'"); - $rq->execute; - while ( my ($line) = $rq->fetchrow ) { - my $dbname = $info{dbname}; - if ( $line =~ m/$dbname/ || index( $line, '*.*' ) > 0 ) - { - $grantaccess = 1 - if ( - index( $line, 'ALL PRIVILEGES' ) > 0 - || ( ( index( $line, 'SELECT' ) > 0 ) - && ( index( $line, 'INSERT' ) > 0 ) - && ( index( $line, 'UPDATE' ) > 0 ) - && ( index( $line, 'DELETE' ) > 0 ) - && ( index( $line, 'CREATE' ) > 0 ) - && ( index( $line, 'DROP' ) > 0 ) ) - ); - } - } - } $template->param( "checkgrantaccess" => $grantaccess ); - } # End mysql connect check... - - elsif ( $info{dbms} eq "Pg" ) { - # Check if database has been created... - my $rv = $dbh->do( "SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';" ); - if ( $rv == 1 ) { - $template->param( 'checkdatabasecreated' => 1 ); - } - - # 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}\';" ); - if ( $rq == 1 ) { - $template->param( "checkgrantaccess" => 1 ); - } - } # End Pg connect check... + } # End mysql connect check... + + elsif ( $info{dbms} eq "Pg" ) { + + # Check if database has been created... + my $rv = $dbh->do( +"SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';" + ); + if ( $rv == 1 ) { + $template->param( 'checkdatabasecreated' => 1 ); + } + + # 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}\';" + ); + if ( $rq == 1 ) { + $template->param( "checkgrantaccess" => 1 ); + } + } # End Pg connect check... } else { $template->param( "error" => DBI::err, "message" => DBI::errstr ); @@ -247,278 +199,84 @@ elsif ( $step && $step == 2 ) { } } elsif ( $step && $step == 3 ) { -# -# -# STEP 3 : database setup -# -# + + # STEP 3 : database setup + my $op = $query->param('op'); if ( $op && $op eq 'finished' ) { # # we have finished, just redirect to mainpage. # print $query->redirect("/cgi-bin/koha/mainpage.pl"); - exit 1; + exit; } elsif ( $op && $op eq 'finish' ) { - my $kohaversion=C4::Context::KOHAVERSION; - # remove the 3 last . to have a Perl number - $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/; - if (C4::Context->preference('Version')) { - warn "UPDATE Version"; - my $finish=$dbh->prepare("UPDATE systempreferences SET value=? WHERE variable='Version'"); - $finish->execute($kohaversion); - } else { - warn "INSERT Version"; - my $finish=$dbh->prepare("INSERT into systempreferences (variable,value,explanation) values ('Version',?,'The Koha database version. Don t change this value manually, it s holded by the webinstaller')"); - $finish->execute($kohaversion); - } + $installer->set_version_syspref(); - # Installation is finished. - # We just deny anybody access to install - # And we redirect people to mainpage. - # The installer will have to relogin since we do not pass cookie to redirection. - $template->param( "$op" => 1 ); - } - elsif ( $op && $op eq 'Nozebra' ) { - if ($query->param('Nozebra')) { - $dbh->do("UPDATE systempreferences SET value=1 WHERE variable='NoZebra'"); - $dbh->do("UPDATE systempreferences SET value=0 WHERE variable in ('QueryFuzzy','QueryWeightFields','QueryStemming')"); - } else { - $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'"); - } +# Installation is finished. +# We just deny anybody access to install +# And we redirect people to mainpage. +# The installer will have to relogin since we do not pass cookie to redirection. $template->param( "$op" => 1 ); } + elsif ( $op && $op eq 'addframeworks' ) { - # - # 1ST install, 3rd sub-step : insert the SQL files the user has selected - # - - #Framework importing and reports - my $lang; - my %hashlevel; - - # sort by filename -> prepend with numbers to specify order of insertion. - my @fnames = sort { - my @aa = split /\/|\\/, ($a); - my @bb = split /\/|\\/, ($b); - $aa[-1] cmp $bb[-1] - } $query->param('framework'); - if ( $info{dbms} eq 'mysql' ) { $dbh->do('SET FOREIGN_KEY_CHECKS=0'); } - elsif ( $info{dbms} eq 'Pg' ) { $dbh->do('SET CONSTRAINTS ALL DEFERRED;'); } - my $request = - $dbh->prepare( - "SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'" - ); - $request->execute; - my ($systempreference) = $request->fetchrow; - foreach my $file (@fnames) { - - # warn $file; - undef $/; - my $error; - if ( $info{dbms} eq 'mysql' ) { - my $strcmd = "mysql " - . ( $info{hostname} ? " -h $info{hostname} " : "" ) - . ( $info{port} ? " -P $info{port} " : "" ) - . ( $info{user} ? " -u $info{user} " : "" ) - . ( $info{password} ? " -p$info{password}" : "" ) - . " $info{dbname} "; - $error = qx($strcmd < $file 2>&1 1>/dev/null); # We want to send stdout to null and return only stderr... -fbcit - } - elsif ( $info{dbms} eq 'Pg' ) { - my $strcmd = "psql " - . ( $info{hostname} ? " -h $info{hostname} " : "" ) - . ( $info{port} ? " -p $info{port} " : "" ) - . ( $info{user} ? " -U $info{user} " : "" ) -# . ( $info{password} ? " -W $info{password}" : "" ) - . " $info{dbname} "; - $error = qx($strcmd -f $file 2>&1 1>/dev/null); # ...even more so with psql... - } - my @file = split qr(\/|\\), $file; - $lang = $file[ scalar(@file) - 3 ] unless ($lang); - my $level = $file[ scalar(@file) - 2 ]; - unless ($error) { - $systempreference .= "$file[scalar(@file)-1]|" - unless ( - index( $systempreference, $file[ scalar(@file) - 1 ] ) >= - 0 ); - } - #Bulding here a hierarchy to display files by level. - push @{ $hashlevel{$level} }, - { "fwkname" => $file[ scalar(@file) - 1 ], "error" => $error }; - } + # 1ST install, 3rd sub-step : insert the SQL files the user has selected - #systempreference contains an ending | - chop $systempreference; - my @list; - map { push @list, { "level" => $_, "fwklist" => $hashlevel{$_} } } - keys %hashlevel; - my $fwk_language; - for my $each_language (@$all_languages) { - - # warn "CODE".$each_language->{'language_code'}; - # warn "LANG:".$lang; - if ( $lang eq $each_language->{'language_code'} ) { - $fwk_language = $each_language->{language_locale_name}; - } - } - my $updateflag = - $dbh->do( - "UPDATE systempreferences set value=\"$systempreference\" where variable='FrameworksLoaded'" - ); - unless ( $updateflag == 1 ) { - my $string = - "INSERT INTO systempreferences (value, variable, explanation, type) VALUES (\"$systempreference\",'FrameworksLoaded','Frameworks loaded through webinstaller','choice')"; - my $rq = $dbh->prepare($string); - $rq->execute; - } + my ( $fwk_language, $list ) = + $installer->load_sql_in_order( $all_languages, + $query->multi_param('framework') ); $template->param( "fwklanguage" => $fwk_language, - "list" => \@list + "list" => $list ); + use Koha::SearchEngine::Elasticsearch; + Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings; $template->param( "$op" => 1 ); - if ( $info{dbms} eq 'mysql' ) { $dbh->do('SET FOREIGN_KEY_CHECKS=1'); } - elsif ( $info{dbms} eq 'Pg' ) { $dbh->do('SET CONSTRAINTS ALL IMMEDIATE;'); } } elsif ( $op && $op eq 'selectframeworks' ) { - # - # - # 1ST install, 2nd sub-step : show the user the sql datas he can insert in the database. - # - # - # (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks) - - #Framework Selection - #sql data for import are supposed to be located in installer/data// - # Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) - # Where is a category of requirement : required, recommended optional - # level should contain : - # SQL File for import With a readable name. - # txt File taht explains what this SQL File is meant for. - # Could be VERY useful to have A Big file for a kind of library. - # But could also be useful to have some Authorised values data set prepared here. - # Framework Selection is achieved through checking boxes. +# +# +# 1ST install, 2nd sub-step : show the user the sql datas they can insert in the database. +# +# +# (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks) + +#Framework Selection +#sql data for import are supposed to be located in installer/data// +# Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) +# Where is a category of requirement : required, recommended optional +# level should contain : +# SQL File for import With a readable name. +# txt File that explains what this SQL File is meant for. +# Could be VERY useful to have A Big file for a kind of library. +# But could also be useful to have some Authorised values data set prepared here. +# Framework Selection is achieved through checking boxes. my $langchoice = $query->param('fwklanguage'); $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + $langchoice =~ s/[^a-zA-Z_-]*//g; my $marcflavour = $query->param('marcflavour'); - if ($marcflavour){ - my $request = - $dbh->prepare( - "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marcflavour','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');" - ); - $request->execute; - }; - $marcflavour = C4::Context->preference('marcflavour') unless ($marcflavour); + if ($marcflavour) { + $installer->set_marcflavour_syspref($marcflavour); + } + $marcflavour = C4::Context->preference('marcflavour') + unless ($marcflavour); + #Insert into database the selected marcflavour - undef $/; - my $dir = - C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour/".lc($marcflavour); - opendir( MYDIR, $dir ) || warn "no open $dir"; - my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); - closedir MYDIR; - - my @fwklist; - my $request = - $dbh->prepare( - "SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'" - ); - $request->execute; - my ($frameworksloaded) = $request->fetchrow; - my %frameworksloaded; - foreach ( split( /\|/, $frameworksloaded ) ) { - $frameworksloaded{$_} = 1; - } - - foreach my $requirelevel (@listdir) { - opendir( MYDIR, "$dir/$requirelevel" ); - my @listname = - grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.sql$/ } - readdir(MYDIR); - closedir MYDIR; - my %cell; - my @frameworklist; - map { - my $name = substr( $_, 0, -4 ); - open FILE, "< $dir/$requirelevel/$name.txt"; - my $lines = ; - $lines =~ s/\n|\r/
/g; - use utf8; - utf8::encode($lines) unless ( utf8::is_utf8($lines) ); - push @frameworklist, - { - 'fwkname' => $name, - 'fwkfile' => "$dir/$requirelevel/$_", - 'fwkdescription' => $lines, - 'checked' => ( - ( - $frameworksloaded{$_} - || ( $requirelevel =~ - /(mandatory|requi|oblig|necess)/i ) - ) ? 1 : 0 - ) - }; - } @listname; - my @fwks = - sort { $a->{'fwkname'} lt $b->{'fwkname'} } @frameworklist; - -# $cell{"mandatory"}=($requirelevel=~/(mandatory|requi|oblig|necess)/i); - $cell{"frameworks"} = \@fwks; - $cell{"label"} = ucfirst($requirelevel); - $cell{"code"} = lc($requirelevel); - push @fwklist, \%cell; - } - $template->param( "frameworksloop" => \@fwklist ); - $template->param( "marcflavour" => ucfirst($marcflavour)); - - $dir = - C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice"; - opendir( MYDIR, $dir ) || warn "no open $dir"; - @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); - closedir MYDIR; - my @levellist; - foreach my $requirelevel (@listdir) { - opendir( MYDIR, "$dir/$requirelevel" ); - my @listname = - grep { !/^\./ && -f "$dir/$requirelevel/$_" && $_ =~ m/\.sql$/ } - readdir(MYDIR); - closedir MYDIR; - my %cell; - my @frameworklist; - map { - my $name = substr( $_, 0, -4 ); - open FILE, "< $dir/$requirelevel/$name.txt"; - my $lines = ; - $lines =~ s/\n|\r/
/g; - use utf8; - utf8::encode($lines) unless ( utf8::is_utf8($lines) ); - push @frameworklist, - { - 'fwkname' => $name, - 'fwkfile' => "$dir/$requirelevel/$_", - 'fwkdescription' => $lines, - 'checked' => ( - ( - $frameworksloaded{$_} - || ( $requirelevel =~ - /(mandatory|requi|oblig|necess)/i ) - ) ? 1 : 0 - ) - }; - } @listname; - my @fwks = - sort { $a->{'fwkname'} lt $b->{'fwkname'} } @frameworklist; - -# $cell{"mandatory"}=($requirelevel=~/(mandatory|requi|oblig|necess)/i); - $cell{"frameworks"} = \@fwks; - $cell{"label"} = ucfirst($requirelevel); - $cell{"code"} = lc($requirelevel); - push @levellist, \%cell; - } - $template->param( "levelloop" => \@levellist ); - $template->param( "$op" => 1 ); + my ( $marc_defaulted_to_en, $fwklist ) = + $installer->marc_framework_sql_list( $langchoice, $marcflavour ); + $template->param( 'en_marc_frameworks' => $marc_defaulted_to_en ); + $template->param( "frameworksloop" => $fwklist ); + $template->param( "marcflavour" => ucfirst($marcflavour) ); + + my ( $sample_defaulted_to_en, $levellist ) = + $installer->sample_data_sql_list($langchoice); + $template->param( "en_sample_data" => $sample_defaulted_to_en ); + $template->param( "levelloop" => $levellist ); + $template->param( "$op" => 1 ); + } elsif ( $op && $op eq 'choosemarc' ) { # @@ -526,37 +284,52 @@ elsif ( $step && $step == 3 ) { # 1ST install, 2nd sub-step : show the user the marcflavour available. # # - - #Choose Marc Flavour - #sql data are supposed to be located in installer/data///marcflavour/marcflavourname - # Where is database type according to DBD syntax - # Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) - # Where is a category of requirement : required, recommended optional - # level should contain : - # SQL File for import With a readable name. - # txt File taht explains what this SQL File is meant for. - # Could be VERY useful to have A Big file for a kind of library. - # But could also be useful to have some Authorised values data set prepared here. - # Marcflavour Selection is achieved through radiobuttons. + +#Choose Marc Flavour +#sql data are supposed to be located in installer/data///marcflavour/marcflavourname +# Where is database type according to DBD syntax +# Where is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.) +# Where is a category of requirement : required, recommended optional +# level should contain : +# SQL File for import With a readable name. +# txt File that explains what this SQL File is meant for. +# Could be VERY useful to have A Big file for a kind of library. +# But could also be useful to have some Authorised values data set prepared here. +# Marcflavour Selection is achieved through radiobuttons. my $langchoice = $query->param('fwklanguage'); + $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice); + $langchoice =~ s/[^a-zA-Z_-]*//g; my $dir = - C4::Context->config('intranetdir') . "/installer/data/$info{dbms}/$langchoice/marcflavour"; - opendir( MYDIR, $dir ) || warn "no open $dir"; + C4::Context->config('intranetdir') + . "/installer/data/$info{dbms}/$langchoice/marcflavour"; + unless ( opendir( MYDIR, $dir ) ) { + if ( $langchoice eq 'en' ) { + warn "cannot open MARC frameworks directory $dir"; + } + else { + # if no translated MARC framework is available, + # default to English + $dir = C4::Context->config('intranetdir') + . "/installer/data/$info{dbms}/en/marcflavour"; + opendir( MYDIR, $dir ) + or warn "cannot open English MARC frameworks directory $dir"; + } + } my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; - my $marcflavour=C4::Context->preference("marcflavour"); + my $marcflavour = C4::Context->preference("marcflavour"); my @flavourlist; foreach my $marc (@listdir) { - my %cell=( - "label"=> ucfirst($marc), - "code"=>uc($marc), - "checked"=>uc($marc) eq $marcflavour); + my %cell=( + "label"=> ucfirst($marc), + "code"=>uc($marc), + "checked"=> defined($marcflavour) ? uc($marc) eq $marcflavour : 0); # $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||""; }; - push @flavourlist, \%cell; + push @flavourlist, \%cell; } $template->param( "flavourloop" => \@flavourlist ); - $template->param( "$op" => 1 ); + $template->param( "$op" => 1 ); } elsif ( $op && $op eq 'importdatastructure' ) { # @@ -564,28 +337,7 @@ elsif ( $step && $step == 3 ) { # 1st install, 1st "sub-step" : import kohastructure # # - my $datadir = C4::Context->config('intranetdir') . "/installer/data/$info{dbms}"; - my $error; - if ( $info{dbms} eq 'mysql' ) { - my $strcmd = "mysql " - . ( $info{hostname} ? " -h $info{hostname} " : "" ) - . ( $info{port} ? " -P $info{port} " : "" ) - . ( $info{user} ? " -u $info{user} " : "" ) - . ( $info{password} ? " -p$info{password}" : "" ) - . " $info{dbname} "; - $error = qx($strcmd <$datadir/kohastructure.sql 2>&1 1>/dev/null); - } - elsif ( $info{dbms} eq 'Pg' ) { - my $strcmd = "psql " - . ( $info{hostname} ? " -h $info{hostname} " : "" ) - . ( $info{port} ? " -p $info{port} " : "" ) - . ( $info{user} ? " -U $info{user} " : "" ) -# . ( $info{password} ? " -W $info{password}" : "" ) # psql will NOT accept a password, but prompts... - . " $info{dbname} "; # Therefore, be sure to run 'trust' on localhost in pg_hba.conf -fbcit - $error = qx($strcmd -f $datadir/kohastructure.sql 2>&1 1>/dev/null);# Be sure to set 'client_min_messages = error' in postgresql.conf - # so that only true errors are returned to stderr or else the installer will - # report the import a failure although it really succeded -fbcit - } + my $error = $installer->load_db_schema(); $template->param( "error" => $error, "$op" => 1, @@ -596,35 +348,86 @@ elsif ( $step && $step == 3 ) { # Not 1st install, the only sub-step : update database # #Do updatedatabase And report - my $execstring = - C4::Context->config("intranetdir") . "/installer/data/$info{dbms}/updatedatabase.pl"; - undef $/; - my $string = qx($execstring 2>&1 1>/dev/null); # added '1>/dev/null' to return only stderr in $string. Needs testing here. -fbcit - if ($string) { - $string =~ s/\n|\r/
/g; - $string =~ - s/(DBD::mysql.*? failed: .*? line [0-9]*.|=================.*?====================)/$1<\/font>/g; - $template->param( "updatereport" => $string ); + + if ( !defined $ENV{PERL5LIB} ) { + my $find = "C4/Context.pm"; + my $path = $INC{$find}; + $path =~ s/\Q$find\E//; + $ENV{PERL5LIB} = "$path:$path/installer"; + warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n"; + } + + my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() ); + my $logdir = C4::Context->config('logdir'); + my $dbversion = C4::Context->preference('Version'); + my $kohaversion = Koha::version; + $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/; + + my $filename_suffix = join '_', $now, $dbversion, $kohaversion; + my ( $logfilepath, $logfilepath_errors ) = ( + chk_log( $logdir, "updatedatabase_$filename_suffix" ), + chk_log( $logdir, "updatedatabase-error_$filename_suffix" ) + ); + + my $cmd = C4::Context->config("intranetdir") + . "/installer/data/$info{dbms}/updatedatabase.pl >> $logfilepath 2>> $logfilepath_errors"; + + system($cmd ); + + my $fh; + open( $fh, "<:encoding(utf-8)", $logfilepath ) + or die "Cannot open log file $logfilepath: $!"; + my @report = <$fh>; + close $fh; + if (@report) { + $template->param( update_report => + [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ] + ); + $template->param( has_update_succeeds => 1 ); + } + else { + eval { `rm $logfilepath` }; + } + open( $fh, "<:encoding(utf-8)", $logfilepath_errors ) + or die "Cannot open log file $logfilepath_errors: $!"; + @report = <$fh>; + close $fh; + if (@report) { + $template->param( update_errors => + [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ] + ); + $template->param( has_update_errors => 1 ); + warn +"The following errors were returned while attempting to run the updatedatabase.pl script:\n"; + foreach my $line (@report) { warn "$line\n"; } + } + else { + eval { `rm $logfilepath_errors` }; } $template->param( $op => 1 ); } else { - # - # check wether it's a 1st install or an update - # - #Check if there are enough tables. - # Paul has cleaned up tables so reduced the count - #I put it there because it implied a data import if condition was not satisfied. +# +# check whether it's a 1st install or an update +# +#Check if there are enough tables. +# Paul has cleaned up tables so reduced the count +#I put it there because it implied a data import if condition was not satisfied. my $dbh = DBI->connect( "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}" - . ( $info{port} ? ";port=$info{port}" : "" ), + . ( $info{port} ? ";port=$info{port}" : "" ) + . ( $info{tlsoptions} ? $info{tlsoptions} : "" ), $info{'user'}, $info{'password'} ); - my $rq; - if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare( "SHOW TABLES FROM " . $info{'dbname'} ); } - elsif ( $info{dbms} eq 'Pg' ) { $rq = $dbh->prepare( "SELECT * - FROM information_schema.tables - WHERE table_schema='public' and table_type='BASE TABLE';" ); } + my $rq; + if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare("SHOW TABLES"); } + elsif ( $info{dbms} eq 'Pg' ) { + $rq = $dbh->prepare( + "SELECT * + FROM information_schema.tables + WHERE table_schema='public' and table_type='BASE TABLE';" + ); + } $rq->execute; my $data = $rq->fetchall_arrayref( {} ); my $count = scalar(@$data); @@ -635,46 +438,34 @@ elsif ( $step && $step == 3 ) { $template->param( "count" => $count, "proposeimport" => 1 ); } else { - # - # we have tables, propose to select files to upload or updatedatabase - # + # + # we have tables, propose to select files to upload or updatedatabase + # $template->param( "count" => $count, "default" => 1 ); - # - # 1st part of step 3 : check if there is a databaseversion systempreference - # if there is, then we just need to upgrade - # if there is none, then we need to install the database - # - if (C4::Context->preference('Version')) { + # + # 1st part of step 3 : check if there is a databaseversion systempreference + # if there is, then we just need to upgrade + # if there is none, then we need to install the database + # + if ( C4::Context->preference('Version') ) { my $dbversion = C4::Context->preference('Version'); $dbversion =~ /(.*)\.(..)(..)(...)/; $dbversion = "$1.$2.$3.$4"; - $template->param("upgrading" => 1, - "dbversion" => $dbversion, - "kohaversion" => C4::Context->KOHAVERSION, - ); + $template->param( + "upgrading" => 1, + "dbversion" => $dbversion, + "kohaversion" => Koha::version(), + ); } } - - $dbh->disconnect; } } else { # LANGUAGE SELECTION page by default # using opendir + language Hash - - my $langavail = getTranslatedLanguages(); - - my @languages; - foreach (@$langavail) { - push @languages, - { - 'value' => $_->{'language_code'}, - 'description' => $_->{'language_name'} - } - if ( $_->{'language_code'} ); - } - $template->param( languages => \@languages ); + my $languages_loop = getTranslatedLanguages('intranet'); + $template->param( installer_languages_loop => $languages_loop ); if ($dbh) { my $rq = $dbh->prepare( @@ -682,9 +473,25 @@ else { if ( $rq->execute ) { my ($version) = $rq->fetchrow; if ($version) { - $query->redirect("install.pl?step=3"); + print $query->redirect( + "/cgi-bin/koha/installer/install.pl?step=3"); + exit; } } } } output_html_with_http_headers $query, $cookie, $template->output; + +sub chk_log { #returns a logfile in $dir or - if that failed - in temp dir + my ( $dir, $name ) = @_; + my $fn = $dir . '/' . $name . '.log'; + if ( !open my $fh, '>', $fn ) { + $name .= '_XXXX'; + require File::Temp; + ( $fh, $fn ) = + File::Temp::tempfile( $name, TMPDIR => 1, SUFFIX => '.log' ); + + #if this should not work, let croak take over + } + return $fn; +}