X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mainpage.pl;h=8116eebdb0bee5bf7ecaa541cf7ac0b2f451cdc2;hb=b27c5296b777bed4e192e004f8c4ed730092da36;hp=dd8c46510bfedea0802c2bf3d01aa312b35c911e;hpb=04b2e6112f78b55ac542081ae87a41503c1b9b99;p=koha.git

diff --git a/mainpage.pl b/mainpage.pl
index dd8c46510b..8116eebdb0 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -1,41 +1,70 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
+
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+#
+
 use strict;
-use C4::Interface::CGI::Output;
+
 use CGI;
+use C4::Output;
 use C4::Auth;
-use C4::Suggestions;
+use C4::AuthoritiesMarc;
 use C4::Koha;
-use C4::BookShelves;
 use C4::NewsChannels;
+my $query     = new CGI;
+my $authtypes = getauthtypes;
+my @authtypesloop;
 
-my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "intranet-main.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1, circulate => 1,
-			     				parameters => 1, borrowers => 1,
-							permissions =>1, reserveforothers=>1,
-							editcatalogue => 1, updatecharges => 1, },
-			     debug => 1,
-			     });
-
-my $lang = "koha";
-my $error=$query->param('error');
-$template->param(error        =>$error);
-my ($opac_news_count, $all_opac_news) = &get_opac_news(undef, $lang);
-# if ($opac_news_count > 4) {$template->param(more_opac_news => 1);}
-$template->param(opac_news        => $all_opac_news);
-$template->param(opac_news_count  => $opac_news_count);
+foreach my $thisauthtype (
+    sort { $authtypes->{$a} <=> $authtypes->{$b} }
+    keys %$authtypes
+  )
+{
+    my %row = (
+        value        => $thisauthtype,
+        authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+    );
+    push @authtypesloop, \%row;
+}
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "intranet-main.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {
+            catalogue => 1,
+        },
+    }
+);
 
 my $marc_p = C4::Context->boolean_preference("marc");
-$template->param(NOTMARC => !$marc_p);
-my $new_suggestions = &CountSuggestion("ASKED");
-$template->param(new_suggestions => $new_suggestions);
 
+$template->param(
+    NOTMARC       => !$marc_p,
+    authtypesloop => \@authtypesloop
+);
+
+my $all_koha_news   = &GetNewsToDisplay("koha");
+my $koha_news_count = scalar @$all_koha_news;
 
-my $count_pending_request = CountShelfRequest(undef, "PENDING");
-$template->param(count_pending_request => $count_pending_request);
-output_html_with_http_headers $query, $cookie, $template->output();
+$template->param(
+    koha_news       => $all_koha_news,
+    koha_news_count => $koha_news_count
+);
 
+output_html_with_http_headers $query, $cookie, $template->output;