X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fkoha-news.pl;h=aec9486c51f62acf862043f71ea04550b6988741;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=afc526864effc93c4f81fb06650274ea0ad0099b;hpb=700249eb3cbf765a5a731effd21ba543b74eb334;p=koha_fer

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index afc526864e..aec9486c51 100755
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -1,28 +1,29 @@
 #!/usr/bin/perl
 
+# This file is part of Koha.
+#
 # Script to manage the opac news.
 # written 11/04
 # Casta�eda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
 # Modified to include news to KOHA intranet - tgarip@neu.edu.tr NEU library -Cyprus
 # Copyright 2000-2002 Katipo Communications
+# 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 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; FIXME - Bug 2505
+# use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -32,6 +33,7 @@ use C4::Output;
 use C4::NewsChannels;
 use C4::Languages qw(getTranslatedLanguages);
 use Date::Calc qw/Date_to_Days Today/;
+use C4::Branch qw/GetBranches/;
 
 my $cgi = new CGI;
 
@@ -42,6 +44,10 @@ my $expirationdate = format_date_in_iso($cgi->param('expirationdate'));
 my $timestamp      = format_date_in_iso($cgi->param('timestamp'));
 my $number         = $cgi->param('number');
 my $lang           = $cgi->param('lang');
+my $branchcode     = $cgi->param('branch');
+# Foreign Key constraints work with NULL, not ''
+# NULL = All branches.
+$branchcode = undef if (defined($branchcode) && $branchcode eq '');
 
 my $new_detail = get_opac_new($id);
 
@@ -67,9 +73,13 @@ foreach my $language ( @$tlangs ) {
       };
 }
 
-$template->param( lang_list => \@lang_list );
+my $branches = GetBranches;
 
-my $op = $cgi->param('op');
+$template->param( lang_list   => \@lang_list,
+                  branch_list => $branches,
+                  branchcode  => $branchcode );
+
+my $op = $cgi->param('op') // '';
 
 if ( $op eq 'add_form' ) {
     $template->param( add_form => 1 );
@@ -86,11 +96,32 @@ if ( $op eq 'add_form' ) {
     }
 }
 elsif ( $op eq 'add' ) {
-    add_opac_new( $title, $new, $lang, $expirationdate, $timestamp, $number );
+    add_opac_new(
+        {
+            title          => $title,
+            new            => $new,
+            lang           => $lang,
+            expirationdate => $expirationdate,
+            timestamp      => $timestamp,
+            number         => $number,
+            branchcode     => $branchcode,
+        }
+    );
     print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
 }
 elsif ( $op eq 'edit' ) {
-    upd_opac_new( $id, $title, $new, $lang, $expirationdate, $timestamp ,$number );
+    upd_opac_new(
+        {
+            idnew          => $id,
+            title          => $title,
+            new            => $new,
+            lang           => $lang,
+            expirationdate => $expirationdate,
+            timestamp      => $timestamp,
+            number         => $number,
+            branchcode     => $branchcode,
+        }
+    );
     print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
 }
 elsif ( $op eq 'del' ) {
@@ -101,7 +132,7 @@ elsif ( $op eq 'del' ) {
 
 else {
 
-    my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang );
+    my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang, $branchcode );
     
     foreach my $new ( @$opac_news ) {
         next unless $new->{'expirationdate'};
@@ -113,13 +144,9 @@ else {
     }
     
     $template->param(
-        $lang           => 1,
         opac_news       => $opac_news,
         opac_news_count => $opac_news_count,
 		);
 }
-$template->param(
-				DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
-				dateformat    => C4::Context->preference("dateformat"),
-		);
+$template->param( lang => $lang );
 output_html_with_http_headers $cgi, $cookie, $template->output;