X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fmaintenance.pl;h=1839e2e8488f98bc0596001ce1958f70745e1065;hb=77930a5945c915e88b25fbac9d1432522b61b3cd;hp=d106098edbba7d0153f328096b4c9dc6fa074a31;hpb=11caedbf1906dedd5a5c2692a2098d157f4fe380;p=koha.git

diff --git a/opac/maintenance.pl b/opac/maintenance.pl
index d106098edb..1839e2e848 100755
--- a/opac/maintenance.pl
+++ b/opac/maintenance.pl
@@ -2,49 +2,44 @@
 
 # This file is part of Koha.
 #
-# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-# FIXME - Generates a warning from C4/Context.pm (uninitilized value).
-
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
+use C4::Templates qw/gettemplate/;
 
-my $input = new CGI;
+use Koha;
 
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {
-        template_name   => "maintenance.tmpl",
-        type            => "opac",
-        query           => $input,
-        authnotrequired => 1,
-        flagsrequired   => { borrow => 1 },
-    }
-);
+my $query = new CGI;
+my $template = C4::Templates::gettemplate( 'maintenance.tt', 'opac', $query, 0 );
 
 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;
+my $kohaversion     = Koha::version();
+# Strip dots from version
+$kohaversion     =~ s/\.//g if defined $kohaversion;
+$koha_db_version =~ s/\.//g if defined $koha_db_version;
+
+if ( !defined $koha_db_version || # DB not populated
+     $kohaversion > $koha_db_version || # Update needed
+     C4::Context->preference('OpacMaintenance') ) { # Maintenance mode enabled
+    output_html_with_http_headers $query, '', $template->output;
 }
 else {
-    print $input->redirect("/cgi-bin/koha/opac-main.pl");
+    print $query->redirect("/cgi-bin/koha/opac-main.pl");
 }
+
+1;