forked from github/kensanata.oddmuse
e531f9d569
Drafts are saved using the username as filename. This must also be encoded and decoded correctly. Because of NFC and NFD issues on Mac HFS, an appropriate normalization was added to mac.pl. As the username is also part of the cookie, this showed that the Cookie content wasn't being encoded correctly, so that was fixed, too.
86 lines
2.5 KiB
Perl
86 lines
2.5 KiB
Perl
# Copyright (C) 2005 Alex Schroeder <alex@emacswiki.org>
|
|
#
|
|
# This program 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.
|
|
#
|
|
# This program 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 this program; if not, write to the
|
|
# Free Software Foundation, Inc.
|
|
# 59 Temple Place, Suite 330
|
|
# Boston, MA 02111-1307 USA
|
|
|
|
$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/mac.pl">mac.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Mac">Mac</a></p>';
|
|
|
|
use Unicode::Normalize;
|
|
|
|
*OldMacAllPagesList = *AllPagesList;
|
|
*AllPagesList = *NewMacAllPagesList;
|
|
|
|
sub NewMacAllPagesList {
|
|
$refresh = GetParam('refresh', 0);
|
|
if ($IndexInit && !$refresh) {
|
|
return @IndexList;
|
|
}
|
|
OldMacAllPagesList(@_);
|
|
my @new = ();
|
|
%IndexHash = ();
|
|
foreach my $id (@IndexList) {
|
|
$id = NFC($id);
|
|
push(@new, $id);
|
|
$IndexHash{$id} = 1;
|
|
}
|
|
@IndexList = @new;
|
|
return @new;
|
|
}
|
|
|
|
push(@MyInitVariables, \&MacFixEncoding);
|
|
|
|
sub MacFixEncoding {
|
|
# disable grep if searching for non-ascii stuff:
|
|
|
|
# $ mkdir /tmp/dir
|
|
# $ echo schroeder > /tmp/dir/schroeder
|
|
# $ echo schröder > /tmp/dir/schröder
|
|
# $ echo SCHRÖDER > /tmp/dir/SCHRÖDER-UP # don't use SCHRÖDER because of HFS
|
|
# $ grep -rli schröder /tmp/dir
|
|
# /tmp/dir/schröder
|
|
# $ grep -rli SCHRÖDER /tmp/dir
|
|
# /tmp/dir/schröder
|
|
#
|
|
# Why is grep not finding the upper case variant in the SCHRÖDER-UP
|
|
# file?
|
|
|
|
$UseGrep = 0 if GetParam('search', '') =~ /[x{0080}-\x{ffff}]/;
|
|
|
|
# the rest is only necessary if using namespaces.pl
|
|
return unless defined %Namespaces;
|
|
while (my ($key, $value) = each %Namespaces) {
|
|
delete $Namespaces{$key};
|
|
utf8::decode($key);
|
|
$key = NFC($key);
|
|
$Namespaces{$key} = $NamespaceRoot . '/' . $key . '/';
|
|
}
|
|
while (my ($key, $value) = each %InterSite) {
|
|
delete $InterSite{$key};
|
|
utf8::decode($key);
|
|
$key = NFC($key);
|
|
$InterSite{$key} = $Namespaces{$key} if $Namespaces{$key};
|
|
}
|
|
}
|
|
|
|
# for drafts.pl
|
|
|
|
*OldMacDraftFiles = *DraftFiles;
|
|
*DraftFiles = *NewMacDraftFiles;
|
|
|
|
sub NewMacDraftFiles {
|
|
return map { NFC($_) } OldMacDraftFiles(@_);
|
|
}
|