X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=mainpage.pl;h=e2651d8d033c4637e06dcbd2b3e25add602fa544;hb=4a34fd2fd31fc98a85021dad22f37605cfae2a5c;hp=9085630e69863a9ecc8183c678cf6ef1525a3693;hpb=7535f2bfa32c7398bfe0baa619bdfa6abf1320b2;p=srvgit

diff --git a/mainpage.pl b/mainpage.pl
index 9085630e69..e2651d8d03 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -1,40 +1,41 @@
 #!/usr/bin/perl
 
+# This file is part of Koha.
+#
 # Copyright Paul Poulain 2002
 # Parts Copyright Liblime 2007
+# Copyright (C) 2013  Mark Tompsett
 #
-# 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 3 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 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.
 #
-# 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 CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Auth;
 use C4::Koha;
-use C4::NewsChannels;
+use C4::NewsChannels; # GetNewsToDisplay
 use C4::Review qw/numberofreviews/;
 use C4::Suggestions qw/CountSuggestion/;
 use C4::Tags qw/get_count_by_tag_status/;
 use Koha::Borrower::Modifications;
+use Koha::Borrower::Discharge;
 
 my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "intranet-main.tmpl",
+        template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -42,7 +43,11 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     }
 );
 
-my $all_koha_news   = &GetNewsToDisplay("koha");
+my $homebranch;
+if (C4::Context->userenv) {
+    $homebranch = C4::Context->userenv->{'branch'};
+}
+my $all_koha_news   = &GetNewsToDisplay("koha",$homebranch);
 my $koha_news_count = scalar @$all_koha_news;
 
 $template->param(
@@ -51,7 +56,8 @@ $template->param(
 );
 
 my $branch =
-  C4::Context->preference("IndependantBranches")
+  (      C4::Context->preference("IndependentBranchesPatronModifications")
+      || C4::Context->preference("IndependentBranches") )
   && !$flags->{'superlibrarian'}
   ? C4::Context->userenv()->{'branch'}
   : undef;
@@ -61,12 +67,14 @@ my $pendingtags        = get_count_by_tag_status(0);
 my $pendingsuggestions = CountSuggestion("ASKED");
 my $pending_borrower_modifications =
   Koha::Borrower::Modifications->GetPendingModificationsCount( $branch );
+my $pending_discharge_requests = Koha::Borrower::Discharge::count({ pending => 1 });
 
 $template->param(
     pendingcomments                => $pendingcomments,
     pendingtags                    => $pendingtags,
     pendingsuggestions             => $pendingsuggestions,
     pending_borrower_modifications => $pending_borrower_modifications,
+    pending_discharge_requests     => $pending_discharge_requests,
 );
 
 #