improvement
parent
c24be1b752
commit
d4b4475521
|
@ -46,7 +46,7 @@ sub page_locked ($$;$) { #{{{
|
||||||
if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
|
if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
|
||||||
return 1 if $nonfatal;
|
return 1 if $nonfatal;
|
||||||
error(htmllink("", "", $page, 1)." is locked by ".
|
error(htmllink("", "", $page, 1)." is locked by ".
|
||||||
htmllink("", "", $admin, 1)." and cannot be edited.");
|
userlink($admin)." and cannot be edited.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,22 +77,12 @@ sub cgi_recentchanges ($) { #{{{
|
||||||
|
|
||||||
eval q{use Time::Duration};
|
eval q{use Time::Duration};
|
||||||
error($@) if $@;
|
error($@) if $@;
|
||||||
eval q{use CGI 'escapeHTML'};
|
|
||||||
error($@) if $@;
|
|
||||||
|
|
||||||
my $changelog=[rcs_recentchanges(100)];
|
my $changelog=[rcs_recentchanges(100)];
|
||||||
foreach my $change (@$changelog) {
|
foreach my $change (@$changelog) {
|
||||||
$change->{when} = concise(ago($change->{when}));
|
$change->{when} = concise(ago($change->{when}));
|
||||||
|
|
||||||
if ($change->{user} =~ m!^https?://! &&
|
$change->{user} = userlink($change->{user});
|
||||||
eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
|
|
||||||
# Munge user-urls, as used by eg, OpenID.
|
|
||||||
my $oid=Net::OpenID::VerifiedIdentity->new(identity => $change->{user});
|
|
||||||
$change->{user} = "<a href=\"".$change->{user}."\">".escapeHTML($oid->display)."</a>";
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
|
my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
|
||||||
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
|
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
|
||||||
|
@ -655,4 +645,20 @@ sub cgi (;$$) { #{{{
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
|
sub userlink ($) { #{{{
|
||||||
|
my $user=shift;
|
||||||
|
|
||||||
|
eval q{use CGI 'escapeHTML'};
|
||||||
|
error($@) if $@;
|
||||||
|
if ($user =~ m!^https?://! &&
|
||||||
|
eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
|
||||||
|
# Munge user-urls, as used by eg, OpenID.
|
||||||
|
my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
|
||||||
|
return "<a href=\"$user\">".escapeHTML($oid->display)."</a>";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return htmllink("", "", escapeHTML($user), 1);
|
||||||
|
}
|
||||||
|
} #}}}
|
||||||
|
|
||||||
1
|
1
|
||||||
|
|
Loading…
Reference in New Issue