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

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 672-678 sub _version_check { Link Here
672
        my $warning = "Database update needed, redirecting to %s. Database is $version and Koha is $kohaversion";
672
        my $warning = "Database update needed, redirecting to %s. Database is $version and Koha is $kohaversion";
673
        if ( $type ne 'opac' ) {
673
        if ( $type ne 'opac' ) {
674
            warn sprintf( $warning, 'Installer' );
674
            warn sprintf( $warning, 'Installer' );
675
            print $query->redirect("/cgi-bin/koha/installer/install.pl?step=3");
675
            print $query->redirect("/cgi-bin/koha/installer/install.pl?step=1&op=updatestructure");
676
        } else {
676
        } else {
677
            warn sprintf( "OPAC: " . $warning, 'maintenance' );
677
            warn sprintf( "OPAC: " . $warning, 'maintenance' );
678
            print $query->redirect("/cgi-bin/koha/maintenance.pl");
678
            print $query->redirect("/cgi-bin/koha/maintenance.pl");
(-)a/installer/install.pl (-9 / +10 lines)
Lines 55-63 my $dbh = DBI->connect( Link Here
55
);
55
);
56
56
57
if ( $step && $step == 1 ) {
57
if ( $step && $step == 1 ) {
58
    #First Step
58
    #First Step (for both fresh installations and upgrades)
59
    #Checking ALL perl Modules and services needed are installed.
59
    #Checking ALL perl Modules and services needed are installed.
60
    #Whenever there is an error, adding a report to the page
60
    #Whenever there is an error, adding a report to the page
61
    my $op = $query->param('op') || 'noop';
61
    $template->param( language => 1 );
62
    $template->param( language => 1 );
62
    $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
63
    $template->param( 'checkmodule' => 1 ); # we start with the assumption that there are no problems and set this to 0 if there are
63
64
Lines 86-92 if ( $step && $step == 1 ) { Link Here
86
            );
87
            );
87
        }
88
        }
88
        @components = sort {$a->{'name'} cmp $b->{'name'}} @components;
89
        @components = sort {$a->{'name'} cmp $b->{'name'}} @components;
89
        $template->param( missing_modules => \@components, checkmodule => $checkmodule );
90
        $template->param( missing_modules => \@components, checkmodule => $checkmodule, op => $op );
90
    }
91
    }
91
}
92
}
92
elsif ( $step && $step == 2 ) {
93
elsif ( $step && $step == 2 ) {
Lines 314-326 elsif ( $step && $step == 3 ) { Link Here
314
        #
315
        #
315
        #Do updatedatabase And report
316
        #Do updatedatabase And report
316
317
317
    if ( ! defined $ENV{PERL5LIB} ) {
318
        if ( ! defined $ENV{PERL5LIB} ) {
318
        my $find = "C4/Context.pm";
319
            my $find = "C4/Context.pm";
319
        my $path = $INC{$find};
320
            my $path = $INC{$find};
320
        $path =~ s/\Q$find\E//;
321
            $path =~ s/\Q$find\E//;
321
        $ENV{PERL5LIB} = "$path:$path/installer";
322
            $ENV{PERL5LIB} = "$path:$path/installer";
322
        warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
323
            warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
323
    }
324
        }
324
325
325
        my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
326
        my $now = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
326
        my $logdir = C4::Context->config('logdir');
327
        my $logdir = C4::Context->config('logdir');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt (-2 / +14 lines)
Lines 30-36 listed, please inform your systems administrator.</p> Link Here
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 &gt;&gt;" type="submit" /></p>
70
<p>Please click 'Next' to continue <input value="Next &gt;&gt;" 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