BUG 12304: LDAP auto-provisioning set default messaging preferences

[koha_fer] / tools / koha-news.pl

diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index 8a98c76..aec9486 100755 (executable)
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -7,6 +7,7 @@
 # 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
 #
 # Koha is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -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,9 +144,9 @@ else {
     }
     
     $template->param(
-        $lang           => 1,
         opac_news       => $opac_news,
         opac_news_count => $opac_news_count,
                );
 }
+$template->param( lang => $lang );
 output_html_with_http_headers $cgi, $cookie, $template->output;