# 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 Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Koha;
use C4::NewsChannels;
use C4::Languages qw(getTranslatedLanguages);
use Date::Calc qw/Date_to_Days Today/;
-use C4::Branch qw/GetBranches/;
use Koha::DateUtils;
-my $cgi = new CGI;
+my $cgi = CGI->new;
my $id = $cgi->param('id');
my $title = $cgi->param('title');
-my $new = $cgi->param('new');
-my $expirationdate = output_pref({ dt => dt_from_string( $cgi->param('expirationdate') ), dateformat => 'iso', dateonly => 1 });
-my $timestamp = output_pref({ dt => dt_from_string( $cgi->param('timestamp') ), dateformat => 'iso', dateonly => 1 });
+my $content = $cgi->param('content');
+my $expirationdate;
+if ( $cgi->param('expirationdate') ) {
+ $expirationdate = output_pref({ dt => dt_from_string( scalar $cgi->param('expirationdate') ), dateformat => 'iso', dateonly => 1 });
+}
+my $published_on= output_pref({ dt => dt_from_string( scalar $cgi->param('published_on') ), dateformat => 'iso', dateonly => 1 });
my $number = $cgi->param('number');
my $lang = $cgi->param('lang');
my $branchcode = $cgi->param('branch');
my $error_message = $cgi->param('error_message');
+my $wysiwyg;
+if( $cgi->param('editmode') ){
+ $wysiwyg = $cgi->param('editmode') eq "wysiwyg" ? 1 : 0;
+} else {
+ $wysiwyg = C4::Context->preference("NewsToolEditor") eq "tinymce" ? 1 : 0;
+}
# Foreign Key constraints work with NULL, not ''
# NULL = All branches.
template_name => "tools/koha-news.tt",
query => $cgi,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { tools => 'edit_news' },
debug => 1,
}
}
}
-my $branches = GetBranches;
-
$template->param( lang_list => \@lang_list,
- branch_list => $branches,
branchcode => $branchcode );
my $op = $cgi->param('op') // '';
add_opac_new(
{
title => $title,
- new => $new,
+ content => $content,
lang => $lang,
expirationdate => $expirationdate,
- timestamp => $timestamp,
+ published_on=> $published_on,
number => $number,
branchcode => $branchcode,
borrowernumber => $borrowernumber,
{
idnew => $id,
title => $title,
- new => $new,
+ content => $content,
lang => $lang,
expirationdate => $expirationdate,
- timestamp => $timestamp,
+ published_on=> $published_on,
number => $number,
branchcode => $branchcode,
}
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
elsif ( $op eq 'del' ) {
- my @ids = $cgi->param('ids');
+ my @ids = $cgi->multi_param('ids');
del_opac_new( join ",", @ids );
print $cgi->redirect("/cgi-bin/koha/tools/koha-news.pl");
}
else {
- my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, $lang, $branchcode );
+ my ( $opac_news_count, $opac_news ) = &get_opac_news( undef, undef, undef );
foreach my $new ( @$opac_news ) {
next unless $new->{'expirationdate'};
- #$new->{'expirationdate'}=format_date_in_iso($new->{'expirationdate'});
my @date = split (/-/,$new->{'expirationdate'});
if ($date[0]*$date[1]*$date[2]>0 && Date_to_Days( @date ) < Date_to_Days(&Today) ){
$new->{'expired'} = 1;
opac_news_count => $opac_news_count,
);
}
-$template->param( lang => $lang );
+$template->param(
+ lang => $lang,
+ wysiwyg => $wysiwyg,
+);
output_html_with_http_headers $cgi, $cookie, $template->output;