From db092071ea5c5be7079671674a937c6edb7da96c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 18 Mar 2014 11:31:39 +0100
Subject: [PATCH] Bug 11211: Fix QA issues

 FAIL	tools/calendar.pl
   FAIL	  forbidden patterns
		forbidden pattern: Koha is now under the GPLv3 license (line 7)
   FAIL	  critic
		Loop iterator is not lexical at line 126, column 5. See page 108 of PBP.

 FAIL	koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
   FAIL	  forbidden patterns
		forbidden pattern: tab char (line 90)
---
 .../intranet-tmpl/prog/en/includes/tools-menu.inc  |    2 +-
 tools/calendar.pl                                  |   22 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index 916195c..13dd061 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -87,7 +87,7 @@
 <h5>Additional tools</h5>
 <ul>
     [% IF ( CAN_user_tools_edit_calendar ) %]
-	<li><a href="/cgi-bin/koha/tools/calendar.pl">Calendar</a></li>
+        <li><a href="/cgi-bin/koha/tools/calendar.pl">Calendar</a></li>
     [% END %]
     [% IF ( CAN_user_tools_manage_csv_profiles ) %]
 	<li><a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a></li>
diff --git a/tools/calendar.pl b/tools/calendar.pl
index 2e74e93..f2447a9 100755
--- a/tools/calendar.pl
+++ b/tools/calendar.pl
@@ -2,18 +2,18 @@
 
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
 
@@ -123,7 +123,7 @@ if ( $op eq 'save' ) {
         ( $close_hour, $close_minute ) = ( $input->param( 'closeTime' ) =~ /(0?[0-9]|1[0-9]|2[0-3]):([0-5][0-9])/ );
     }
 
-    foreach our $branchcode ( @branches ) {
+    foreach my $branchcode ( @branches ) {
         my %event_types = (
             'single' => sub {
                 ModSingleEvent( $branchcode, $date, {
-- 
1.7.10.4