From 9d542d491340684b333ffa6ffa643be4c6b8f540 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Tue, 7 Jan 2014 14:43:31 -0500 Subject: [PATCH] Bug 11491 - Old License and strict, warnings Replaced License text with latest one from http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence and tweaked copyright lines accordingly. Also changed use strict and use warnings into use Modern::Perl as per PERL2 from the coding guidelines. TEST PLAN --------- 1) less ~/kohaclone/opac/svc/report - The license does not reflect the current license - This will have use strict and use warnings 2) Apply patch - The license should be corrected 3) It should still run https://.../cgi-bin/koha/svc/report?id=## https://.../cgi-bin/koha/svc/report?id=##&annotated=blah Where ## reflects a public report available (for OPAC). --- opac/svc/report | 29 ++++++++++++++--------------- svc/report | 27 +++++++++++++-------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/opac/svc/report b/opac/svc/report index f6cd6b9..194707b 100755 --- a/opac/svc/report +++ b/opac/svc/report @@ -1,25 +1,24 @@ #!/usr/bin/perl -# Copyright 2011 Chris Cormack -# # 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. +# Copyright (C) 2011 Chris Cormack +# Copyright (C) 2013 Mark Tompsett # -# 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 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. # -# 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. - +# 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, see . -use strict; -use warnings; +use Modern::Perl; use C4::Reports::Guided; use JSON; diff --git a/svc/report b/svc/report index 41ea125..3ae39a2 100755 --- a/svc/report +++ b/svc/report @@ -1,25 +1,24 @@ #!/usr/bin/perl -# Copyright 2011 Chris Cormack -# # 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. +# Copyright (C) 2011 Chris Cormack +# Copyright (C) 2013 Mark Tompsett # -# 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 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. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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, see . -use strict; -use warnings; +use Modern::Perl; use C4::Auth; use C4::Reports::Guided; -- 1.7.9.5