Attachment #38877 for bug #14152

View | Details | Raw Unified | Return to bug 14152
Collapse All | Expand All

Lines 671-677 sub _version_check { Link Here

(-)a/C4/Auth.pm (-1 / +1 lines)
671	my $warning = "Database update needed, redirecting to %s. Database is $version and Koha is $kohaversion";	671	my $warning = "Database update needed, redirecting to %s. Database is $version and Koha is $kohaversion";
672	if ( $type ne 'opac' ) {	672	if ( $type ne 'opac' ) {
673	warn sprintf( $warning, 'Installer' );	673	warn sprintf( $warning, 'Installer' );
674	print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");	674	print $query->redirect("/cgi-bin/koha/installer/install.pl?step=1&op=updatestructure");
675	} else {	675	} else {
676	warn sprintf( "OPAC: " . $warning, 'maintenance' );	676	warn sprintf( "OPAC: " . $warning, 'maintenance' );
677	print $query->redirect("/cgi-bin/koha/maintenance.pl");	677	print $query->redirect("/cgi-bin/koha/maintenance.pl");




);

if ( $step && $step == 1 ) {
    #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
    my $op = $query->param('op') || 'noop';
    $template->param( language => 1 );
    $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are


            );
        }
        @components = sort {$a->{'name'} cmp $b->{'name'}} @components;
        $template->param( missing_modules => \@components, checkmodule => $checkmodule, op => $op );
    }
}
elsif ( $step && $step == 2 ) {

        #
        #Do updatedatabase And report

        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');

Lines 30-36 listed, please inform your systems administrator.</p> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-2 / +14 lines)
30	</form>	30	</form>
31	[% END %]	31	[% END %]
32	[% IF ( language ) %]	32	[% IF ( language ) %]
33	[% UNLESS ( checkmodule ) %]	33	[% IF ( checkmodule ) %]
		34	<p>All required Perl modules appear to be installed.<br />
		35	[% ELSE %]
34	[% IF ( missing_modules ) %]	36	[% IF ( missing_modules ) %]
35	<p>Some Perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />	37	<p>Some Perl modules are missing. Modules in red <b>must</b> be installed before you may continue.<br />
36	<ul>	38	<ul>
Lines 57-67 listed, please inform your systems administrator.</p> Link Here
57	[% END %]	59	[% END %]
58	<form name="checkmodules" action="install.pl">	60	<form name="checkmodules" action="install.pl">
59	[% IF ( checkmodule ) %]	61	[% IF ( checkmodule ) %]
		62	[% IF (op == 'noop') %]
60	<input type="hidden" name="step" value="2" />	63	<input type="hidden" name="step" value="2" />
		64	[% ELSE %]
		65	<input type="hidden" name="step" value="3" />
		66	<input type="hidden" name="op" value="[% op %]" />
		67	<input type="hidden" name="checkmodule" value="[% checkmodule %]"/>
		68	[% END %]
61	<p> All dependencies installed.</p>	69	<p> All dependencies installed.</p>
62	<p>Please click 'Next' to continue <input value="Next >>" type="submit" /></p>	70	<p>Please click 'Next' to continue <input value="Next >>" type="submit" /></p>
63	[% ELSE %]	71	[% ELSE %]
		72	[% IF (op == 'noop') %]
64	<input type="hidden" name="step" value="1" />	73	<input type="hidden" name="step" value="1" />
		74	[% ELSE %]
		75	<input type="hidden" name="step" value="1" />
		76	<input type="hidden" name="op" value="[% op %]" />
		77	[% END %]
65	<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>	78	<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p>
66	[% END %]	79	[% END %]
67	</form>	80	</form>
68	-

Return to bug 14152

Lines 53-61 my $dbh = DBI->connect( Link Here

(-)a/installer/install.pl (-9 / +10 lines)
53	);	53	);
54		54
55	if ( $step && $step == 1 ) {	55	if ( $step && $step == 1 ) {
56	#First Step	56	#First Step (for both fresh installations and upgrades)
57	#Checking ALL perl Modules and services needed are installed.	57	#Checking ALL perl Modules and services needed are installed.
58	#Whenever there is an error, adding a report to the page	58	#Whenever there is an error, adding a report to the page
		59	my $op = $query->param('op') \|\| 'noop';
59	$template->param( language => 1 );	60	$template->param( language => 1 );
60	$template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are	61	$template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
61		62
Lines 84-90 if ( $step && $step == 1 ) { Link Here
84	);	85	);
85	}	86	}
86	@components = sort {$a->{'name'} cmp $b->{'name'}} @components;	87	@components = sort {$a->{'name'} cmp $b->{'name'}} @components;
87	$template->param( missing_modules => \@components, checkmodule => $checkmodule );	88	$template->param( missing_modules => \@components, checkmodule => $checkmodule, op => $op );
88	}	89	}
89	}	90	}
90	elsif ( $step && $step == 2 ) {	91	elsif ( $step && $step == 2 ) {
Lines 312-324 elsif ( $step && $step == 3 ) { Link Here
312	#	313	#
313	#Do updatedatabase And report	314	#Do updatedatabase And report
314		315
315	if ( ! defined $ENV{PERL5LIB} ) {	316	if ( ! defined $ENV{PERL5LIB} ) {
316	my $find = "C4/Context.pm";	317	my $find = "C4/Context.pm";
317	my $path = $INC{$find};	318	my $path = $INC{$find};
318	$path =~ s/\Q$find\E//;	319	$path =~ s/\Q$find\E//;
319	$ENV{PERL5LIB} = "$path:$path/installer";	320	$ENV{PERL5LIB} = "$path:$path/installer";
320	warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";	321	warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
321	}	322	}
322		323
323	my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );	324	my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
324	my $logdir = C4::Context->config('logdir');	325	my $logdir = C4::Context->config('logdir');