X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=Util.pm;h=9acd5d11bcd416b5d5bb534c4d2cddb6665bced6;hb=f1af5002f6710b37cf3d2b3903ef3103a34424a6;hp=87ace99b36a35c5dc2eb81a7ee0a26c0f2a61062;hpb=a6e38208b7538082ebb16db9fb3d4093daa9702b;p=mirror%2Fuserdir-ldap-cgi.git diff --git a/Util.pm b/Util.pm index 87ace99..9acd5d1 100644 --- a/Util.pm +++ b/Util.pm @@ -171,7 +171,7 @@ sub FormatFingerPrint { $out .= " " if ($_ == 7); } } else { - foreach (0..int(length($in)/2)) { + foreach (0..int(length($in)/4)) { $out .= substr($in, $_*4, 4)." "; } } @@ -256,7 +256,7 @@ sub LookupCountry { my $htmlhdrsent = 0; sub HTMLSendHeader { - print "Content-type: text/html\n\n" if (!$htmlhdrsent); + print "Content-type: text/html; charset=utf-8\n\n" if (!$htmlhdrsent); $htmlhdrsent = 1; } @@ -325,7 +325,8 @@ sub ReadConfigFile { if ((!/^\s*#/) && ($_ ne "")) { # Chop off any trailing comments s/#.*//; - ($attr, $setting) = split(/=/, $_, 2); + /([^=]+)=(.*)/; + ($attr, $setting) = ($1, $2); $setting =~ s/"//g; #" $setting =~ s/;$//; $attr =~ s/^\s+//; $attr =~ s/\s+$//;