Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster

[koha.git] / mainpage.pl

diff --git a/mainpage.pl b/mainpage.pl
index 0c0c5d6..25ee475 100755 (executable)
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -1,5 +1,8 @@
 #!/usr/bin/perl
 
+# Copyright Paul Poulain 2002
+# Parts Copyright Liblime 2007
+#
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -17,11 +20,9 @@
 #
 
 use strict;
-require Exporter;
-
-use C4::Output;    # contains gettemplate
-use C4::Interface::CGI::Output;
+use warnings;
 use CGI;
+use C4::Output;
 use C4::Auth;
 use C4::AuthoritiesMarc;
 use C4::Koha;
@@ -30,8 +31,10 @@ my $query     = new CGI;
 my $authtypes = getauthtypes;
 my @authtypesloop;
 
-foreach my $thisauthtype ( sort { $authtypes->{$a} <=> $authtypes->{$b} }
-    keys %$authtypes )
+foreach my $thisauthtype (
+    sort { $authtypes->{$a} <=> $authtypes->{$b} }
+    keys %$authtypes
+  )
 {
     my %row = (
         value        => $thisauthtype,
@@ -47,21 +50,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         type            => "intranet",
         authnotrequired => 0,
         flagsrequired   => {
-        catalogue        => 1,
-        circulate        => 1,
-        borrowers        => 1,
+            catalogue => 1,
         },
     }
 );
 
-my $marc_p = C4::Context->boolean_preference("marc");
-
 $template->param(
-    NOTMARC       => !$marc_p,
     authtypesloop => \@authtypesloop
 );
 
-my $all_koha_news = &GetNewsToDisplay("koha");
+my $all_koha_news   = &GetNewsToDisplay("koha");
 my $koha_news_count = scalar @$all_koha_news;
 
 $template->param(