X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/389ad222ec2e0457106339fb71713dad7b95f80e..a27b1615ad083d8aa0136a8014bcb513a9076379:/IkiWiki/CGI.pm diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 9b5ee6c19..96b9dab61 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -45,8 +45,12 @@ sub page_locked ($$;$) { #{{{ my $locked_pages=userinfo_get($admin, "locked_pages"); if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) { return 1 if $nonfatal; - error(htmllink("", "", $page, 1)." is locked by ". - userlink($admin)." and cannot be edited."); + + #translators: The first parameter is a page name, + #translators: second is the user who locked it. + error(sprintf(gettext("%s is locked by %s and cannot be edited"), + htmllink("", "", $page, 1), + userlink($admin))); } } @@ -88,7 +92,7 @@ sub cgi_recentchanges ($) { #{{{ delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess; $change->{pages} = [ map { - $_->{link} = htmllink("", "", $_->{page}, 1); + $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page})); $_; } @{$change->{pages}} ]; @@ -125,8 +129,7 @@ sub cgi_signin ($$) { #{{{ params => $q, action => $config{cgiurl}, header => 0, - template => (-e "$config{templatedir}/signin.tmpl" ? - {template_params("signin.tmpl")} : ""), + template => scalar template_params("signin.tmpl"), stylesheet => baseurl()."style.css", ); my $buttons=["Login"]; @@ -134,7 +137,7 @@ sub cgi_signin ($$) { #{{{ $form->field(name => "do", type => "hidden"); if ($q->param("do") ne "signin" && !$form->submitted) { - $form->text("You need to log in first."); + $form->text(gettext("You need to log in first.")); } run_hooks(formbuilder_setup => sub { @@ -194,8 +197,7 @@ sub cgi_prefs ($$) { #{{{ javascript => 0, params => $q, action => $config{cgiurl}, - template => (-e "$config{templatedir}/prefs.tmpl" ? - {template_params("prefs.tmpl")} : ""), + template => scalar template_params("prefs.tmpl"), stylesheet => baseurl()."style.css", ); my $buttons=["Save Preferences", "Logout", "Cancel"]; @@ -242,7 +244,7 @@ sub cgi_prefs ($$) { #{{{ redirect($q, $config{url}); return; } - elsif ($form->submitted eq "Save Preferences" && $form->validate) { + elsif ($form->submitted eq 'Save Preferences' && $form->validate) { foreach my $field (qw(email subscriptions locked_pages)) { if (defined $form->field($field) && length $form->field($field)) { userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field"); @@ -252,7 +254,7 @@ sub cgi_prefs ($$) { #{{{ set_banned_users(grep { ! is_admin($_) } split(' ', $form->field("banned_users"))); } - $form->text("Preferences saved."); + $form->text(gettext("Preferences saved.")); } if (exists $hooks{formbuilder}) { @@ -289,8 +291,7 @@ sub cgi_editpage ($$) { #{{{ params => $q, action => $config{cgiurl}, table => 0, - template => (-e "$config{templatedir}/editpage.tmpl" ? - {template_params("editpage.tmpl")} : ""), + template => scalar template_params("editpage.tmpl"), ); run_hooks(formbuilder_setup => sub { @@ -303,8 +304,7 @@ sub cgi_editpage ($$) { #{{{ # characters. my ($page)=$form->field('page'); $page=titlepage(possibly_foolish_untaint($page)); - if (! defined $page || ! length $page || - $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) { + if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) { error("bad page name"); } @@ -394,7 +394,7 @@ sub cgi_editpage ($$) { #{{{ my $best_loc; if (! defined $from || ! length $from || $from ne $form->field('from') || - $from=~/$config{wiki_file_prune_regexp}/ || + file_pruned($from, $config{srcdir}) || $from=~/^\// || $form->submitted eq "Preview") { @page_locs=$best_loc=$page; @@ -404,7 +404,7 @@ sub cgi_editpage ($$) { #{{{ $dir=~s![^/]+/+$!!; if ((defined $form->field('subpage') && length $form->field('subpage')) || - $page eq 'discussion') { + $page eq gettext('discussion')) { $best_loc="$from/$page"; } else { @@ -418,6 +418,8 @@ sub cgi_editpage ($$) { #{{{ push @page_locs, $dir.$page; } } + push @page_locs, "$config{userdir}/$page" + if length $config{userdir}; @page_locs = grep { ! exists $pagecase{lc $_} && @@ -441,7 +443,7 @@ sub cgi_editpage ($$) { #{{{ options => \@page_locs, value => $best_loc); $form->field(name => "type", type => 'select', options => \@page_types); - $form->title("creating ".pagetitle($page)); + $form->title(sprintf(gettext("creating %s"), pagetitle($page))); } elsif ($form->field("do") eq "edit") { page_locked($page, $session); @@ -458,7 +460,7 @@ sub cgi_editpage ($$) { #{{{ $form->tmpl_param("page_select", 0); $form->field(name => "page", type => 'hidden'); $form->field(name => "type", type => 'hidden'); - $form->title("editing ".pagetitle($page)); + $form->title(sprintf(gettext("editing %s"), pagetitle($page))); } print $form->render(submit => \@buttons); @@ -501,7 +503,7 @@ sub cgi_editpage ($$) { #{{{ $form->tmpl_param("page_select", 0); $form->field(name => "page", type => 'hidden'); $form->field(name => "type", type => 'hidden'); - $form->title("editing $page"); + $form->title(sprintf(gettext("editing %s"), $page)); print $form->render(submit => \@buttons); return; } @@ -618,7 +620,7 @@ sub cgi (;$$) { #{{{ if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) { print $q->header(-status => "403 Forbidden"); $session->delete(); - print "You are banned."; + print gettext("You are banned."); cgi_savesession($session); exit; } @@ -631,6 +633,7 @@ sub cgi (;$$) { #{{{ } elsif ($do eq 'blog') { my $page=titlepage(decode_utf8($q->param('title'))); + $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too # if the page already exists, munge it to be unique my $from=$q->param('from'); my $add=""; @@ -643,6 +646,9 @@ sub cgi (;$$) { #{{{ $q->param('do', 'create'); cgi_editpage($q, $session); } + elsif ($do eq 'postsignin') { + error(gettext("login failed, perhaps you need to turn on cookies?")); + } else { error("unknown do parameter"); } @@ -662,6 +668,10 @@ sub userlink ($) { #{{{ if ($display !~ /\[/) { $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/; } + # Convert "http://somehost.com/user" to "user [somehost.com]". + if ($display !~ /\[/) { + $display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/; + } $display=~s!^https?://!!; # make sure this is removed return "".escapeHTML($display).""; }