projects
/
mirror
/
userdir-ldap-cgi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add VoIP to cgi
[mirror/userdir-ldap-cgi.git]
/
Util.pm
diff --git
a/Util.pm
b/Util.pm
index
87ace99
..
1688dc4
100644
(file)
--- a/
Util.pm
+++ b/
Util.pm
@@
-171,10
+171,11
@@
sub FormatFingerPrint {
$out .= " " if ($_ == 7);
}
} else {
$out .= " " if ($_ == 7);
}
} else {
- foreach (0..int(length($in)/
2
)) {
+ foreach (0..int(length($in)/
4
)) {
$out .= substr($in, $_*4, 4)." ";
}
}
$out .= substr($in, $_*4, 4)." ";
}
}
+ chop $out;
return $out;
}
return $out;
}
@@
-256,7
+257,7
@@
sub LookupCountry {
my $htmlhdrsent = 0;
sub HTMLSendHeader {
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;
}
$htmlhdrsent = 1;
}
@@
-325,7
+326,8
@@
sub ReadConfigFile {
if ((!/^\s*#/) && ($_ ne "")) {
# Chop off any trailing comments
s/#.*//;
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+$//;
$setting =~ s/"//g; #"
$setting =~ s/;$//;
$attr =~ s/^\s+//; $attr =~ s/\s+$//;