From 644e340fdbc9ae2044716e8e7d659231ac8700b5 Mon Sep 17 00:00:00 2001 From: toins Date: Fri, 13 Jul 2007 16:01:32 +0000 Subject: [PATCH] GPL added + tmpl display fix. --- koha-tmpl/errors/400.pl | 36 ++++++++++++++----- koha-tmpl/errors/401.pl | 36 ++++++++++++++----- koha-tmpl/errors/402.pl | 36 ++++++++++++++----- koha-tmpl/errors/403.pl | 36 ++++++++++++++----- koha-tmpl/errors/404.pl | 36 ++++++++++++++----- koha-tmpl/errors/500.pl | 36 ++++++++++++++----- .../intranet-tmpl/prog/en/errors/400.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/401.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/402.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/403.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/404.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/405.tmpl | 17 +++++---- .../intranet-tmpl/prog/en/errors/500.tmpl | 5 ++- 13 files changed, 212 insertions(+), 111 deletions(-) diff --git a/koha-tmpl/errors/400.pl b/koha-tmpl/errors/400.pl index a804b4a448..d2c28d33c3 100755 --- a/koha-tmpl/errors/400.pl +++ b/koha-tmpl/errors/400.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/400.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/400.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/errors/401.pl b/koha-tmpl/errors/401.pl index bd0e8fc6f7..348906576f 100755 --- a/koha-tmpl/errors/401.pl +++ b/koha-tmpl/errors/401.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/401.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/401.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/errors/402.pl b/koha-tmpl/errors/402.pl index de7a2157eb..f463fdcc8a 100755 --- a/koha-tmpl/errors/402.pl +++ b/koha-tmpl/errors/402.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/402.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/402.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/errors/403.pl b/koha-tmpl/errors/403.pl index 073b3fb56a..b0b34fe0f7 100755 --- a/koha-tmpl/errors/403.pl +++ b/koha-tmpl/errors/403.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/403.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/403.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/errors/404.pl b/koha-tmpl/errors/404.pl index 1af16f76bd..e4904d228f 100755 --- a/koha-tmpl/errors/404.pl +++ b/koha-tmpl/errors/404.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/404.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/404.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/errors/500.pl b/koha-tmpl/errors/500.pl index 0847d16d6c..545d570d09 100755 --- a/koha-tmpl/errors/500.pl +++ b/koha-tmpl/errors/500.pl @@ -1,20 +1,38 @@ #!/usr/bin/perl +# 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 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 + +# $Id$ + use strict; use CGI; use C4::Auth; use C4::Output; use C4::Context; - my $query = new CGI; my $admin = C4::Context->preference('KohaAdminEmailAddress'); -my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "errors/500.tmpl", - query => $query, - type => "intranet", - authnotrequired => 1, - debug => 1, - }); -$template->param( admin => $admin); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "errors/500.tmpl", + query => $query, + type => "intranet", + authnotrequired => 1, + debug => 1, + } +); +$template->param( admin => $admin ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl index 3f4a1516b1..146882f1ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/400.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 404

-
    -
  • This error means that the link was broken and that the page doesn't exist
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 400

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl index 9c25bc1967..5169d79e66 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/401.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 401

-
    -
  • This error means that you aren't authorized to view this page
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 401

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl index 3f4a1516b1..d817c8fd63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/402.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 404

-
    -
  • This error means that the link was broken and that the page doesn't exist
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 402

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl index 3f4a1516b1..80fab4cd9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/403.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 404

-
    -
  • This error means that the link was broken and that the page doesn't exist
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 403

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl index 3f4a1516b1..14278d93e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/404.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 404

-
    -
  • This error means that the link was broken and that the page doesn't exist
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 404

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl index 3f4a1516b1..e73cd32087 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/405.tmpl @@ -4,16 +4,15 @@ -
-

An Error has Occurred!

-

Error 404

-
    -
  • This error means that the link was broken and that the page doesn't exist
    • -
  • To report this error, you can ">email the Koha Administrator.
    • -
  • Use top menu bar to navigate to another part of Koha.
    • -
-
+

An Error has Occurred!

+

Error 405

+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl b/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl index 7c0c517e41..c99e8cf822 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/errors/500.tmpl @@ -3,15 +3,14 @@ -
+

An Error has Occurred!

Error 500

-
  • In Koha this typically means that the Koha team is working on new features
  • Wait while system maintenance is being done or ">email the Koha Administrator.
  • Use top menu bar to navigate to another part of Koha.
-
+ -- 2.39.5