From e0306a34bc83ea3ec383603e12e734c3d60c5cef Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 2 Mar 2022 15:55:18 +1300 Subject: [PATCH] Bug 8628: (follow-up) Fix documentation, subroutine calls, filters --- Koha/Sign.pm | 20 +-- Koha/SignStream.pm | 20 +-- Koha/SignStreams.pm | 20 +-- Koha/Signs.pm | 20 +-- Koha/SignsToStream.pm | 20 +-- Koha/SignsToStreams.pm | 20 +-- .../mysql/atomicupdate/bug_8628-digital-signs.perl | 2 +- installer/data/mysql/kohastructure.sql | 2 +- .../intranet-tmpl/prog/en/modules/tools/signs.tt | 141 +++++++++++---------- .../opac-tmpl/bootstrap/en/modules/opac-signs.tt | 85 +++++++------ opac/opac-signs.pl | 32 ++--- tools/signs.pl | 29 ++--- 12 files changed, 206 insertions(+), 205 deletions(-) diff --git a/Koha/Sign.pm b/Koha/Sign.pm index 6c8c7fcc026..2234cd4ba5b 100644 --- a/Koha/Sign.pm +++ b/Koha/Sign.pm @@ -4,18 +4,18 @@ package Koha::Sign; # # 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 3 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 . use Modern::Perl; diff --git a/Koha/SignStream.pm b/Koha/SignStream.pm index 185e21422a9..2de87ed16ac 100644 --- a/Koha/SignStream.pm +++ b/Koha/SignStream.pm @@ -4,18 +4,18 @@ package Koha::SignStream; # # 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 3 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 . use Modern::Perl; diff --git a/Koha/SignStreams.pm b/Koha/SignStreams.pm index 26b55961099..25a526d2d73 100644 --- a/Koha/SignStreams.pm +++ b/Koha/SignStreams.pm @@ -4,18 +4,18 @@ package Koha::SignStreams; # # 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 3 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 . use Modern::Perl; diff --git a/Koha/Signs.pm b/Koha/Signs.pm index da32aff670d..b4bee9a43e5 100644 --- a/Koha/Signs.pm +++ b/Koha/Signs.pm @@ -4,18 +4,18 @@ package Koha::Signs; # # 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 3 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 . use Modern::Perl; diff --git a/Koha/SignsToStream.pm b/Koha/SignsToStream.pm index cc73371eb96..16f51f2fbf5 100644 --- a/Koha/SignsToStream.pm +++ b/Koha/SignsToStream.pm @@ -4,18 +4,18 @@ package Koha::SignsToStream; # # 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 3 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 . use Modern::Perl; diff --git a/Koha/SignsToStreams.pm b/Koha/SignsToStreams.pm index c677bcbcf37..ac15aa07934 100644 --- a/Koha/SignsToStreams.pm +++ b/Koha/SignsToStreams.pm @@ -4,18 +4,18 @@ package Koha::SignsToStreams; # # 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 3 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 . use Modern::Perl; diff --git a/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl b/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl index b496e31c9a3..2703bca1efd 100644 --- a/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl +++ b/installer/data/mysql/atomicupdate/bug_8628-digital-signs.perl @@ -18,7 +18,7 @@ if( CheckVersion( $DBversion ) ) { $dbh->do(q{ CREATE TABLE signs ( sign_id int(11) NOT NULL auto_increment, -- primary key, used to identify signs name varchar(64), -- name/title of the deck - webapp int(1) NOT NULL DEFAULT 0, -- display as web app or normal page + webapp tinyint(1) NOT NULL DEFAULT 0, -- display as web app or normal page transition char(16) NOT NULL DEFAULT 'none', -- transition to use between pages, must be one of the transitions defined by jQuery Mobile (see their docs) swatch char(1) NOT NULL DEFAULT '', -- swatches determine the colors of page elements idleafter int(11) NOT NULL default 0, -- seconds to wait before automatic page turning cicks in diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index aee00159199..6c92dba20a2 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -5384,7 +5384,7 @@ DROP TABLE IF EXISTS signs; CREATE TABLE signs ( `sign_id` int(11) NOT NULL auto_increment, -- primary key, used to identify signs `name` varchar(64), -- name/title of the deck - `webapp` int(1) NOT NULL DEFAULT 0, -- display as web app or normal page + `webapp` tinyint(1) NOT NULL DEFAULT 0, -- display as web app or normal page `transition` char(16) NOT NULL DEFAULT 'none', -- transition to use between pages, must be one of the transitions defined by jQuery Mobile (see their docs) `swatch` char(1) NOT NULL DEFAULT '', -- swatches determine the colors of page elements `idleafter` int(11) NOT NULL default 0, -- seconds to wait before automatic page turning clicks in diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt index 6fad2fe7c5f..931079996ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/signs.tt @@ -1,8 +1,9 @@ +[% USE raw %] [% USE Koha %] [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Digital signs +Digital signs › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -15,28 +16,28 @@ Tools › [% IF op == 'stream_form' %] [% IF ( stream.sign_stream_id ) %] - [% INCLUDE dslink %] Edit "[% stream.name %]" + [% INCLUDE dslink %] Edit "[% stream.name | html %]" [% ELSE %] [% INCLUDE dslink %] Add a new stream [% END %] [% ELSIF op == 'sign_form' %] [% IF ( sign.sign_id ) %] - [% INCLUDE dslink %] Edit "[% sign.name %]" + [% INCLUDE dslink %] Edit "[% sign.name | html %]" [% ELSE %] [% INCLUDE dslink %] Add a new sign [% END %] [% ELSIF op == 'edit_streams' %] - [% INCLUDE dslink %] Edit streams attached to "[% sign.name %]" + [% INCLUDE dslink %] Edit streams attached to "[% sign.name | html %]" [% ELSIF op == 'get_params' %] [% INCLUDE dslink %] - Edit streams attached to "[% sign.name %]" › + Edit streams attached to "[% sign.name | html %]" › Get parameters [% ELSIF op == 'del_stream' %] - [% INCLUDE dslink %] Delete stream "[% stream.name %]" + [% INCLUDE dslink %] Delete stream "[% stream.name | html %]" [% ELSIF op == 'del_stream_ok' %] [% INCLUDE dslink %] Stream deleted [% ELSIF op == 'del_sign' %] - [% INCLUDE dslink %] Delete sign "[% sign.name %]" + [% INCLUDE dslink %] Delete sign "[% sign.name | html %]" [% ELSIF op == 'del_sign_ok' %] [% INCLUDE dslink %] Sign deleted [% ELSIF op == 'view_sign' %] @@ -79,16 +80,16 @@ [% ELSE %]

