Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if...

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works exactly as it should according to the test plan. This is a nice
improvement.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Check OpacMaintenance!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/opac/maintenance.pl b/opac/maintenance.pl
index 1914644..d106098 100755 (executable)
--- a/opac/maintenance.pl
+++ b/opac/maintenance.pl
@@ -15,9 +15,9 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-
 use strict;
 use warnings;
+
 # FIXME - Generates a warning from C4/Context.pm (uninitilized value).
 
 use CGI;
@@ -36,4 +36,15 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-output_html_with_http_headers $input, '', $template->output;
+my $koha_db_version = C4::Context->preference('Version');
+my $kohaversion     = C4::Context::KOHAVERSION;
+$kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;
+
+#warn "db: $koha_db_version, koha: $kohaversion";
+
+if ( $kohaversion > $koha_db_version or C4::Context->preference('OpacMaintenance') ) {
+    output_html_with_http_headers $input, '', $template->output;
+}
+else {
+    print $input->redirect("/cgi-bin/koha/opac-main.pl");
+}