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

665 lines
17 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 ".
improvement
2006-11-20 22:02:45 +01:00
userlink($admin)." 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;
* 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};
* Make sure to check for errors from every eval.
2006-11-08 22:03:33 +01:00
error($@) if $@;
* 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
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};
* Make sure to check for errors from every eval.
2006-11-08 22:03:33 +01:00
error($@) if $@;
* 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}));
* Add an openid plugin to support logging in using OpenID. * Web commits by OpenID users will record the full OpenID url for the user, but in recentchanges, these urls will be converted to a simplified display form+link. * Modified svn, git, tla backends to recognise such web commits.
2006-11-20 03:46:58 +01:00
improvement
2006-11-20 22:02:45 +01:00
$change->{user} = userlink($change->{user});
* Patch from Recai to limit recentchanges to displaying max 10 files for a given changeset (to avoid large number of file changes excessively bloating the page).
2006-10-14 05:12:30 +02:00
my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
* 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}}
];
* Patch from Recai to limit recentchanges to displaying max 10 files for a given changeset (to avoid large number of file changes excessively bloating the page).
2006-10-14 05:12:30 +02:00
push @{$change->{pages}}, { link => '...' } if $is_excess;
* 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
}
* 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
);
* pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis).
2006-09-16 02:52:26 +02:00
run_hooks(pagetemplate => sub {
shift->(page => "", destpage => "", template => $template);
});
* 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};
* Make sure to check for errors from every eval.
2006-11-08 22:03:33 +01:00
error($@) if $@;
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 $form = CGI::FormBuilder->new(
title => "signin",
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',
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
);
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
my $buttons=["Login"];
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");
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
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.");
}
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
run_hooks(formbuilder_setup => sub {
shift->(form => $form, cgi => $q, session => $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
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01: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
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
if (exists $hooks{formbuilder}) {
run_hooks(formbuilder => sub {
shift->(form => $form, cgi => $q, session => $session,
buttons => $buttons);
});
* Improve login/register process, the login dialog has only name and password fields, which allows more web browsers to regognise it as a login field, and is less confusing.
2006-10-31 00:28:01 +01: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
else {
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
if ($form->submitted) {
$form->validate;
}
* 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);
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
print misctemplate($form->title, $form->render(submit => $buttons));
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 openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
sub cgi_postsignin ($$) { #{{{
my $q=shift;
my $session=shift;
# Continue with whatever was being done before the signin process.
if (defined $q->param("do") && $q->param("do") ne "signin" &&
defined $session->param("postsignin")) {
my $postsignin=CGI->new($session->param("postsignin"));
$session->clear("postsignin");
cgi($postsignin, $session);
exit;
}
else {
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
sub cgi_prefs ($$) { #{{{
my $q=shift;
my $session=shift;
eval q{use CGI::FormBuilder};
* Make sure to check for errors from every eval.
2006-11-08 22:03:33 +01:00
error($@) if $@;
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 $form = CGI::FormBuilder->new(
title => "preferences",
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 => {
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
);
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
my $buttons=["Save Preferences", "Logout", "Cancel"];
run_hooks(formbuilder_setup => sub {
shift->(form => $form, cgi => $q, session => $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
$form->field(name => "do", type => "hidden");
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
$form->field(name => "email", size => 50);
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).")");
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
$form->field(name => "banned_users", size => 50);
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 "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
my $user_name=$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
if (! is_admin($user_name)) {
$form->field(name => "locked_pages", type => "hidden");
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
$form->field(name => "banned_users", 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
}
* Patch from Alec Berryman adding a http_auth config item that allows using HTTP Authentication instead of ikiwiki's built in authentication. Useful for eg, large sites with their own previously existing user auth setup. Closes: #384534
2006-10-03 00:56:09 +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
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"));
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
if (is_admin($user_name)) {
$form->field(name => "banned_users", force => 1,
value => join(" ", get_banned_users()));
}
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
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) {
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
foreach my $field (qw(email subscriptions locked_pages)) {
if (defined $form->field($field) && length $form->field($field)) {
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_set($user_name, $field, $form->field($field)) || error("failed to set $field");
}
}
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
if (is_admin($user_name)) {
set_banned_users(grep { ! is_admin($_) }
split(' ', $form->field("banned_users")));
}
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("Preferences saved.");
}
* Add "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
if (exists $hooks{formbuilder}) {
run_hooks(formbuilder => sub {
shift->(form => $form, cgi => $q, session => $session,
buttons => $buttons);
});
}
else {
printheader($session);
print misctemplate($form->title, $form->render(submit => $buttons));
}
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_editpage ($$) { #{{{
my $q=shift;
my $session=shift;
* pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis).
2006-09-16 02:52:26 +02:00
my @fields=qw(do rcsinfo subpage from page type editcontent comments);
my @buttons=("Save Page", "Preview", "Cancel");
eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
* Make sure to check for errors from every eval.
2006-11-08 22:03:33 +01:00
error($@) if $@;
* pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis).
2006-09-16 02:52:26 +02:00
my $renderer=CGI::FormBuilder::Template::HTML->new(
fields => \@fields,
template_params("editpage.tmpl"),
);
run_hooks(pagetemplate => sub {
shift->(page => "", destpage => "", template => $renderer->engine);
});
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 $form = CGI::FormBuilder->new(
* pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis).
2006-09-16 02:52:26 +02:00
fields => \@fields,
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,
* pagetemplate hooks are now also called when generating cgi pages. * Add a favicon plugin, which simply adds a link tag for an icon to each page (and cgis).
2006-09-16 02:52:26 +02:00
template => $renderer,
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 "last" parameter to hook function. Very basic ordering, and hopefully nothing more spohisticated will be needed. * Add formbuilder_setup and formbuilder hooks. * Split out a passwordauth module, that holds all the traditional password based authentication etc code. It's enabled by default, but can be disabled if you want only openid or some other auth method.
2006-11-20 21:37:27 +01:00
run_hooks(formbuilder_setup => sub {
shift->(form => $form, cgi => $q, session => $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
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") {
* Patch from James Westby to deal with the case where you're editing a new page, hit cancel, and need to be redirected to somewhere sane.
2006-09-16 03:23:14 +02:00
if ($newfile && defined $from) {
redirect($q, "$config{url}/".htmlpage($from));
}
elsif ($newfile) {
redirect($q, $config{url});
}
else {
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") {
* 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);
* Atom feed support based on a patch by Clint Adams. * Add feeds=no option to inline preprocessor directive to turn off all types of feeds. feeds=rss will still work, and feeds=atom was also added, for fine control. * $IkiWiki::version now holds the program version, and is accessible to plugins.
2006-10-09 01:57:37 +02:00
$config{rss}=$config{atom}=0; # avoid preview writing a 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
if ($config{rcs}) {
updates
2006-11-22 15:28:38 +01:00
my $message="";
if (defined $form->field('comments') &&
length $form->field('comments')) {
$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 ($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,
updates
2006-11-22 15:28:38 +01:00
$form->field("rcsinfo"),
$session->param("name"), $ENV{REMOTE_ADDR});
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 (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
}
} #}}}
* Add openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
sub cgi (;$$) { #{{{
my $q=shift;
my $session=shift;
if (! $q) {
eval q{use CGI; use CGI::Session};
error($@) if $@;
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 openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
$q=CGI->new;
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
* Add openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
run_hooks(cgi => sub { shift->($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
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();
}
* Avoid locking the wiki at all when handling some basic cgi stuff (searches, recentchanges).
2006-11-20 13:03:35 +01:00
# Need to lock the wiki before getting a session.
lockwiki();
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 openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
if (! $session) {
CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
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
* Add openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
my $oldmask=umask(077);
$session = CGI::Session->new("driver:DB_File", $q,
{ FileName => "$config{wikistatedir}/sessions.db" });
umask($oldmask);
}
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
* Make auth methods pluggable. * Move httpauth support to a plugin. * Add an openid plugin to support logging in using OpenID.
2006-11-20 02:52:18 +01:00
# Auth hooks can sign a user in.
if ($do ne 'signin' && ! defined $session->param("name")) {
run_hooks(auth => sub {
shift->($q, $session)
});
if (defined $session->param("name")) {
# Make sure whatever user was authed is in the
# userinfo db.
if (! userinfo_get($session->param("name"), "regdate")) {
userinfo_setall($session->param("name"), {
email => "",
password => "",
regdate => time,
});
}
}
}
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
# 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") ||
* Make auth methods pluggable. * Move httpauth support to a plugin. * Add an openid plugin to support logging in using OpenID.
2006-11-20 02:52:18 +01:00
! userinfo_get($session->param("name"), "regdate")))
|| $do eq 'signin') {
* Add openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
if ($do ne 'signin' && ! defined $session->param("postsignin")) {
$session->param(postsignin => $ENV{QUERY_STRING});
}
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;
}
* Add openidsignup config option. * Make the openid plugin support the callbacks from myopenid.com via its affiliate program. * Change how post signin actions are propigated through the signin process; they're now stored in the session.
2006-11-20 10:40:09 +01:00
elsif (defined $session->param("postsignin")) {
cgi_postsignin($q, $session);
}
* Patch from Alec Berryman adding a http_auth config item that allows using HTTP Authentication instead of ikiwiki's built in authentication. Useful for eg, large sites with their own previously existing user auth setup. Closes: #384534
2006-10-03 00:56:09 +02:00
fixes
2006-11-10 08:51:14 +01:00
if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
print $q->header(-status => "403 Forbidden");
delete session
2006-10-28 02:36:34 +02:00
$session->delete();
* Add basic spam fighting tool for admins: An admin's prefs page now allows editing a list of banned users who are not allowed to log in.
2006-10-28 02:35:33 +02:00
print "You are banned.";
exit;
}
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 '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");
}
} #}}}
improvement
2006-11-20 22:02:45 +01:00
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);
formatting
2006-11-21 02:40:47 +01:00
my $display=$oid->display;
# Convert "user.somehost.com" to "user [somehost.com]".
if ($display !~ /\[/) {
improve regexp
2006-11-21 04:52:20 +01:00
$display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
formatting
2006-11-21 02:40:47 +01:00
}
improve
2006-11-21 18:56:04 +01:00
$display=~s!^https?://!!; # make sure this is removed
formatting
2006-11-21 02:40:47 +01:00
return "<a href=\"$user\">".escapeHTML($display)."</a>";
improvement
2006-11-20 22:02:45 +01:00
}
else {
return htmllink("", "", escapeHTML($user), 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
1