Add stream

[% END %] -
+ [% IF ( stream.sign_stream_id ) %] - + [% END %]
  1. - + Required
  2. @@ -98,9 +99,9 @@ [% END %] [% FOREACH report IN reports %] [% IF ( report.id == stream.saved_sql_id ) %] - + [% ELSE %] - + [% END %] [% END %] @@ -118,15 +119,15 @@ [% ELSE %]

    Add sign

    [% END %] - + [% IF ( sign.sign_id ) %] - + [% END %]
    General settings
      -
    1. +
    @@ -147,9 +148,9 @@ [% FOREACH swatch IN Koha.Preference('OPACDigitalSignsSwatches').split('') %] [% IF swatch == sign.swatch %] - + [% ELSE %] - + [% END %] [% END %] @@ -158,9 +159,9 @@ @@ -171,13 +172,13 @@ Automatic page turning
    1. - seconds. (Set to 0 to disable automatic page turning.) + seconds. (Set to 0 to disable automatic page turning.)
    2. - seconds. + seconds.
    3. - seconds. + seconds.
    @@ -185,7 +186,7 @@
  3. [% ELSIF op == 'edit_streams' %] -

    Edit streams attached to [% sign.name %]

    +

    Edit streams attached to [% sign.name | html %]

    Streams already attached to this sign

    [% IF ( sts.count ) %] @@ -199,16 +200,16 @@ [% FOREACH s IN sts %] - - + + - + [% END %] @@ -218,15 +219,15 @@ [% END %]

    Attach a new stream to this sign

    - + - +
    1. @@ -236,14 +237,14 @@ [% ELSIF op == 'get_params' %] -

      Parameters for [% stream.name %]

      - Based on report: [% sql.report_name %] | Edit this report +

      Parameters for [% stream.name | html %]

      + Based on report: [% sql.report_name | html %] | Edit this report -
      + - - - + + +
      [% IF ( sts.params ) %] Edit parameters @@ -252,7 +253,7 @@ [% END %]
      1. - +
      @@ -274,14 +275,14 @@ [% ELSIF op == 'del_stream' %]
      -

      Confirm deletion of stream '[% stream.name %]'?

      - +

      Confirm deletion of stream '[% stream.name | html %]'?

      + - + -
      +
      @@ -289,21 +290,21 @@ [% ELSIF op == 'del_stream_ok' %]

      Stream deleted

      -
      +
      [% ELSIF op == 'del_sign' %]
      -

      Confirm deletion of sign '[% sign.name %]'?

      -
      +

      Confirm deletion of sign '[% sign.name | html %]'?

      + - + -
      +
      @@ -311,21 +312,21 @@ [% ELSIF op == 'del_sign_ok' %]

      Sign deleted

      -
      +
      [% ELSIF op == 'view_sign' %] -

      [% sign.name %]

      +

      [% sign.name | html %]

      Streams

      [% IF ( streams ) %] [% FOREACH stream IN streams %] -

      [% stream.sign_stream.name %]

      +

      [% stream.sign_stream.name | html %]

      [% END %] @@ -334,8 +335,8 @@ [% END %] [% ELSIF op == 'view_stream' %] -

      [% stream.name %]

      - Based on report: [% stream.saved_sql_id.report_name %] | Edit this report +

      [% stream.name | html %]

      + Based on report: [% stream.saved_sql_id.report_name | html %] | Edit this report

      SQL

      [% stream.saved_sql_id.savedsql | html %]
      @@ -374,21 +375,21 @@
    [% FOREACH s IN signs %] - + - - - - - + + + + + @@ -414,11 +415,11 @@ [% FOREACH s IN streams %] - - + + [% END %] @@ -480,7 +481,7 @@ [% FOREACH r IN records %] - + [% END %]
    [% s.sign_stream.name %][% IF s.params %][% s.params %][% ELSE %]None[% END %][% s.sign_stream.name | html %][% IF s.params %][% s.params | html %][% ELSE %]None[% END %] [% IF s.params %] - + [% ELSE %] - + [% END %] Detach Detach
    [% s.name %][% s.name | html %] [% IF ( s.webapp ) %]Yes[% ELSE %]No[% END %][% s.swatch %][% s.transition %][% s.idleafter %][% s.pagedelay %][% s.reloadafter %][% s.swatch | html %][% s.transition | html %][% s.idleafter | html %][% s.pagedelay | html %][% s.reloadafter | html %]
    [% s.name %][% s.saved_sql.report_name %][% s.name | html %][% s.saved_sql.report_name | html %] - Edit - Delete + Edit + Delete
    [% r.biblionumber %][% r.title %]
    [% r.biblionumber | html %][% r.title | html %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt index 7b01f522267..71ad0300037 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-signs.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Koha %] [% USE KohaDates %] [% USE Branches %] @@ -20,7 +21,7 @@ [%- END -%] [%- IF ( item.transfertwhen ) %] [%- SET itemavailable = 0 -%] - [%-%]In transit from [%- item.transfertfrom %] to [%- item.transfertto %] since [%- item.transfertwhen | $KohaDates %] + [%-%]In transit from [%- item.transfertfrom | html %] to [%- item.transfertto | html %] since [%- item.transfertwhen | $KohaDates %] [%- END %] [%- IF ( item.waiting ) -%] [%- SET itemavailable = 0 -%] @@ -33,13 +34,13 @@ [%- IF ( item.itemnotforloan ) -%] [%- SET itemavailable = 0 -%] [%- IF ( item.notforloanvalueopac ) -%] - [%- item.notforloanvalueopac -%] [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] + [%- item.notforloanvalueopac | html -%] [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] [%- ELSE -%] - [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] + [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] [%- END -%] [%- ELSIF ( item.notforloan_per_itemtype ) -%] [%- SET itemavailable = 0 -%] - [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] + [%-%]Not for loan [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] [%- END -%] [%- IF ( item.damaged ) -%] [%- SET itemavailable = 0 -%] @@ -50,25 +51,25 @@ [%-%]On order [%- END -%] [%- IF ( itemavailable ) -%] - [%-%]Available [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac -%])[%- END -%] + [%-%]Available [%- IF ( item.restrictedopac ) -%] ([%- item.restrictedopac | html -%])[%- END -%] [%- END -%] [%- END -%] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( sign ) %][% sign.name %] - Koha[% ELSE %]Koha digital signs[% END %] +[% IF ( sign ) %][% sign.name | html %] - Koha[% ELSE %]Koha digital signs[% END %] [%- IF ( sign.webapp ) %] [% END -%] [% BLOCK cssinclude %] [%- IF Koha.Preference( 'OPACDigitalSignsCSS' ) != '' -%] - - [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") %] + [% Asset.css("lib/jquery/mobile/jquery.mobile.structure.min.css") | $raw %] [%- ELSE -%] - [% Asset.css("css/signs.css") %] - [% Asset.css("lib/jquery/mobile/jquery.mobile.min.css") %] + [% Asset.css("css/signs.css") | $raw %] + [% Asset.css("lib/jquery/mobile/jquery.mobile.min.css") | $raw %] [%- END -%] [% END # BLOCK cssinclude %] [% INCLUDE 'doc-head-close.inc' %] @@ -83,22 +84,22 @@ [%- IF ( streams.0 ) -%] [%# Iterate through the streams, creating one front page for each %] [%- FOREACH s IN streams -%] -
    -
    +
    +
    [%# The header has a list of buttons for all the streams %] [%- SET localstreams = streams -%] [%- FOREACH stream IN localstreams -%] [% IF s.sign_stream_id == stream.sign_stream_id %] - [% stream.name %] + [% stream.name | html %] [% ELSE %] - [% stream.name %] + [% stream.name | html %] [% END %] [% END -%]
    -

    [% s.name %]

    +

    [% s.name | html %]

    @@ -118,7 +119,7 @@
    @@ -129,7 +130,7 @@ [% INCLUDE 'opac-bottom.inc' is_popup=1 %] [% BLOCK jsinclude %] [% IF sign && Koha.Preference( 'OPACDigitalSigns') %] - [% END # IF ( sign ) %] - [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") %] + [% Asset.js("lib/jquery/mobile/jquery.mobile.min.js") | $raw %] [% END # BLOCK jsinclude %] diff --git a/opac/opac-signs.pl b/opac/opac-signs.pl index 48904689b37..74347881235 100755 --- a/opac/opac-signs.pl +++ b/opac/opac-signs.pl @@ -4,27 +4,27 @@ # # 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 3 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 . use CGI; -use C4::Auth; -use C4::Output; -use C4::Biblio; -use C4::Reports::Guided; +use C4::Auth qw( get_template_and_user ); +use C4::Output qw( output_html_with_http_headers ); +use C4::Biblio qw( GetMarcBiblio GetBiblioData ); +use C4::Reports::Guided qw( execute_query ); use C4::Context; -use C4::Koha; -use C4::Items; +use C4::Koha qw( GetNormalizedISBN ); +use C4::Items qw( GetItemsInfo ); use Koha::AuthorisedValues; use Koha::Signs; use Koha::SignStreams; diff --git a/tools/signs.pl b/tools/signs.pl index eff2784a35d..e243b59b972 100755 --- a/tools/signs.pl +++ b/tools/signs.pl @@ -4,18 +4,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 3 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 . =head1 NAME @@ -38,14 +38,14 @@ use Koha::SignStreams; use Koha::SignsToStreams; use Koha::Reports; use CGI; -use C4::Auth; +use C4::Auth qw( get_template_and_user ); use C4::Context; use C4::Log; -use C4::Output; -use C4::Reports::Guided; +use C4::Output qw( output_html_with_http_headers ); +use C4::Reports::Guided qw( get_saved_reports execute_query ); use Modern::Perl; -my $cgi = new CGI; +my $cgi = CGI->new; my $dbh = C4::Context->dbh; my $script_name = 'signs.pl'; @@ -53,7 +53,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ template_name => "tools/signs.tt", query => $cgi, type => "intranet", - authnotrequired => 0, flagsrequired => { tools => 'edit_digital_signs' }, debug => 0, }); -- 2.11.0