Bug 17600: Standardize our EXPORT_OK

[srvgit] / C4 / Scrubber.pm

diff --git a/C4/Scrubber.pm b/C4/Scrubber.pm
index e434802..0fcd358 100644 (file)
--- a/C4/Scrubber.pm
+++ b/C4/Scrubber.pm
@@ -1,29 +1,30 @@
 package C4::Scrubber;
 package C4::Scrubber;

+
+# Copyright Liblime 2008
+# Parts copyright sys-tech.net 2011
+# Copyright PTFS Europe 2011
+#

 # This file is part of Koha.
 #
 # 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>.

 
 use strict;
 use warnings;
 
 use strict;
 use warnings;

-use Carp;
+use Carp qw( croak );

 use HTML::Scrubber;
 
 use C4::Context;
 use HTML::Scrubber;
 
 use C4::Context;

-use C4::Debug;
-
-our $VERSION = 0.02;
-

 
 my %scrubbertypes = (
     default => {}, # place holder, default settings are below as fallbacks in call to constructor
 
 my %scrubbertypes = (
     default => {}, # place holder, default settings are below as fallbacks in call to constructor


@@ -42,7 +43,6 @@ sub new {
     if ( !exists $scrubbertypes{$type} ) {
         croak "New called with unrecognized type '$type'";
     }
     if ( !exists $scrubbertypes{$type} ) {
         croak "New called with unrecognized type '$type'";
     }

-    $debug and carp "Building new Scrubber of type '$type'";

     my $settings = $scrubbertypes{$type};
     my $scrubber = HTML::Scrubber->new(
         allow   => exists $settings->{allow} ? $settings->{allow} : [],
     my $settings = $scrubbertypes{$type};
     my $scrubber = HTML::Scrubber->new(
         allow   => exists $settings->{allow} ? $settings->{allow} : [],


@@ -61,7 +61,6 @@ __END__
 =head1 C4::Sanitize
 
 Standardized wrapper with settings for building HTML::Scrubber tailored to various koha inputs.
 =head1 C4::Sanitize
 
 Standardized wrapper with settings for building HTML::Scrubber tailored to various koha inputs.

-More verbose debugging messages are sent in the presence of non-zero $ENV{"DEBUG"}.

 
 The default is to scrub everything, leaving no markup at all.  This is compatible with the expectations
 for Tags.
 
 The default is to scrub everything, leaving no markup at all.  This is compatible with the expectations
 for Tags.