From: cajus Date: Thu, 13 Mar 2008 20:12:34 +0000 (+0000) Subject: * Removed the whole bunch of utf8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a776b426c2069293a5bf4d700811b68744b2108;p=gosa.git * Removed the whole bunch of utf8 * Switched to the slow PurePerl XML parse for the client to get rid of really strange encoding behaviours git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9790 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-si/client/events/corefunctions.pm b/gosa-si/client/events/corefunctions.pm index 3d0311926..2cc248857 100644 --- a/gosa-si/client/events/corefunctions.pm +++ b/gosa-si/client/events/corefunctions.pm @@ -20,7 +20,6 @@ use Data::Dumper; use Fcntl; use GOSA::GosaSupportDaemon; use File::Basename; -use open ':utf8'; my ($ldap_enabled, $ldap_config, $pam_config, $nss_config, $fai_logpath); @@ -236,6 +235,7 @@ sub new_ldap_config { my $file1; my $file2; open(file1, "> $ldap_config"); +print STDERR Dumper(PerlIO::get_layers(file1, output => 1)); print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n"; print file1 "URI"; foreach $element (@ldap_uris) { diff --git a/gosa-si/client/events/gosaTriggered.pm b/gosa-si/client/events/gosaTriggered.pm index 796bf708f..a13b872ce 100644 --- a/gosa-si/client/events/gosaTriggered.pm +++ b/gosa-si/client/events/gosaTriggered.pm @@ -18,7 +18,6 @@ my @events = ( use strict; use warnings; -use utf8; use GOSA::GosaSupportDaemon; BEGIN {} diff --git a/gosa-si/client/events/installation.pm b/gosa-si/client/events/installation.pm index 467099007..03b9f1c53 100644 --- a/gosa-si/client/events/installation.pm +++ b/gosa-si/client/events/installation.pm @@ -8,7 +8,6 @@ use strict; use warnings; use Data::Dumper; use Fcntl; -use utf8; BEGIN {} diff --git a/gosa-si/gosa-si-bus b/gosa-si/gosa-si-bus index 3ab5e917a..37d54002c 100755 --- a/gosa-si/gosa-si-bus +++ b/gosa-si/gosa-si-bus @@ -34,7 +34,6 @@ use XML::Simple; use MIME::Base64; use File::Basename; use Digest::MD5 qw(md5 md5_hex md5_base64); -use utf8; use GOSA::GosaSupportDaemon; use GOSA::DBsqlite; diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client index d56a5548d..1374cb0d6 100755 --- a/gosa-si/gosa-si-client +++ b/gosa-si/gosa-si-client @@ -20,7 +20,6 @@ use strict; use warnings; -use utf8; use Getopt::Long; use Config::IniFiles; use POSIX; @@ -39,6 +38,9 @@ use Net::DNS; use File::Basename; use File::Spec; +# Workaround: need pure perl to make it work with UTF-8 :-( +$XML::Simple::PREFERRED_PARSER= "XML::SAX::PurePerl"; + my $event_dir = "/usr/lib/gosa-si/client/events"; use lib "/usr/lib/gosa-si/client/events"; diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 47dc89b41..368f1b15e 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -25,7 +25,6 @@ use warnings; use Getopt::Long; use Config::IniFiles; use POSIX; -use utf8; use Fcntl; use IO::Socket::INET; diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm index fec419de2..e920e6230 100644 --- a/gosa-si/modules/ArpHandler.pm +++ b/gosa-si/modules/ArpHandler.pm @@ -15,7 +15,6 @@ use Net::DNS; use Switch; use Data::Dumper; use Socket; -use utf8; # Don't start if some of the modules are missing my $start_service=1; diff --git a/gosa-si/modules/ArpWatch.pm b/gosa-si/modules/ArpWatch.pm index 1b2f70a40..6487ef101 100644 --- a/gosa-si/modules/ArpWatch.pm +++ b/gosa-si/modules/ArpWatch.pm @@ -3,7 +3,6 @@ package POE::Component::ArpWatch; use strict; use warnings; -use utf8; BEGIN{ eval('use POE'); diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm index 11d48fe6d..2032db279 100644 --- a/gosa-si/modules/DBsqlite.pm +++ b/gosa-si/modules/DBsqlite.pm @@ -8,7 +8,6 @@ use Data::Dumper; use GOSA::GosaSupportDaemon; use threads; use Time::HiRes qw(usleep); -use utf8; my $col_names = {}; diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 43c06a3ad..7b23346ab 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -13,7 +13,6 @@ use File::Spec; use Data::Dumper; use GOSA::DBsqlite; use MIME::Base64; -use utf8; my $event_dir = "/usr/lib/gosa-si/server/events"; use lib "/usr/lib/gosa-si/server/events"; diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm index b06f3f2ef..0169c1c4d 100644 --- a/gosa-si/modules/SIPackages.pm +++ b/gosa-si/modules/SIPackages.pm @@ -16,7 +16,6 @@ use NetAddr::IP; use Net::LDAP; use Socket; use Net::hostent; -use utf8; my $event_dir = "/usr/lib/gosa-si/server/events"; use lib "/usr/lib/gosa-si/server/events"; diff --git a/gosa-si/modules/TestModule.pm b/gosa-si/modules/TestModule.pm index e129f632e..90c8d6abb 100644 --- a/gosa-si/modules/TestModule.pm +++ b/gosa-si/modules/TestModule.pm @@ -6,7 +6,6 @@ use Exporter; use strict; use warnings; use GosaSupportDaemon; -use utf8; BEGIN{ } diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm index d72da5334..9998ed1af 100644 --- a/gosa-si/server/events/clMessages.pm +++ b/gosa-si/server/events/clMessages.pm @@ -21,7 +21,6 @@ use strict; use warnings; use Data::Dumper; use GOSA::GosaSupportDaemon; -use utf8; use MIME::Base64; diff --git a/gosa-si/server/events/databases.pm b/gosa-si/server/events/databases.pm index 8f5648057..14ebe58d0 100644 --- a/gosa-si/server/events/databases.pm +++ b/gosa-si/server/events/databases.pm @@ -21,7 +21,6 @@ use strict; use warnings; use GOSA::GosaSupportDaemon; use Data::Dumper; -use utf8; BEGIN {} diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm index 43421356e..f069da1d4 100644 --- a/gosa-si/server/events/gosaTriggered.pm +++ b/gosa-si/server/events/gosaTriggered.pm @@ -40,7 +40,6 @@ use Crypt::SmbHash; use Net::ARP; use Net::Ping; use Socket; -use utf8; BEGIN {}