X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FScrubber.pm;h=0fcd3580bc2c323a19e7e6836077115c308cc5fd;hb=ad83d2e07d3c2c28e962b1a2e8d04b6f25a4a868;hp=e43480201ca75211820d7beb782df366f62e2e75;hpb=2390b4e1dc442d5280eab763a72b7cbd10680669;p=srvgit

diff --git a/C4/Scrubber.pm b/C4/Scrubber.pm
index e43480201c..0fcd3580bc 100644
--- a/C4/Scrubber.pm
+++ b/C4/Scrubber.pm
@@ -1,29 +1,30 @@
 package C4::Scrubber;
+
+# Copyright Liblime 2008
+# Parts copyright sys-tech.net 2011
+# Copyright PTFS Europe 2011
+#
 # 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 Carp;
+use Carp qw( croak );
 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
@@ -42,7 +43,6 @@ sub new {
     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} : [],
@@ -61,7 +61,6 @@ __END__
 =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.