#
# 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 Modern::Perl;
use C4::Context;
use C4::Scheduler;
use C4::Reports::Guided;
use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Output;
-use C4::Dates;
+use Koha::DateUtils;;
use vars qw($debug);
}
my $input = new CGI;
+my $base;
+
+if ( C4::Context->config('supportdir') ) {
+ $base = C4::Context->config('supportdir');
+}
+else {
+ $base = "/usr/share/koha/bin";
+}
-my $base = C4::Context->config('intranetdir');
my $CONFIG_NAME = $ENV{'KOHA_CONF'};
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
if ( $mode eq 'job_add' ) {
# Retrieving the date according to the dateformat syspref
- my $c4date = C4::Dates->new($input->param('startdate'));
+ my $c4date = output_pref({ dt => dt_from_string( scalar $input->param('startdate') ), dateformat => 'iso', dateonly => 1 });
# Formatting it for Schedule::At
- my $startdate = join('', (split /-/, $c4date->output("iso")));
+ my $startdate = join('', (split /-/, $c4date));
my $starttime = $input->param('starttime');
- my $recurring = $input->param('recurring');
$starttime =~ s/\://g;
my $start = $startdate . $starttime;
my $report = $input->param('report');
my $format = $input->param('format');
my $email = $input->param('email');
my $command =
- "EXPORT KOHA_CONF=\"$CONFIG_NAME\"; " . $base
- . "/tools/runreport.pl $report $format $email";
-
- if ($recurring) {
- my $frequency = $input->param('frequency');
- add_cron_job( $start, $command );
- }
- else {
- unless ( add_at_job( $start, $command ) ) {
- $template->param( job_add_failed => 1 );
- }
+ "export KOHA_CONF=\"$CONFIG_NAME\"; " .
+ "$base/cronjobs/runreport.pl $report --format=$format --to=$email";
+
+#FIXME commit ea899bc55933cd74e4665d70b1c48cab82cd1257 added recurring parameter (it is not in template) and call to add_cron_job (undefined)
+# my $recurring = $input->param('recurring');
+# if ($recurring) {
+# my $frequency = $input->param('frequency');
+# add_cron_job( $start, $command );
+# }
+# else {
+# #here was the the unless ( add_at_job
+# }
+
+ unless ( add_at_job( $start, $command ) ) {
+ $template->param( job_add_failed => 1 );
}
}