urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ikiwiki/IkiWiki/CGI.pm

665 lines
18 KiB
Perl
Raw Normal View History

Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
#!/usr/bin/perl
use warnings;
use strict;
* Split off an IkiWiki.pm out of ikiwiki and have all the other modules use it, this will allow for adding a unit test suite.
2006-05-02 08:53:33 +02:00
use IkiWiki;
commit changes for email subscriptions
2006-04-25 01:09:26 +02:00
use IkiWiki::UserInfo;
use "use open" pragma to avoid manually needing to specify utf8 everywhere and also to set default stdio mode change filetype to return undef, not "unknown"
2006-07-04 00:14:52 +02:00
use open qw{:utf8 :std};
Encode is used in nearly all code paths so stop loading it on demand
2006-07-03 22:18:16 +02:00
use Encode;
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
package IkiWiki;
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
sub printheader ($) { #{{{
my $session=shift;
if ($config{sslcookie}) {
print $session->header(-charset => 'utf-8',
-cookie => $session->cookie(-secure => 1));
} else {
print $session->header(-charset => 'utf-8');
}
} #}}}
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
sub redirect ($$) { #{{{
my $q=shift;
my $url=shift;
if (! $config{w3mmode}) {
print $q->redirect($url);
}
else {
print "Content-type: text/plain\n";
print "W3m-control: GOTO $url\n\n";
}
} #}}}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
sub page_locked ($$;$) { #{{{
my $page=shift;
my $session=shift;
my $nonfatal=shift;
my $user=$session->param("name");
fix undef warning
2006-05-02 06:37:31 +02:00
return if defined $user && is_admin($user);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
foreach my $admin (@{$config{adminuser}}) {
my $locked_pages=userinfo_get($admin, "locked_pages");
* Renamed GlobLists to PageSpecs. * PageSpecs can now include nested parens, "and", and "or". This remains backwards compatible to the old GlobList format. It's implemented by treating the GlobList as a very limited microlanguage that is transformed to perl code that does the matching. * The old GlobList format is deprecated, and I encourage users to switch to using the new PageSpec format. Compatability with the old format will be removed at some point, possibly by 2.0. * Wiki rebuild needed on upgrade to this version due to PageSpec change. * Add support for creation_month and creation_year to PageSpec. Closes: #380680 * Changes to index file encoding.
2006-08-02 02:14:31 +02:00
if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
return 1 if $nonfatal;
* --getctime had bitrotted (well I only ever used it the once so far..), * When inlining a page in another one, links from the inlined page are now expanded the same as they are when rendering the inlined page as a standalone page. So rather than being expanded from the POV of the inlining page, they are expanded from the POV of the inlined page. For example, a link from blog/foo to "bar" will now link to blog/bar if it exists. Previously this needed to be a link explicitly to "blog/bar"; such links will also continue to work. (This was slightly complex to do as the link still has to be constructed relative to the inlining page.)
2006-05-26 18:11:53 +02:00
error(htmllink("", "", $page, 1)." is locked by ".
htmllink("", "", $admin, 1)." and cannot be edited.");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
}
return 0;
} #}}}
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
sub decode_form_utf8 ($) { #{{{
my $form = shift;
foreach my $f ($form->field) {
next if Encode::is_utf8(scalar $form->field($f));
$form->field(name => $f,
value => decode_utf8($form->field($f)),
force => 1,
);
}
} #}}}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
sub cgi_recentchanges ($) { #{{{
my $q=shift;
don't keep the wiki locked while rendering recentchanges
2006-03-26 06:32:41 +02:00
unlockwiki();
* Encode & in diffurl in examples, to conform to pedantic rules. * Speed up RecentChanges by another 40% or so with some memoization.
2006-07-04 18:18:18 +02:00
# Optimisation: building recentchanges means calculating lots of
# links. Memoizing htmllink speeds it up a lot (can't be memoized
# during page builds as the return values may change, but they
# won't here.)
eval q{use Memoize};
memoize("htmllink");
* Simplify the data structure returned by rcs_recentchanges to avoid each rcs plugin needing to form complex strings on its own.
2006-09-03 21:53:23 +02:00
eval q{use Time::Duration};
need to import escapeHTML
2006-09-06 22:03:59 +02:00
eval q{use CGI 'escapeHTML'};
* Simplify the data structure returned by rcs_recentchanges to avoid each rcs plugin needing to form complex strings on its own.
2006-09-03 21:53:23 +02:00
my $changelog=[rcs_recentchanges(100)];
foreach my $change (@$changelog) {
$change->{when} = concise(ago($change->{when}));
escaping fix from Emanuele Aina
2006-09-06 22:02:12 +02:00
$change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
* Simplify the data structure returned by rcs_recentchanges to avoid each rcs plugin needing to form complex strings on its own.
2006-09-03 21:53:23 +02:00
$change->{pages} = [
map {
$_->{link} = htmllink("", "", $_->{page}, 1);
$_;
} @{$change->{pages}}
];
}
* Centralised all calls to HTML::Template and force all the templates to be read as utf8.
2006-07-02 21:06:08 +02:00
my $template=template("recentchanges.tmpl");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$template->param(
title => "RecentChanges",
indexlink => indexlink(),
wikiname => $config{wikiname},
* Simplify the data structure returned by rcs_recentchanges to avoid each rcs plugin needing to form complex strings on its own.
2006-09-03 21:53:23 +02:00
changelog => $changelog,
* Fixed a bug with previews of subpages having broken links to top-level pages. * Change how the stylesheet url is determined in the templates: Remove STYLEURL and add BASEURL to all templates (some already had it). This new more general variable can be used to link to other things (eg, images) from the template, as well as stylesheets.
2006-08-22 00:27:02 +02:00
baseurl => baseurl(),
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
);
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
print $q->header(-charset => 'utf-8'), $template->output;
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
} #}}}
sub cgi_signin ($$) { #{{{
my $q=shift;
my $session=shift;
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
title => "signin",
finish up the blog form
2006-03-24 06:33:23 +01:00
fields => [qw(do title page subpage from name password confirm_password email)],
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
header => 1,
* Patch from Recai Oktaş to improve utf-8 support, it should now use proper utf-8 for edit and other fields, and for recentchanges. There may still be utf-8 issues with the preferences page though.
2006-06-11 20:51:49 +02:00
charset => "utf-8",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
method => 'POST',
validate => {
confirm_password => {
perl => q{eq $form->field("password")},
},
email => 'EMAIL',
},
required => 'NONE',
javascript => 0,
params => $q,
Verified that the action parameter on cgi forms is needed for at least the prefs form. Use $config{cgiurl}.
2006-04-04 20:43:26 +02:00
action => $config{cgiurl},
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
header => 0,
template => (-e "$config{templatedir}/signin.tmpl" ?
* Centralised all calls to HTML::Template and force all the templates to be read as utf8.
2006-07-02 21:06:08 +02:00
{template_params("signin.tmpl")} : ""),
* Fixed a bug with previews of subpages having broken links to top-level pages. * Change how the stylesheet url is determined in the templates: Remove STYLEURL and add BASEURL to all templates (some already had it). This new more general variable can be used to link to other things (eg, images) from the template, as well as stylesheets.
2006-08-22 00:27:02 +02:00
stylesheet => baseurl()."style.css",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
);
<paravoid> you're right <paravoid> I can't explain it <paravoid> but it's definitely fixing it <paravoid> I triple-checked...
2006-07-12 00:06:57 +02:00
decode_form_utf8($form);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "name", required => 0);
$form->field(name => "do", type => "hidden");
$form->field(name => "page", type => "hidden");
finish up the blog form
2006-03-24 06:33:23 +01:00
$form->field(name => "title", type => "hidden");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "from", type => "hidden");
finish up the blog form
2006-03-24 06:33:23 +01:00
$form->field(name => "subpage", type => "hidden");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "password", type => "password", required => 0);
$form->field(name => "confirm_password", type => "password", required => 0);
$form->field(name => "email", required => 0);
avoid message if mailing password or registering
2006-07-31 01:08:10 +02:00
if ($q->param("do") ne "signin" && !$form->submitted) {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->text("You need to log in first.");
}
if ($form->submitted) {
# Set required fields based on how form was submitted.
my %required=(
"Login" => [qw(name password)],
"Register" => [qw(name password confirm_password email)],
"Mail Password" => [qw(name)],
);
foreach my $opt (@{$required{$form->submitted}}) {
$form->field(name => $opt, required => 1);
}
# Validate password differently depending on how
# form was submitted.
if ($form->submitted eq 'Login') {
$form->field(
name => "password",
validate => sub {
length $form->field("name") &&
shift eq userinfo_get($form->field("name"), 'password');
},
);
$form->field(name => "name", validate => '/^\w+$/');
}
else {
$form->field(name => "password", validate => 'VALUE');
}
# And make sure the entered name exists when logging
# in or sending email, and does not when registering.
if ($form->submitted eq 'Register') {
$form->field(
name => "name",
validate => sub {
my $name=shift;
length $name &&
- fix typo - avoid sending commit mails to the user who made the commit
2006-04-25 22:24:44 +02:00
$name=~/$config{wiki_file_regexp}/ &&
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
! userinfo_get($name, "regdate");
},
);
}
else {
$form->field(
name => "name",
validate => sub {
my $name=shift;
length $name &&
userinfo_get($name, "regdate");
},
);
}
}
else {
# First time settings.
$form->field(name => "name", comment => "use FirstnameLastName");
$form->field(name => "confirm_password", comment => "(only needed");
$form->field(name => "email", comment => "for registration)");
if ($session->param("name")) {
$form->field(name => "name", value => $session->param("name"));
}
}
if ($form->submitted && $form->validate) {
if ($form->submitted eq 'Login') {
$session->param("name", $form->field("name"));
if (defined $form->field("do") &&
$form->field("do") ne 'signin') {
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, cgiurl(
html validation fixes: - escape & in urls (also clean up cgi url generation) - since markdown wraps inlined pages in <p></p>, close and re-open the paragraph tags when generating the embedded html - added XHTML 1.0 doctypes to templates - fixed <hr /> and <br /> in templates - add an alt attribute to inline images, based on the WikiLink to the image. Allows things like [[my_image|img.png]] to customise alt text.
2006-03-29 05:18:21 +02:00
do => $form->field("do"),
page => $form->field("page"),
title => $form->field("title"),
subpage => $form->field("subpage"),
from => $form->field("from"),
));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
else {
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, $config{url});
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
}
elsif ($form->submitted eq 'Register') {
my $user_name=$form->field('name');
if (userinfo_setall($user_name, {
'email' => $form->field('email'),
'password' => $form->field('password'),
'regdate' => time
})) {
$form->field(name => "confirm_password", type => "hidden");
$form->field(name => "email", type => "hidden");
$form->text("Registration successful. Now you can Login.");
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
printheader($session);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
print misctemplate($form->title, $form->render(submit => ["Login"]));
}
else {
error("Error saving registration.");
}
}
elsif ($form->submitted eq 'Mail Password') {
my $user_name=$form->field("name");
* Centralised all calls to HTML::Template and force all the templates to be read as utf8.
2006-07-02 21:06:08 +02:00
my $template=template("passwordmail.tmpl");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$template->param(
user_name => $user_name,
user_password => userinfo_get($user_name, "password"),
wikiurl => $config{url},
wikiname => $config{wikiname},
REMOTE_ADDR => $ENV{REMOTE_ADDR},
);
eval q{use Mail::Sendmail};
sendmail(
To => userinfo_get($user_name, "email"),
commit changes for email subscriptions
2006-04-25 01:09:26 +02:00
From => "$config{wikiname} admin <$config{adminemail}>",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
Subject => "$config{wikiname} information",
Message => $template->output,
) or error("Failed to send mail");
$form->text("Your password has been emailed to you.");
$form->field(name => "name", required => 0);
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
printheader($session);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
}
else {
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
printheader($session);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
} #}}}
sub cgi_prefs ($$) { #{{{
my $q=shift;
my $session=shift;
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
title => "preferences",
subscription nearly done
2006-04-25 02:22:41 +02:00
fields => [qw(do name password confirm_password email
subscriptions locked_pages)],
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
header => 0,
* Patch from Recai Oktaş to improve utf-8 support, it should now use proper utf-8 for edit and other fields, and for recentchanges. There may still be utf-8 issues with the preferences page though.
2006-06-11 20:51:49 +02:00
charset => "utf-8",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
method => 'POST',
validate => {
confirm_password => {
perl => q{eq $form->field("password")},
},
email => 'EMAIL',
},
required => 'NONE',
javascript => 0,
params => $q,
Verified that the action parameter on cgi forms is needed for at least the prefs form. Use $config{cgiurl}.
2006-04-04 20:43:26 +02:00
action => $config{cgiurl},
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
template => (-e "$config{templatedir}/prefs.tmpl" ?
* Centralised all calls to HTML::Template and force all the templates to be read as utf8.
2006-07-02 21:06:08 +02:00
{template_params("prefs.tmpl")} : ""),
* Fixed a bug with previews of subpages having broken links to top-level pages. * Change how the stylesheet url is determined in the templates: Remove STYLEURL and add BASEURL to all templates (some already had it). This new more general variable can be used to link to other things (eg, images) from the template, as well as stylesheets.
2006-08-22 00:27:02 +02:00
stylesheet => baseurl()."style.css",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
);
my @buttons=("Save Preferences", "Logout", "Cancel");
my $user_name=$session->param("name");
$form->field(name => "do", type => "hidden");
$form->field(name => "name", disabled => 1,
value => $user_name, force => 1);
$form->field(name => "password", type => "password");
$form->field(name => "confirm_password", type => "password");
subscription nearly done
2006-04-25 02:22:41 +02:00
$form->field(name => "subscriptions", size => 50,
* Renamed GlobLists to PageSpecs. * PageSpecs can now include nested parens, "and", and "or". This remains backwards compatible to the old GlobList format. It's implemented by treating the GlobList as a very limited microlanguage that is transformed to perl code that does the matching. * The old GlobList format is deprecated, and I encourage users to switch to using the new PageSpec format. Compatability with the old format will be removed at some point, possibly by 2.0. * Wiki rebuild needed on upgrade to this version due to PageSpec change. * Add support for creation_month and creation_year to PageSpec. Closes: #380680 * Changes to index file encoding.
2006-08-02 02:14:31 +02:00
comment => "(".htmllink("", "", "PageSpec", 1).")");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "locked_pages", size => 50,
* Renamed GlobLists to PageSpecs. * PageSpecs can now include nested parens, "and", and "or". This remains backwards compatible to the old GlobList format. It's implemented by treating the GlobList as a very limited microlanguage that is transformed to perl code that does the matching. * The old GlobList format is deprecated, and I encourage users to switch to using the new PageSpec format. Compatability with the old format will be removed at some point, possibly by 2.0. * Wiki rebuild needed on upgrade to this version due to PageSpec change. * Add support for creation_month and creation_year to PageSpec. Closes: #380680 * Changes to index file encoding.
2006-08-02 02:14:31 +02:00
comment => "(".htmllink("", "", "PageSpec", 1).")");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
if (! is_admin($user_name)) {
$form->field(name => "locked_pages", type => "hidden");
}
if (! $form->submitted) {
$form->field(name => "email", force => 1,
value => userinfo_get($user_name, "email"));
subscription nearly done
2006-04-25 02:22:41 +02:00
$form->field(name => "subscriptions", force => 1,
value => userinfo_get($user_name, "subscriptions"));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "locked_pages", force => 1,
value => userinfo_get($user_name, "locked_pages"));
}
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
decode_form_utf8($form);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
if ($form->submitted eq 'Logout') {
$session->delete();
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, $config{url});
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
return;
}
elsif ($form->submitted eq 'Cancel') {
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, $config{url});
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
return;
}
elsif ($form->submitted eq "Save Preferences" && $form->validate) {
subscription nearly done
2006-04-25 02:22:41 +02:00
foreach my $field (qw(password email subscriptions locked_pages)) {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
if (length $form->field($field)) {
userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
}
}
$form->text("Preferences saved.");
}
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
printheader($session);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
print misctemplate($form->title, $form->render(submit => \@buttons));
} #}}}
sub cgi_editpage ($$) { #{{{
my $q=shift;
my $session=shift;
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
fields => [qw(do rcsinfo subpage from page type editcontent comments)],
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
header => 1,
* Patch from Recai Oktaş to improve utf-8 support, it should now use proper utf-8 for edit and other fields, and for recentchanges. There may still be utf-8 issues with the preferences page though.
2006-06-11 20:51:49 +02:00
charset => "utf-8",
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
method => 'POST',
validate => {
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
editcontent => '/.+/',
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
},
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
required => [qw{editcontent}],
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
javascript => 0,
params => $q,
Verified that the action parameter on cgi forms is needed for at least the prefs form. Use $config{cgiurl}.
2006-04-04 20:43:26 +02:00
action => $config{cgiurl},
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
table => 0,
* Centralised all calls to HTML::Template and force all the templates to be read as utf8.
2006-07-02 21:06:08 +02:00
template => {template_params("editpage.tmpl")},
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
);
my @buttons=("Save Page", "Preview", "Cancel");
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
decode_form_utf8($form);
# This untaint is safe because titlepage removes any problematic
Improved handling of wikilinks containing characters that are not allowed in filenames. Now converts to valid filenames automatically. Note, need to --refresh your wiki after updating to this version, if you use any pages with __nn__ in their names.
2006-03-29 04:14:55 +02:00
# characters.
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
my ($page)=$form->field('page');
* The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed. * Add --version. * Man page format fixups. * Add a %pagecase which maps lower-case page names to the actual case used in the filename. Use this in bestlinks calculation instead of forcing the link to lowercase. * Also use %pagecase in various other places that want to check if a page with a given name exists. * This means that links to pages with mixed case names will now work, even if the link is in some other case mixture, and mixed case pages should be fully supported throughout ikiwiki. * Recommend rebuilding wikis on upgrade to this version.
2006-08-13 04:03:43 +02:00
$page=titlepage(possibly_foolish_untaint($page));
Improved handling of wikilinks containing characters that are not allowed in filenames. Now converts to valid filenames automatically. Note, need to --refresh your wiki after updating to this version, if you use any pages with __nn__ in their names.
2006-03-29 04:14:55 +02:00
if (! defined $page || ! length $page ||
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
error("bad page name");
}
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
my $from;
if (defined $form->field('from')) {
($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
}
remove leading dot from default_pageext fix preview to not assume it's the default page type, and instead get the type from the page
2006-07-04 03:29:45 +02:00
my $file;
* The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed. * Add --version. * Man page format fixups. * Add a %pagecase which maps lower-case page names to the actual case used in the filename. Use this in bestlinks calculation instead of forcing the link to lowercase. * Also use %pagecase in various other places that want to check if a page with a given name exists. * This means that links to pages with mixed case names will now work, even if the link is in some other case mixture, and mixed case pages should be fully supported throughout ikiwiki. * Recommend rebuilding wikis on upgrade to this version.
2006-08-13 04:03:43 +02:00
my $type;
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
if (exists $pagesources{$page}) {
$file=$pagesources{$page};
$type=pagetype($file);
fix for replacing from underlay
2006-03-29 20:35:04 +02:00
}
remove leading dot from default_pageext fix preview to not assume it's the default page type, and instead get the type from the page
2006-07-04 03:29:45 +02:00
else {
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$type=$form->param('type');
if (defined $type && length $type && $hooks{htmlize}{$type}) {
$type=possibly_foolish_untaint($type);
}
elsif (defined $from) {
# favor the type of linking page
$type=pagetype($pagesources{$from});
}
* Fix a bug in page type determination during online editing.
2006-08-13 07:56:01 +02:00
$type=$config{default_pageext} unless defined $type;
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$file=$page.".".$type;
remove leading dot from default_pageext fix preview to not assume it's the default page type, and instead get the type from the page
2006-07-04 03:29:45 +02:00
}
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
fix for replacing from underlay
2006-03-29 20:35:04 +02:00
my $newfile=0;
if (! -e "$config{srcdir}/$file") {
$newfile=1;
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
$form->field(name => "do", type => 'hidden');
$form->field(name => "from", type => 'hidden');
$form->field(name => "rcsinfo", type => 'hidden');
finish up the blog form
2006-03-24 06:33:23 +01:00
$form->field(name => "subpage", type => 'hidden');
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$form->field(name => "page", value => $page, force => 1);
$form->field(name => "type", value => $type, force => 1);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field(name => "comments", type => "text", size => 80);
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
$form->field(name => "editcontent", type => "textarea", rows => 20,
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
cols => 80);
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
$form->tmpl_param("helponformattinglink",
* --getctime had bitrotted (well I only ever used it the once so far..), * When inlining a page in another one, links from the inlined page are now expanded the same as they are when rendering the inlined page as a standalone page. So rather than being expanded from the POV of the inlining page, they are expanded from the POV of the inlined page. For example, a link from blog/foo to "bar" will now link to blog/bar if it exists. Previously this needed to be a link explicitly to "blog/bar"; such links will also continue to work. (This was slightly complex to do as the link still has to be constructed relative to the inlining page.)
2006-05-26 18:11:53 +02:00
htmllink("", "", "HelpOnFormatting", 1));
* Fixed a bug with previews of subpages having broken links to top-level pages. * Change how the stylesheet url is determined in the templates: Remove STYLEURL and add BASEURL to all templates (some already had it). This new more general variable can be used to link to other things (eg, images) from the template, as well as stylesheets.
2006-08-22 00:27:02 +02:00
$form->tmpl_param("baseurl", baseurl());
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
if (! $form->submitted) {
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
}
if ($form->submitted eq "Cancel") {
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, "$config{url}/".htmlpage($page));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
return;
}
elsif ($form->submitted eq "Preview") {
require IkiWiki::Render;
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
my $content=$form->field('editcontent');
my $comments=$form->field('comments');
* More utf-8 fixes from Recai, partly to things I broke above: - The serious problem is that writefile() saves the content in undecoded format in CGI, hence all (non-ascii) chars are corrupted permanently. - Comment field in edit page is not decoded and all the non-ascii chars in this field are corrupted as the result. We should decode it as we do it for the content.
2006-06-17 03:44:19 +02:00
$form->field(name => "editcontent",
value => $content, force => 1);
$form->field(name => "comments",
* Support pages with utf8 filenames. Patch by Faidon Liambotis.
2006-07-03 22:12:27 +02:00
value => $comments, force => 1);
* Change order of linkify and preprocess; first preprocess and then linkify. This allows passing a wikilink inside a parameter to a preprocessor directive without it being expanded to html, and leaking out of the parameter, which had required some non-obvious use of triple-quoting to avoid. Note that any preprocessor plugins that output something that looks like a wikilink will now have it treated as such; AFAIK this doesn't change any behavior though except for the template plugin. * Enable preprocessor directives when previewing an edit.
2006-08-23 22:23:57 +02:00
$config{rss}=0; # avoid preview writing an rss feed!
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->tmpl_param("page_preview",
* Change htmlize, format, and sanitize hooks to use named parameters.
2006-08-28 20:17:59 +02:00
htmlize($page, $type,
* Change order of linkify and preprocess; first preprocess and then linkify. This allows passing a wikilink inside a parameter to a preprocessor directive without it being expanded to html, and leaking out of the parameter, which had required some non-obvious use of triple-quoting to avoid. Note that any preprocessor plugins that output something that looks like a wikilink will now have it treated as such; AFAIK this doesn't change any behavior though except for the template plugin. * Enable preprocessor directives when previewing an edit.
2006-08-23 22:23:57 +02:00
linkify($page, "",
preprocess($page, $page,
filter($page, $content)))));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
else {
$form->tmpl_param("page_preview", "");
}
$form->tmpl_param("page_conflict", "");
if (! $form->submitted || $form->submitted eq "Preview" ||
! $form->validate) {
if ($form->field("do") eq "create") {
my @page_locs;
my $best_loc;
if (! defined $from || ! length $from ||
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
$from ne $form->field('from') ||
Put in a quick fix for a bug involving page preview while creating a page that caused the page location to be changed to a subdir. This is not a very good fix.
2006-03-29 00:56:56 +02:00
$from=~/$config{wiki_file_prune_regexp}/ ||
$from=~/^\// ||
$form->submitted eq "Preview") {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
@page_locs=$best_loc=$page;
}
else {
my $dir=$from."/";
fix a deadloop if from ended in a /
2006-04-25 03:15:20 +02:00
$dir=~s![^/]+/+$!!;
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
if ((defined $form->field('subpage') && length $form->field('subpage')) ||
finish up the blog form
2006-03-24 06:33:23 +01:00
$page eq 'discussion') {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$best_loc="$from/$page";
}
else {
$best_loc=$dir.$page;
}
push @page_locs, $dir.$page;
push @page_locs, "$from/$page";
while (length $dir) {
fix a deadloop if from ended in a /
2006-04-25 03:15:20 +02:00
$dir=~s![^/]+/+$!!;
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
push @page_locs, $dir.$page;
}
}
* Smarter behavior when creating a page and a page of the same name (but different location) already exists.
2006-05-02 04:57:45 +02:00
@page_locs = grep {
* The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed. * Add --version. * Man page format fixups. * Add a %pagecase which maps lower-case page names to the actual case used in the filename. Use this in bestlinks calculation instead of forcing the link to lowercase. * Also use %pagecase in various other places that want to check if a page with a given name exists. * This means that links to pages with mixed case names will now work, even if the link is in some other case mixture, and mixed case pages should be fully supported throughout ikiwiki. * Recommend rebuilding wikis on upgrade to this version.
2006-08-13 04:03:43 +02:00
! exists $pagecase{lc $_} &&
* Smarter behavior when creating a page and a page of the same name (but different location) already exists.
2006-05-02 04:57:45 +02:00
! page_locked($_, $session, 1)
} @page_locs;
if (! @page_locs) {
# hmm, someone else made the page in the
# meantime?
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, "$config{url}/".htmlpage($page));
* Smarter behavior when creating a page and a page of the same name (but different location) already exists.
2006-05-02 04:57:45 +02:00
return;
}
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
my @page_types;
if (exists $hooks{htmlize}) {
@page_types=keys %{$hooks{htmlize}};
}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select',
options => \@page_locs, value => $best_loc);
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$form->field(name => "type", type => 'select',
options => \@page_types);
finish up the blog form
2006-03-24 06:33:23 +01:00
$form->title("creating ".pagetitle($page));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
elsif ($form->field("do") eq "edit") {
page_locked($page, $session);
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
if (! defined $form->field('editcontent') ||
! length $form->field('editcontent')) {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
my $content="";
* The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed. * Add --version. * Man page format fixups. * Add a %pagecase which maps lower-case page names to the actual case used in the filename. Use this in bestlinks calculation instead of forcing the link to lowercase. * Also use %pagecase in various other places that want to check if a page with a given name exists. * This means that links to pages with mixed case names will now work, even if the link is in some other case mixture, and mixed case pages should be fully supported throughout ikiwiki. * Recommend rebuilding wikis on upgrade to this version.
2006-08-13 04:03:43 +02:00
if (exists $pagesources{$page}) {
$content=readfile(srcfile($pagesources{$page}));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$content=~s/\n/\r\n/g;
}
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
$form->field(name => "editcontent", value => $content,
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
force => 1);
}
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$form->field(name => "type", type => 'hidden');
finish up the blog form
2006-03-24 06:33:23 +01:00
$form->title("editing ".pagetitle($page));
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
print $form->render(submit => \@buttons);
}
else {
# save page
page_locked($page, $session);
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
my $content=$form->field('editcontent');
* More utf-8 fixes from Recai, partly to things I broke above: - The serious problem is that writefile() saves the content in undecoded format in CGI, hence all (non-ascii) chars are corrupted permanently. - Comment field in edit page is not decoded and all the non-ascii chars in this field are corrupted as the result. We should decode it as we do it for the content.
2006-06-17 03:44:19 +02:00
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$content=~s/\r\n/\n/g;
$content=~s/\r/\n/g;
improve fix for symlink attacks to check subdirectories for symlinks too before writing
2006-03-29 20:50:36 +02:00
writefile($file, $config{srcdir}, $content);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
my $message="web commit ";
* More utf-8 fixes from Recai, partly to things I broke above: - The serious problem is that writefile() saves the content in undecoded format in CGI, hence all (non-ascii) chars are corrupted permanently. - Comment field in edit page is not decoded and all the non-ascii chars in this field are corrupted as the result. We should decode it as we do it for the content.
2006-06-17 03:44:19 +02:00
if (defined $session->param("name") &&
length $session->param("name")) {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$message.="by ".$session->param("name");
}
else {
$message.="from $ENV{REMOTE_ADDR}";
}
if (defined $form->field('comments') &&
length $form->field('comments')) {
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
$message.=": ".$form->field('comments');
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
if ($config{rcs}) {
if ($newfile) {
rcs_add($file);
}
# prevent deadlock with post-commit hook
unlockwiki();
# presumably the commit will trigger an update
# of the wiki
my $conflict=rcs_commit($file, $message,
$form->field("rcsinfo"));
if (defined $conflict) {
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
$form->tmpl_param("page_conflict", 1);
* Add -refresh option to ikiwiki-mass-rebuild and use that on upgrades that do not need a full rebuild, in order to update any basewiki pages.
2006-05-27 21:04:46 +02:00
$form->field("editcontent", value => $conflict, force => 1);
* Consolidated all decode_utf8 in FormBuilder's fields to make the code more readable and avoid future mistakes. The patch seems to work and for the first time I have a UTF-8 username ;-) (Faidon) * Use form->field consistently, not form->param.
2006-07-11 23:20:14 +02:00
$form->field(name => "comments", value => $form->field('comments'), force => 1);
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->field("do", "edit)");
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
* Patch from Recai to allow selection of page type when creating a new page. Default page type is inherited from the link clicked on to create the new page.
2006-07-26 23:23:06 +02:00
$form->field(name => "type", type => 'hidden');
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
$form->title("editing $page");
print $form->render(submit => \@buttons);
return;
}
}
else {
require IkiWiki::Render;
refresh();
saveindex();
}
# The trailing question mark tries to avoid broken
# caches and get the most recent version of the page.
* Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server.
2006-07-07 23:00:48 +02:00
redirect($q, "$config{url}/".htmlpage($page)."?updated");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
} #}}}
sub cgi () { #{{{
eval q{use CGI};
eval q{use CGI::Session};
my $q=CGI->new;
* Add a run_hooks function for the common task of running all hooks of a given type. * Add a savestate hook. * Don't put blog post forms on pages if there's no cgiurl set. * Reformat front page.
2006-07-30 02:20:11 +02:00
run_hooks(cgi => sub { shift->($q) });
rather a lot of changes to make hyperestraier search be a plugin, allowing for other types of search engine plugins if wanted, and also opening up a lot of new possibilities for other kinds of plugins later some notable changes along the way: - lots of new hook types: cgi, render, delete - wrapper files fixed to support config strings with newlines in them - HEADERCONTENT in page template useful for plugins. Probably needs to be expanded to more such for other places plugins might want to add content. - remove unnecessary wrappers field from config info stored in wrappers
2006-05-03 23:50:39 +02:00
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
my $do=$q->param('do');
if (! defined $do || ! length $do) {
* Display CGI processing errors if present.
2006-07-10 23:13:41 +02:00
my $error = $q->cgi_error;
if ($error) {
error("Request not processed: $error");
}
else {
error("\"do\" parameter missing");
}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
}
add blog post template
2006-03-24 06:03:16 +01:00
# Things that do not need a session.
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
if ($do eq 'recentchanges') {
cgi_recentchanges($q);
return;
}
added --hyperestraier switch, which turns on search support (ok, the way I run estseek.cgi is admittedly pretty nasty, but it works..)
2006-03-30 00:21:23 +02:00
elsif ($do eq 'hyperestraier') {
cgi_hyperestraier();
}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
Change the name of the session cookie. This will avoid problems with multiple wikis on the same host.
2006-03-29 02:21:57 +02:00
CGI::Session->name("ikiwiki_session_$config{wikiname}");
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
my $oldmask=umask(077);
- add <base> to cgi output, this is especially useful for output containing wikilinks since the urls should work now in more situations - drop --limit from svn log run, since a) it needs a fairly new svn and b) in some cases, it would limit it to too few entries to display the requested number of changes - Use driver:DB_File and not driver:db_file for better compatability with old versions of CGI::Session. - Note that HTML::Template 3.02.02 is needed.
2006-04-03 00:24:08 +02:00
my $session = CGI::Session->new("driver:DB_File", $q,
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
{ FileName => "$config{wikistatedir}/sessions.db" });
umask($oldmask);
# Everything below this point needs the user to be signed in.
* Patch from James Westby to add a --sslcookie switch, which forces cookies to only be sent over ssl connections to avoid interception. * Factor out the cgi header printing code into a new function. * Fix preferences page on anonok wikis; still need to sign in to get to the preferences page.
2006-08-27 22:25:05 +02:00
if (((! $config{anonok} || $do eq 'prefs') &&
fix --anonok
2006-04-14 20:10:18 +02:00
(! defined $session->param("name") ||
! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
cgi_signin($q, $session);
# Force session flush with safe umask.
my $oldmask=umask(077);
$session->flush;
umask($oldmask);
return;
}
if ($do eq 'create' || $do eq 'edit') {
cgi_editpage($q, $session);
}
elsif ($do eq 'prefs') {
cgi_prefs($q, $session);
}
finish up the blog form
2006-03-24 06:33:23 +01:00
elsif ($do eq 'blog') {
* Fix utf-8 in blog post form.
2006-08-20 22:45:55 +02:00
my $page=titlepage(decode_utf8($q->param('title')));
Improved handling of wikilinks containing characters that are not allowed in filenames. Now converts to valid filenames automatically. Note, need to --refresh your wiki after updating to this version, if you use any pages with __nn__ in their names.
2006-03-29 04:14:55 +02:00
# if the page already exists, munge it to be unique
finish up the blog form
2006-03-24 06:33:23 +01:00
my $from=$q->param('from');
my $add="";
* The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed. * Add --version. * Man page format fixups. * Add a %pagecase which maps lower-case page names to the actual case used in the filename. Use this in bestlinks calculation instead of forcing the link to lowercase. * Also use %pagecase in various other places that want to check if a page with a given name exists. * This means that links to pages with mixed case names will now work, even if the link is in some other case mixture, and mixed case pages should be fully supported throughout ikiwiki. * Recommend rebuilding wikis on upgrade to this version.
2006-08-13 04:03:43 +02:00
while (exists $pagecase{lc "$from/$page$add"}) {
finish up the blog form
2006-03-24 06:33:23 +01:00
$add=1 unless length $add;
$add++;
}
$q->param('page', $page.$add);
# now run same as create
$q->param('do', 'create');
cgi_editpage($q, $session);
}
Major code reoganisation, splitting up the single big file. The two goals kept in mind during this are a) to reduce load time for common cases like cgi and post-commit and b) make the code easier to navigate. This also modularises RCS support to the extent that it should be possible to drop in a module for some RCS other than svn, add a switch for it, and it pretty much just work. High chance I missed an edge case that breaks something, this is only barely tested at this point.
2006-03-23 07:51:15 +01:00
else {
error("unknown do parameter");
}
} #}}}
1