[Koha-patches] [PATCH] Housekeeping in errors scripts

[Colin Campbell]

Enable warnings - remove Bug 2505 FIXME messages
Correct FSF address in License statement
To aid code analysis tools:
Call new unambiguously with arrow syntax
use noninterpolating quotes on noninterpolating strings
---
 errors/400.pl |   12 ++++++------
 errors/401.pl |   13 ++++++-------
 errors/402.pl |   12 ++++++------
 errors/403.pl |   12 ++++++------
 errors/404.pl |   12 ++++++------
 errors/500.pl |   12 ++++++------
 6 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/errors/400.pl b/errors/400.pl
index f7ebf8a..122a1fe 100755
--- a/errors/400.pl
+++ b/errors/400.pl
@@ -12,24 +12,24 @@
 # 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
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/400.tmpl",
+        template_name   => 'errors/400.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
diff --git a/errors/401.pl b/errors/401.pl
index 0982c2f..02884f3 100755
--- a/errors/401.pl
+++ b/errors/401.pl
@@ -12,24 +12,23 @@
 # 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
-
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/401.tmpl",
+        template_name   => 'errors/401.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
diff --git a/errors/402.pl b/errors/402.pl
index c0b9783..bd6ddd4 100755
--- a/errors/402.pl
+++ b/errors/402.pl
@@ -12,24 +12,24 @@
 # 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
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/402.tmpl",
+        template_name   => 'errors/402.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
diff --git a/errors/403.pl b/errors/403.pl
index e7759e0..5208c17 100755
--- a/errors/403.pl
+++ b/errors/403.pl
@@ -12,24 +12,24 @@
 # 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
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/403.tmpl",
+        template_name   => 'errors/403.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
diff --git a/errors/404.pl b/errors/404.pl
index b1fb9f9..6f4cfcc 100755
--- a/errors/404.pl
+++ b/errors/404.pl
@@ -12,24 +12,24 @@
 # 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
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/404.tmpl",
+        template_name   => 'errors/404.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
diff --git a/errors/500.pl b/errors/500.pl
index 6ea9d96..f2880f7 100755
--- a/errors/500.pl
+++ b/errors/500.pl
@@ -12,24 +12,24 @@
 # 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
+# Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 
-my $query = new CGI;
+my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/500.tmpl",
+        template_name   => 'errors/500.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 1,
         debug           => 1,
     }
-- 
1.6.6.1