0ced5995d5
get rid of the [postcomment] hack
...
I think that using a flag variable is sorta cleaner.
(This is untested.)
2008-12-12 15:05:26 -05:00
38c92e63bb
move getsetup to usual place
2008-12-12 14:59:23 -05:00
473160c947
htmlbalance: don't compact whitespace, and set misc other options
...
Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
(cherry picked from commit cb5aaa3cee
2008-12-12 14:23:12 -05:00
41efa5ac92
Merge branch 'master' into comments
2008-12-12 14:21:08 -05:00
88e8d4bf8d
meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
2008-12-12 14:06:45 -05:00
1942fc3bd6
comments: Store dates in GMT and in ISO-8601
...
The [[!_comment]] directive is a serialization format, not something for
presentation to users, so we should use the least ambiguous possible
representation.
2008-12-12 11:02:41 +00:00
8d3a3c6a1e
simplifiy logic
2008-12-11 17:31:57 -05:00
f2d5ead6af
comments: Change internal-use-only directive from [[!comment]] to [[!_comment]]
2008-12-11 21:23:55 +00:00
dd1fa13bce
comments: Use new feedfile, emptyfeeds options to inline
2008-12-11 21:19:50 +00:00
3560460eb6
comments: don't interpolate IP into anonymous user's "name"
...
If an admin wants the IP in the comment display template they can still
get it (the default template shows it).
2008-12-11 21:14:05 +00:00
1698364da0
comments: fix invocation of possibly_foolish_untaint
2008-12-11 21:14:05 +00:00
fbf145ca3f
comments: avoid warning if there's no subject
2008-12-11 21:14:05 +00:00
a5889912b3
comments: Optionally allow anonymous commenters to set their name/URL.
...
Also provide a way for the comment template to pick up the verified
username/IP.
2008-12-11 21:14:05 +00:00
0a69c7ed56
comments: Remove some dead code
2008-12-11 21:14:05 +00:00
44a7d77a30
comments: rename main field to "editcontent" consistent with editpage
...
This has the side-effect that Ikiwiki's default style.css gives the text
box 100% width.
2008-12-11 21:14:05 +00:00
edb69335f2
comments: instead of hard-coding mdwn, allow any supported page format
2008-12-11 21:14:05 +00:00
9af0f04df3
comments: Save comments as a file with one big [[!comment]] directive.
...
This delays all comment formatting until the last possible time, allows
us to set metadata without worrying that commenters may be able to evade
it, and means that changes to how a comment is saved can be handled
gracefully. It also gives us somewhere to put the commenter's username
or IP address for later reference.
2008-12-11 21:14:05 +00:00
6a986a8a0b
Remove dead code for preprocessing [[!comments]]
2008-12-11 21:14:05 +00:00
1d696aef2c
comments: Duplicate logic and CGI hook from recentchanges to link user pages correctly
2008-12-11 21:14:05 +00:00
f88870f102
Qualify name of formattime() correctly
2008-12-11 21:14:04 +00:00
80e84e32bf
Delay checking for session expiry til we actually post a comment
2008-12-11 21:14:04 +00:00
24bfc3fdc5
comments: record the time at which each comment was posted
2008-12-11 21:14:04 +00:00
e66e2c2a7e
comments: Use a checkconfig hook to get the default value of comments_pagename
2008-12-11 21:14:04 +00:00
4ff161ba0b
comments: render comments/commenturl in page.tmpl
2008-12-11 21:14:04 +00:00
49eabc676a
comments: use global config to decide whether commenting is allowed, and for name of page
...
Also:
* decide comment page name sooner
* set permalink on it
2008-12-11 21:14:04 +00:00
a9b0b3da5f
comments: use global configuration for allow_directives, commit, and pagename
2008-12-11 21:14:04 +00:00
d35a2bd2de
comments: Add some global configuration
2008-12-11 21:14:04 +00:00
4972baac4d
comments: make preprocess a no-op
2008-12-11 21:14:04 +00:00
c9bb8b03a4
comments: document what linkuser does
2008-12-11 21:14:03 +00:00
404792c618
comments: add a stub pagetemplate hook to show the comments
2008-12-11 21:14:03 +00:00
3abfc1d71c
comments: Use HTML entities to escape directives
2008-12-11 21:14:03 +00:00
430ac61f21
Embed comments into comments_embed.tmpl rather than concatenating in perl
2008-12-11 21:14:03 +00:00
286dbb0541
comments: use CGI module's checksessionexpiry
2008-12-11 21:14:03 +00:00
9a6005a212
editpage: factor out checksessionexpiry into IkiWiki::CGI
2008-12-11 21:14:03 +00:00
cb5aaa3cee
htmlbalance: don't compact whitespace, and set misc other options
...
Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
2008-12-11 21:14:03 +00:00
249ea2ed75
comments: remove allowhtml option, just switch it on all the time
...
Now that posts are individually sanitized, that should be safe.
2008-12-11 21:14:03 +00:00
4663f364bb
comments: load inline and mdwn lazily
2008-12-11 21:14:03 +00:00
9d92fd5eb0
comments: don't rely on mdwn getting loaded first
2008-12-11 21:14:03 +00:00
ebe140201e
comments: sanitize the body of each comment before posting it
...
This should ensure that users can't "break out" from the enclosing
<div>, making it impossible to forge comments (assuming htmlscrubber
is enabled, and so is either htmlbalance or htmltidy).
2008-12-11 21:14:03 +00:00
57e40b9ce5
Fix typo that led to comments being blanked
2008-12-11 21:14:02 +00:00
3d4aa065d6
postcomment: Rename plugin to comments, use *._comment files
...
The PageSpec is still called "postcomment" since that's what it means.
2008-12-11 21:14:02 +00:00
3c9ccb406b
Rename smcvpostcomment plugin to postcomment to propose for inclusion
2008-12-11 21:14:02 +00:00
b7db3444a5
smcvpostcomment: allow commenting to be closed
2008-12-11 21:14:02 +00:00
f49603bf86
smcvpostcomment: import other plugins lazily and remove unnecessary use of CGI
2008-12-11 21:14:02 +00:00
442e4e7e12
smcvpostcomment: allow inlining to be disabled, and pass through atom etc. better
2008-12-11 21:14:02 +00:00
bb4eb07bdd
smcvpostcomment: make allowhtml etc. configurable, and don't allow commenting on pages where comments have never been allowed
2008-12-11 21:14:02 +00:00
d18adfb1ad
smcvpostcomment: indicate in form whether HTML and directives are allowed
2008-12-11 21:14:02 +00:00
1bd1b03766
smcvpostcomment: remove HTML if not allowed
2008-12-11 21:14:02 +00:00
660a4ef151
smcvpostcomment: always allow wikilinks, and do access control
...
wikilinks are harmless, so we might as well allow them.
Access control for this plugin is a bit odd, since we specifically
don't want to allow comments to be edited - so the check is whether the
user is allowed to edit a deliberately invalid page name,
page/commented/on[smcvpostcomment]. You can put smcvpostcomment(*)
or smcvpostcomment(some/subdir/*) in $config{anonok_pagespec}
or the opposite in $config{locked_pages} to allow "editing" (really
just posting) comments.
2008-12-11 21:14:02 +00:00
798dea2033
smcvpostcomment: reduce length of subject field
2008-12-11 21:14:02 +00:00
29862a8cc8
smcvpostcomment: explain what $fake is for
2008-12-11 21:14:01 +00:00
42b15f7633
smcvpostcomment: avoid warnings if form field 'body' is undef
2008-12-11 21:14:01 +00:00
e65c7b73af
smcvpostcomment: load inline plugin more forcibly
2008-12-11 21:14:01 +00:00
49835784d8
smcvpostcomment: use better names for special comment files
2008-12-11 21:14:01 +00:00
bd8c4674a8
smcvpostcomment: use gettext where appropriate
2008-12-11 21:14:01 +00:00
f77f7a02a6
Add initial version of a postcomment plugin (temporarily namespaced as smcvpostcomment)
2008-12-11 21:14:01 +00:00
b67632cdcd
inline: Support feedfile option to change the filename of the feed generated.
2008-12-11 15:01:26 -05:00
63eb9d834e
inline: Support emptyfeeds=no option to skip generating empty feeds.
2008-12-11 14:04:38 -05:00
38f5e3ba69
move feedpages application up
...
I wanted this nearer to the top, but decided to put it after the
add_depends. Reasoning: It's possible with a combinaton of feedpages and
show options to make @list and @feedlist contain completly differing sets
of pages. We want to add_depends all pages in both sets. We could combine
the two lists and add_depends that, but it's slightly more efficient to
defer reducing @feedlist, and add_depends whichever list is longer.
2008-12-11 13:58:40 -05:00
3190e5cea7
Merge commit 'upstream/master' into prv/po
2008-11-13 04:39:53 +01:00
5eed0fd97d
po(change): reset renamed pages status at a better time
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-13 04:37:26 +01:00
d795a295c9
po: initial infrastructure to deal with renamed master page
...
This is a skeleton that does nothing yet.
See the comments in the code for an overview of the issue that arises, due to
the renamepage hook never being called globally.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-13 03:55:55 +01:00
c390056eb2
po(delete): added hook, and function skeleton
...
Not implemented yet, 'cos the renamepage hook has to come first.
Else translations would be deleted on rename, what a shame.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-13 01:38:22 +01:00
cb1fe44f5d
po(change): avoid losing information before guessing the same...
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-13 01:07:52 +01:00
8745d67f06
po(istranslatablefile): extracted this from istranslatable
...
... will need this soon to deal with master file deletion.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-13 00:56:23 +01:00
190c641c8a
po(otherlanguages): return pages that should exist
...
... instead of already existing ones.
This fixes the "missing otherlanguages links on master pages just created via
the CGI" bug.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 23:27:30 +01:00
36312b13b4
po: memoized istranslatable, eventually
...
And enjoy a 10% rebuild time enhancement on a complex wiki full of maps and
other pseudo-dynamic content, with some other costly plugins enabled. So it
could well mean 20% on a more usual wiki.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 22:32:47 +01:00
10c4e858b8
po(change): flush Memoize cache, to fix bug after rename/remove
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 21:18:48 +01:00
c440a39ba4
po(htmlize): ignore PO files not managed by this plugin
...
This way, the po plugin will not appropriate PO files it is not responsible for,
and PO files existing before this plugin was enabled can coexist peacefully with
our own ones.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 18:06:04 +01:00
2f27eb9693
po: ooops, fixed just introduced bug
...
(I just removed in istranslation and _istranslation the dependency on
istranslatable... which broke things in a subtle way, hard to see at the first
glance.)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 17:52:00 +01:00
e18a9d9a88
parentlinks: fixed links when po plugin is enabled
...
(and usedirs is disabled)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 17:36:00 +01:00
aed42eb34a
po: fix istranslation/istranslatable for pages starting with /
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 17:29:12 +01:00
f4815e3b12
po(mybestlink): fixed when fed with path beginning with /
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 16:54:51 +01:00
eba2dee941
po: compute internal links from a slave page relative to its master page
...
e.g. a link appearing on a slave page links to its masterpage's subpages.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-12 15:04:50 +01:00
ecd4f0ee55
make unlockwiki drop the cgilock
...
This is necessary so that things that fork to the background,
like pinger, and inline ping, don't block other cgis from running.
Note that websetup also calls unlockwiki, before refreshing / rebuilding
the wiki. It makes perfect sense for that not to block other cgis.
2008-11-11 20:48:02 -05:00
b19d0d3d24
Merge commit 'upstream/po' into prv/po
2008-11-12 01:08:57 +01:00
0d1593a201
Merge commit 'intrigeri/po' into po
2008-11-11 17:52:51 -05:00
2a56ec6644
Merge branch 'master' into po
2008-11-11 17:52:32 -05:00
40ffc92953
po: fixed bug when a new translatable page is created
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 23:04:58 +01:00
2b4e76a961
po: change a bit the way links are generated
...
This will soon enable usage of translated page titles in link.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 22:29:47 +01:00
eef8b966b3
O_CREATE needs mode
2008-11-11 15:53:55 -05:00
9a48669f1e
avoid multiple ikiwiki cgi processes piling up, eating all memory, and thrashing
...
Fixed by making the cgi wrapper wait on a cgilock.
If you had to set apache's MaxClients low to avoid ikiwiki thrashing
your server, you can now turn it up to a high value.
The downside to this is that a cgi call that doesn't need to call lockwiki
will be serialised by this so only one can run at a time. (For example,
do=search.) There are few such calls, and all of them call loadindex,
so each still eats gobs of memory, so serialising them still seems ok.
2008-11-11 15:40:04 -05:00
6611f3a2d9
bzr: Fix dates for recentchanges.
2008-11-11 13:44:47 -05:00
f0abaa9fc9
po: fixed link to home page when po_link_to=negotiated, added testcase
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 18:42:14 +01:00
f0e796d9a1
po(change): fix uninitialized variables when running IkiWiki::refresh()
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 16:04:40 +01:00
43a1d36378
po: added HOMEPAGEURL template variable, documented when to use it
...
Hopefully all links should now be consistent with the chosen linking behavior,
but who knows...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 15:27:39 +01:00
cfe101fff9
po: fixed link to homepage from non-translation page
...
Added testcases for this bug.
It remains broken when generated from <TMPL_VAR BASEURL>, though.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 15:06:26 +01:00
6b82ef44b0
po: some code simplification/clarification
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 14:11:34 +01:00
3d8d47d785
Merge commit 'upstream/master' into prv/po
2008-11-11 04:40:24 +01:00
0d8cbfc5e0
po(scan): make more clear what's being done
...
Mostly comments, and also a small code change: simplification and implementation
details hiding.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 04:32:20 +01:00
d57ef86380
po: reorder nearly all of the module code
...
It has grown up incrementally and new helper functions were added right in the
middle of the hooks, most often near the place they were used, which is
practical when doing initial development, but quite ugly afterwards, when helper
functions are useful to separate logic and implementation details.
Today's refactoring commits have brought the code to a much more maintainable
state, IMHO.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-11 04:05:39 +01:00
53752bcb5d
remove redundant link munge
...
This is not needed now that tagpage returns a page name starting with a
slash.
(Also fixes a minor bug that the edit links started with double slashes due
to the hack.)
2008-11-10 21:47:29 -05:00
f8a09ba105
tag: Normalize tagbase so leading/trailing slashes in it don't break things.
2008-11-10 19:48:58 -05:00
f0e58faefa
Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links.
2008-11-10 18:05:30 -05:00
a7d329c173
po(match_lang, match_currentlang): use the lang() function
...
... now that it exists, instead of duplicating it.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 21:30:06 +01:00
b4ab0d0b9e
po: rewrote otherlanguagesloop()
...
It is now more elegant IMHO, and the output is now sorted according to the
language name (instead of code).
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 21:19:21 +01:00
c5513548c9
po: factorize extraction of a slave page's masterpage and lang
...
The very same code was repeated at dozens of places.
NB: the real work is now done is _istranslation(), which is memoized,
so the additional function calls overhead should be compensated.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 20:40:44 +01:00
864bc2d9d0
po(otherlanguagesloop): start factorizing
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 18:38:25 +01:00
1255acc02c
po: finish abstracting %filtered by putting it into a blackbox
...
i.e. it is invisible for everyone but its accessors/mutators
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 15:30:49 +01:00
38cdda66d7
po: actually use pofiles() function, to enhance code clarity
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 15:09:56 +01:00
5575786803
po: abstract "doing something for the same page in every other language"
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 14:55:21 +01:00
532ec56a5f
po: abstract implementation details for %translations building and resetting
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 13:56:46 +01:00
3174b4c6f3
po: abstract %filtered implementation details
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 13:51:00 +01:00
00732f19b9
po: clarify error messages
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 13:22:50 +01:00
6fc898df75
po: clarify code with some comments
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 13:14:42 +01:00
aef1b0f503
po: prevent a slave page to depend on itself
...
It has never caused harm yet, but it might in the future.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-10 12:48:27 +01:00
646d7bf6a3
po(refreshpot): define the input charset before read()'ing
...
... to prevent the use of Encode::Guess::guess_encoding() in
Locale::Po4a::Transtractor (just a minor security measure, dependent on po4a
internals, but we have no reason to think Encode::Guess is not safe).
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-08 21:32:04 +01:00
f652af11fd
Merge commit 'upstream/master' into pub/po
2008-11-07 22:19:34 +01:00
a0ac346079
po: finished backlinks implementation
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-07 22:17:54 +01:00
34ab884242
po: implemented linking/backlinks specification for po_link_to=negotiated
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-07 21:27:00 +01:00
3e341e64c2
po: added pofiles() function, will use this soon
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-07 21:23:23 +01:00
4879a7f033
po: add comments
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-07 16:33:10 +01:00
11d377af81
txt: Do not encode quotes when filtering the txt, as that broke later parsing of any directives on the page.
2008-11-06 20:49:18 -05:00
db5ea4d4f0
meta: Plugin is now enabled by default since the basewiki uses it.
2008-11-06 16:08:11 -05:00
ecf2399f4f
aggregate: Try to query XML::Feed for the base url when derelevatising links. Since this needs the just released XML::Feed 0.3, as well as a not yet released XML::RSS, it will fall back to the old method if no xml:base info is available.
2008-11-06 16:05:10 -05:00
daa04ae436
po: fix link to homepage in special case
...
... by wrapping IkiWiki::urlto in order to workaround hard-coded
/index.$config{htmlext}, which is wrong when usedirs=0 and po_link_to=current
and translatable homepage
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 17:28:04 +01:00
8b001dbb00
po: redesign (once more) automatic POT/PO files update
...
Now use the change hook to update these files, check them into VCS, and trigger
IkiWiki::refresh as needed. The needsbuild hook's help was required to prevent
infinite looping.
This more rigorous way of doing this fixes recentchanges (that was previously
not updated in some cases), and probably is a better long-term solution than the
two previously tested ones.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 15:54:55 +01:00
802be94104
po: use prep_writefile before creating any files in refreshpot and refreshpo
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 14:17:33 +01:00
10af328ff1
po: syntax warning fix
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 14:08:33 +01:00
7ad5c5cbdc
po: fixed whitespace
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 13:55:03 +01:00
769be3d48e
po: po_link_to is safe, and fallbacks to a working value if needed
...
warnings are displayed if it is set to an invalid or incompatible value
(e.g. po_link_to=negotiated and disabled usedirs)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 13:47:09 +01:00
419de149a6
po: mark po_translatable_pages as a safe configuration setting
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 13:29:48 +01:00
34afa2c07d
po: po_master_language and po_slave_languages are safe config settings
...
... and check their validity in checkconfig
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 13:26:45 +01:00
c96dd00480
po: added license and copyright
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 13:01:33 +01:00
1f54c13ec2
Merge commit 'upstream/po' into prv/po
...
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-06 12:28:31 +01:00
17bd930bc9
first pass over code
...
Only change of note is quoting some strings in a regexp, just in case
(also avoids the . matching any character!)
Mostly whitespace changes of no consequence.
2008-11-05 15:18:07 -05:00
ae37bca0e2
backup refs to injected subs later
...
In case two plugins both inject replacements for these subs,
backup the ref just before injecting to make sure the most
recent version is seen.
2008-11-05 15:09:54 -05:00
9b16e7f148
minor layout changes
2008-11-05 15:09:04 -05:00
7e95723dad
avoid hitting the shell with system()
2008-11-05 14:45:45 -05:00
9bedf53c0f
another reason to require rebuilds (and not be marked safe)
...
the plugin changes html filenames, so requiring a manual transition to
enable
2008-11-05 13:57:48 -05:00
127a8a3701
Merge commit 'intrigeri/po'
2008-11-05 13:50:26 -05:00
42b4abee1d
use error for two messages
2008-11-05 01:38:36 -05:00
3e0c52c524
po plugin(filter): redesign temp file management
...
... in a way compatible with various File::Temp versions.
The result is far from being perfect (see comments in the code for details),
but it does work.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-05 01:36:44 +01:00
4c6c00ccdf
Merge commit 'upstream/master' into prv/po
2008-11-04 23:39:15 +01:00
225e21f6c5
po plugin: redesign refresh mechanism after master page update
...
manually triggering IkiWiki::refresh() was at least dubious, and more or less
buggy (it randomly broke the whole backlinks feature); thinking a bit more to
add the necessary bits to @needsbuild seems like a better way. don't play with
ikiwiki's internals if not absolutely needed.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-04 23:32:32 +01:00
bc5b875de8
po plugin: remove broken parentlinks for home page's translations
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-04 20:05:21 +01:00
cfcb7454db
po plugin: aesthetics
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-04 19:23:58 +01:00
c731a81b43
po plugin: fix preview for PO files
...
As a trick, use editcontent hook to mark the page as unfiltered, to force our
filter() sub's to proceed again.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-04 18:24:43 +01:00
c7fbcf6c5e
po plugin: slave pages link to the master's discussion page
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-03 00:52:27 +01:00
9bd3262f50
po plugin: replace %hash=undef with undef %hash
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 23:12:43 +01:00
773de05a7a
po plugin: force utf-8 encoding in POT files
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 21:35:52 +01:00
2ebc0bb82d
po plugin: fix linking from a translation to its master page
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 20:08:38 +01:00
37a9e64291
po plugin: fix targetpage for home page's translations
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 18:54:53 +01:00
439ba4490a
po plugin: removed last (?) bit of deprecated custom hook
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 18:51:00 +01:00
950c29679d
po plugin: replace targetpage hook with wrapper function
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 18:48:56 +01:00
439a2d3c44
Revert "added the targetpage hook"
...
This reverts commit fc299df955
2008-11-02 18:34:10 +01:00
307d11541a
po plugin: replace tweakurlpath hook with a wrapper function
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 18:29:23 +01:00
d71caffb7b
preprocess text before htmlizing it
2008-11-02 12:21:15 -05:00
7c173aca3e
Revert "added hook urlpath" and "rename urlpath hook into tweakurlpath..."
...
This reverts commits d9b9022c1339d44d443d
2008-11-02 18:08:50 +01:00
502a3433c4
po plugin: replace tweakbestlink hook with a wrapper function
...
... thanks to the new inject() feature.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 17:56:15 +01:00
fafa98ea96
disable istranslatable memoization
...
It makes some test cases cry once every two tries; this may be related to the
artificial way the testsuite is run, or not. In the meantime, stop memoizing
this function.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-11-02 16:44:42 +01:00
7713653878
Merge commit 'origin/master' into prv/po
2008-11-02 13:11:00 +01:00
bb841f94f4
format: New plugin, allows embedding differntly formatted text inside a page (ie, otl inside a mdwn page, or syntax highlighted code inside a page).
2008-10-31 16:42:20 -04:00
ae0a9d50be
set ctime in --render mode if not known
...
Avoids some uninitialised value warnings.
2008-10-30 14:50:33 -04:00
354d22e27b
don't rely on plugin load order when determining generated directives
...
Instead, shortcuts will explicitly be marked as such when registered, and
listdirectives can filter them out.
2008-10-30 13:41:19 -04:00
33a0e84ddb
fix preview of shortcuts
...
Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.
2008-10-29 14:20:31 -04:00
5b7677faba
fix display of error msg
2008-10-29 13:38:26 -04:00
8530e827b0
git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
2008-10-27 14:45:54 -04:00
d3d3999410
do no-op post_commit test in wrapper
...
This speeds up web commits by 1/4th of a second or so, since perl does
not have to start up for the post commit hook.
perl's locking is completly FuBar, since it's impossible to tell what perl
flock() really does, and thus difficult to write code in other languages
that interoperates with perl's locking. (Let alone interoperating with
existing fcntl locking from perl...)
In this particular case, I think I was able to find a way to avoid the
insanity, mostly. The C code does a true flock(2), and if perl is using an
incompatable lock method that does not use the same locking primative at
the kernel level, then the C code's test will fail, and it will go ahead
and run the perl code. Then the perl code's test will test the right thing.
On Debian, at least lately, perl's flock() does a true flock(2), so the
optimisation does work.
2008-10-26 15:13:04 -04:00
7ddea03684
move untrusted committer test into the wrapper
...
This saves around 1/4th second per trusted commit since ikiwiki
doesn't need to start up.
2008-10-26 14:03:18 -04:00
4a7ac5c251
remember how to write C code
...
been a while!
2008-10-24 15:49:55 -04:00
146192d5b0
the pre-receive wrapper needs to be suid after all
...
It needs to write to the user db.
2008-10-24 15:47:42 -04:00
761dee41b1
export CALLER_UID
2008-10-24 15:46:29 -04:00
739e2ca0b4
can't lock wiki due to permissions (probably)
...
luckily, don't really need to here
2008-10-24 15:02:54 -04:00
1a883b3c50
include temp file for attachment change too
2008-10-24 13:44:03 -04:00
0196e1f9fc
updates
2008-10-24 13:29:41 -04:00
fbcb8553df
really fix calls to check_can*
2008-10-24 13:29:30 -04:00
85f4b99710
untrusted committers code seems to be fully working
...
Still need to investigate possible races, and test some more.
2008-10-23 18:05:57 -04:00
f349e4ef36
fix calls to check_*
...
These throw errors, do not have useful return codes.
2008-10-23 18:05:12 -04:00
ad9e443f22
check_canattach hooked up
2008-10-23 16:56:40 -04:00
4669eab596
more work on untrusted committers
...
Wired up check_canedit and check_canremove, still need to deal with
check_canattach, and test.
2008-10-23 16:29:50 -04:00
094af3d113
initial support for git repos with untrusted committers
...
Still need to wire up the calls to check_* , but it's cold out here and my
hands are going numb, so enough for now.
2008-10-22 20:52:34 -04:00
e75818572f
function injection overhaul
...
Add an inject function, that can be used by plugins that want to replace
one of ikiwiki's functions with their own version. (This is a scary thing
that grubs through the symbol table, and replaces all exported occurances
of a function with the injected version.)
external: RPC functions can be injected to replace exported functions.
Removed the stupid displaytime hook, and use injection instead.
2008-10-21 17:57:19 -04:00
327adadf04
disable warnings when redefining functions
2008-10-21 17:03:08 -04:00
ee1ccfa863
use relativedate as the css class for dates that should display relative
2008-10-20 19:22:22 -04:00
a2839de936
tag: When tagpage is set, force the links created by tagging to point at the toplevel tagpage, and not closer subpages.
...
The html links already went there, but internally the links were not
recorded as absolute, which could cause confusing backlinks etc.
For example, with tagbase=tags, if blog/tags/bar existed and blog/foo was
tagged bar, it would link to /tags/bar. But, the link would be recorded
simply as a link to tags/bar, and so later blog/tags/bar would appear to
have the backlink.
2008-10-20 18:17:03 -04:00
5e52bfb2e7
inline: Only the last feed link was put on the page, fix this to include all feed links. So rss will be included along with atom, and pages with multiple feeds will get links added for all feeds.
2008-10-20 15:25:45 -04:00
fadb26bc15
Merge commit 'origin/master' into prv/po
2008-10-20 14:33:19 +02:00
423fae6f18
Use the pure perl Data::Dumper when generating setup files to ensure that utf-8 characters are written out as such, and not as the encoded perl strings the C Data::Dumper produces.
...
Note that the text produced by the C version was interpreted fine
when ikiwiki loaded the setup file. But it was not user-friendly.
2008-10-19 21:23:48 -04:00
3e992b758b
Fix issue with utf-8 in wikiname breaking session cookies, by entity-encoding the wikiname in the session cookie.
2008-10-19 21:07:12 -04:00
fd9393ef85
add displaytime hook
...
Need to use a hook because an exported function cannot be reliably
overridden. The replacement verstion was actually only affecting plugins
loaded after it.
formattime doesn't need a hook, since there's no reason to export it.
2008-10-19 20:12:37 -04:00
db146d9f1e
need to use localtime, fix width
2008-10-19 19:39:32 -04:00
2b569f99d9
fix relativedate timezone inclusion
...
The machine parseable date needs to include a timezone.
Also, simplified the interface for date display.
2008-10-19 19:21:44 -04:00
2321906cd7
mark up date so relativedate will work
2008-10-19 15:17:00 -04:00
8211910566
po plugin: set every configuration item to unsafe
...
We will check later which ones are actually safe enough for websetup.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 17:19:42 +02:00
f096a9d798
po plugin: added ISTRANSLATION and ISTRANSLATABLE template variables
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-19 00:05:13 +02:00
629968fc89
po plugin(refreshpot): prevent PO references to be written
...
... else we can fall into some kind of nasty infinite loop, when two ikiwiki
instances don't store their working copy of the repository at the same place:
every POT file update in one repository would trigger an update of the same POT
file in the others repository, and so on.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 21:47:49 +02:00
a0deb3038c
po plugin: do not allow msgmerge to create backup files
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 19:18:22 +02:00
892809bb53
po plugin: only refresh private module variables when needed
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:13 +02:00
7b7865150f
po plugin: add correct dependencies on pages using OTHERLANGUAGES
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:13 +02:00
1aad01f841
po plugin: bugfix (OTHERLANGUAGES)
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
1d76762517
po plugin: initial implementation of automatic POT/PO update
...
The updated or created PO files are put under version control.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
1e69eb482f
po plugin: rebuild %translations after having created missing POT/PO files
...
This is not needed yet, but when newly created POT/PO files are added to
%pagesources and other data structures, we'll need this.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
58c77a01f7
po plugin: create missing POT/PO files in needsbuild hook
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
6add615928
po plugin: added and documented PERCENTTRANSLATED template variable
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
1a670d3aca
po plugin: make translation percentage available in OTHERLANGUAGES loop
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
8867316125
po plugin: added currentlang() custom PageSpec function
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:12 +02:00
ce9db89896
po plugin: added lang() custom PageSpec function
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
d4f787ef52
po plugin: make any slave page dependent on the corresponding master page
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
a8e8613fa1
po plugin: bugfix - only refresh POT/PO for translatable pages
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
dc74c8e577
po plugin: do not trust po4a functions return value
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
6424d748a4
po plugin: refresh PO files when a master page is updated
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
d5b5cfb8e4
po plugin: refresh POT files when a master page is updated
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
bd237d48cf
po plugin: build %translations in needsbuild hook rather than scan
...
... because we'll need this data to refresh POT/PO files in needsbuild hook
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:11 +02:00
a28559798a
po plugin: created OTHERLANGUAGES template loop
...
It currently only provides basic translations/master pages links.
Updated documentation accordingly.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
32cc0b336a
po plugin: po_slave_languages is a hash, rather than a hash of hashes
...
The latter seems to be unsupported by ikiwiki config system.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
ae827a43f8
po plugin: build %translations at scan time
...
... so that we can consider it as complete at preprocess time
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
08df9dcef7
po plugin: memoize istranslatable and _istranslation
...
Both functions are called very often, and:
- istranslatable has no side effect
- _istranslation is the helper function, without any side effect, for the
istranslation function
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
1e874b3f0a
po plugin[filter]: avoid converting more than once per destfile
...
Only the first filter function call on a given {page,destpage} must convert it
from the PO file, subsequent calls must leave the passed $content unmodified.
Else, preprocessing loops are the rule.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
52728bb6ea
po plugin: bugfix (calling function in wrong module)
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
458ccebdd3
po plugin: added *.pot to wiki_file_prune_regexps
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
e163b037bf
po plugin: move translatable pages to setup file, refactor
...
Replaced [[!translatable]] directive with po_translatable_pages setting.
Moved istranslatable/istranslation code to helper functions leaving place for
future caching and/or memoization. The PageSpec functions still work.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:10 +02:00
ffd1fff775
po plugin: allow pagestate update (bugfix)
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
b0b87d1584
po plugin: respect documented convention to store pagestate
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
79d6f52d30
po plugin: implemented po_link_to=current
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
0791e5afe3
po plugin: added istranslatable() pagespec function, and use it
...
(do not name non-translatable pages index.LL.html)
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
fdc7974b2a
po plugin: implemented po_link_to=negotiated
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
e82c6b1908
po plugin: implement linking specification in one of the main cases
...
i.e. in case usedirs is enabled and po_link_to_current_language is disabled
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:09 +02:00
c8330da6c0
po plugin: add po_link_to_current_language option, check config
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
1975d4d35f
po plugin: use pagespec_match() instead of direct match_istranslation calls
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
258c49ae55
po plugin: added [[!translatable]] directive
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
d9b9022c13
added hook urlpath
...
This hook can be used to modify the internal urls generated by ikiwiki.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
bd50ba3e83
po plugin: switch to page.LL.html naming convention
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:08 +02:00
45d08022bb
po plugin: name rendered master pages like slave ones (page.html.LL)
...
Apache's content negotiation transparently redirects any old URL (page.html) to
the new one, depending on the client preferred language (i.e. a German browser
will be fed with page.html.de). Transition to this naming convention is then
really smooth.
This naming convention allows one to deliberately display the master page, even
if her browser is configured for another language.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
b90f8397f6
po plugin: reworked available options
...
- renamed po_supported_languages to po_slave_languages
- added po_master_language option, which will soon be useful
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
575d4021e3
po plugin: htmlize translated content as if it was the same type as the master page
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
1b5f610a97
po plugin: convert PO to master page's type in filter hook
...
Master page's type htmlize hook should also be run in po's htmlize hook,
but let's proceed step by step.
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
75fc44ce2f
po plugin: factorize most checks into a new match_istranslation PageSpec
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
50f1fd43da
po plugin: initial work
...
- .po is a new supported wiki page type
- PO files are rendered verbatim into HTML
- override targetpage to ease Content Negotiation
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
fc299df955
added the targetpage hook
...
Signed-off-by: intrigeri <intrigeri@boum.org>
2008-10-18 15:49:07 +02:00
cb9a695443
fix url
2008-10-17 22:04:43 -04:00
35c56622ea
tweak recentchanges permalink code
...
Need to handle the case where url is not set.
2008-10-17 21:54:42 -04:00
fdb5da46b0
Patch for anchor-based change permalinks in recent changes feed
...
from JasonBlevins
2008-10-17 21:49:55 -04:00
745dc1c62f
add missing getsetup hook
2008-10-17 21:29:05 -04:00
02ec92c6cb
make relativedate work for the dates on the recentchanges page
...
Having a always current relative date on recentchanges is very, very nice.
2008-10-17 21:21:07 -04:00
7390a7a072
relativedate: New javascript-alicious plugin that makes all dates display relative, in a very nice way, if I say so myself.
2008-10-17 20:47:32 -04:00
79b376f991
Add an underlay for javascript, and add ikiwiki.js containing some utility code.
...
* Add an underlay for javascript, and add ikiwiki.js containing some utility
code.
* toggle: Stop embedding the full toggle code on each page using it, and
move it to toggle.js in the javascript underlay.
2008-10-17 20:28:18 -04:00
f36080ae02
aggregate: Avoid bug that caused immediate expiration of items with a date in the future.
2008-10-16 18:20:16 -04:00
78a69e5bd6
only darcs add files not yet in version control
2008-10-16 17:20:17 -04:00
7eb512205f
updated from pesco's darcs repo, current to Oct 11 version
2008-10-15 19:38:21 -04:00
1f7f5d5e0e
Merge branch 'master' into darcs
2008-10-15 19:36:48 -04:00
b8f4b9c799
inline: Use the feed's description in the rss and atom links. Closes : #502113
2008-10-15 14:45:28 -04:00
02e39bf704
fix prototype
2008-10-14 15:47:19 -04:00
c39112e6ef
inline: Allow MTIME to be used in inlinepage.tmpl.
2008-10-14 15:00:46 -04:00
3b27af4a29
Pass HTTPS variable through the wrapper so that CGI->https can be used by plugins. Closes : #502047
2008-10-13 12:32:16 -04:00
643c0f1afc
optimise url parsing and add guard against failure to parse
2008-10-10 17:09:33 -04:00
f9957d11ed
google plugin: Use google.com to search the local site.
...
Google allows has a nice feature, sitesearch, that allows anyone to
limit search results to a specific site. Obviously, this feature can be
used to provide a search engine for the local ikiwiki site without the
need to install any additional software. Just enable the 'google' plugin
and make sure that --url uses the proper hostname. Thanks to Joey for
helping to get the Perl implementation right.
2008-10-10 17:05:02 -04:00
a473cb2f74
orphans: Fix unquoted page name in regexp.
2008-10-09 19:09:16 -04:00
d3ca495e61
lockedit: Support specifying which users (and IP addresses) a page is locked for. This supports most of the ACL type things users have been wanting to be done. Closes : #443346 (It does not control who can read a page, but that's out of scope for ikiwiki.)
2008-10-08 17:47:38 -04:00
1e17ea0b65
avoid $_ in a few other for loops
...
These were probably not currently buggy, but let's avoid bugs being
introduced by the functions called clobbering $_.
2008-10-06 16:19:54 -04:00
fea76a11bc
remove: Avoid $_ breakage. (Stupid, stupid perl.)
...
This avoids another one of those $_ scoping issues where a deep call to a
function that changes $_ clobbers the array that is being looped over.
2008-10-06 16:10:47 -04:00
3b47dae9ca
remove, rename: Allow acting on attachments as a page is being created.
2008-10-02 12:53:53 -04:00
c945952381
attachment: Support adding attachments to pages even as they are being created.
2008-10-02 12:48:06 -04:00
e0fd02acf1
don't special case preview
...
Whenever the edit form is submitted, but not saved, the page location
select should reduce to the currently selected value. This was only done
when previewing before, but is also needed in order to support the case of
adding an attachment to a page that is just being created.
Before this change, the attachment plugin would get a weird value in
$form->field("page"), that did not reflect the actual page location.
2008-10-02 12:42:46 -04:00
bf386e22f5
inline: Fix handling of rootpage that doesn't exist.
...
It makes sense to use bestlink to determine which page rootpage refers to,
but if no page matches, just use the raw value.
2008-10-01 17:29:03 -04:00
917f54a777
add pesco's darcs plugin
2008-10-01 17:24:06 -04:00
826af4600a
fix subpage rename bug with indexpages
...
If indexpages is enabled, then foo/index.mdwn will look like a subpage
of foo, so an additional check is needed to avoid trying to rename it
twice.
2008-10-01 14:43:28 -04:00
733171bf3f
support indexpages
2008-09-29 19:08:12 -04:00
121efb246f
Removed the pagefile function, which was confusingly close in name to
...
newpagefile.
Note that newpagefile is not used here (or in recentchanges) because
the internal use pages they generate are transient and unlikely to
benefit from being put each in their own subdir.
2008-09-29 18:59:20 -04:00
2ba168ac83
use newpagefile
2008-09-29 18:52:42 -04:00
a7fd6debc5
support indexpages when renaming pages
...
Note that the page filename code used here and in editpage are identical..
2008-09-29 18:29:53 -04:00
40007b8111
support indexpages when creating new pages
...
Initial draft, may need to factor new page filename code out into helper
function if other plugins need to do the same..
2008-09-29 18:19:44 -04:00
bb4211e326
avoid unnecessarily rebuilding pages with complex conditionals
...
I noticed that ikiwiki/formatting was beilg rebuilt when any page changed.
This turned out to be because it contained a complex conditional
"enabled(foo) or enabled(bar)", and the conditional plugin did not notice
that this consisted only of enabled() tests, and copied it unchanged into
add_depends. Thus, the page's dependencies were satisfied by any page
change.
The fix is to beef up the parser so that it can handle that and more
complex conditionals, and detect if they consist only of such tests.
2008-09-29 18:05:39 -04:00
6b01fca253
use gettext
2008-09-29 17:06:56 -04:00
c4be16703f
fix handing of case of file first created by preview but then saved
...
To handle this, avoid populating %renderedfiles in preview,
and in expiry, check if the file is in %renderedfiles, if it is
do not delete it since it was saved.
2008-09-29 13:25:31 -04:00
2ff3c8aee7
editpage: Be more aggressive (and less buggy) about cleaning up temporary files rendered during page preview.
2008-09-27 18:02:33 -04:00
61426a7186
Reorganize index file, add a format version field.
...
Upgrades to the new index format should be transparent.
The version field is 3, because 1 was the old textual index, 2 was the
pre-versioned format.
This also includes some efficiency improvements to index loading, by
not copying a hash and using a reference.
2008-09-27 16:35:56 -04:00
55a0361a47
template: Make edit link for new templates ensure the page is located under toplevel templates directory.
2008-09-27 15:18:36 -04:00
67f38832aa
htmltidy robustness fixes
...
* htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
untidied content if tidy crashes. In either case, it seems best to tidy
the content to nothing.
* htmltidy: Avoid spewing tidy errors to stderr.
2008-09-27 14:27:42 -04:00
9ec9d6901d
Export pagetitle, titlepage, linkpage.
2008-09-27 14:27:42 -04:00
bfab23ce33
typo
2008-09-27 14:27:42 -04:00
316ef6571b
pagetype is exported
2008-09-27 13:34:46 -04:00
7351d545d9
Merge commit 'smcv/beautify'
...
Conflicts:
IkiWiki/Plugin/recentchanges.pm
Note that smcv's approach of using urlto also gets the url right when
redirecting to a non-html file, which is a better approach than my recent
fix to recentchanges
2008-09-27 13:00:48 -04:00
f181962dfc
typo
2008-09-27 12:50:39 -04:00
89256ab870
htmlscrubber: Add a config setting that can be used to disable the scrubber acting on a set of pages.
2008-09-26 18:07:37 -04:00
83429adf04
decode utf-8 in recentchanges_link parameter
2008-09-26 15:40:01 -04:00
bce2a34c19
tag: Make edit link for new tags ensure that the tags are created inside tagbase, when it's set.
2008-09-25 20:25:07 -04:00
965f7310fe
git: Fix handling of utf-8 filenames in recentchanges.
...
Seems that the problem is that once the \nnn coming from git is converted
to a single character, decode_utf8 decides that this is a standalone
character, and not part of a multibyte utf-8 sequence, and so does nothing.
I tried playing with the utf-8 flag, but that didn't work. Instead, use
decode("utf8"), which doesn't have the same qualms, and successfully
decodes the octets into a utf-8 character.
Rant:
Think for a minute about fact that any and every program that parses git-log,
or git-show, etc output to figure out what files were in a commit needs to
contain this snippet of code, to convert from git-log's wacky output to a
regular character set:
if ($file =~ m/^"(.*)"$/) {
($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
}
(And it's only that "simple" if you don't care about filenames with
embedded \n or \t or other control characters.)
Does that strike anyone else as putting the parsing and conversion in the
wrong place (ie, in gitweb, ikiwiki, etc, etc)? Doesn't anyone who actually
uses git with utf-8 filenames get a bit pissed off at seeing \xxx\xxx
instead of the utf-8 in git-commit and other output?
2008-09-25 18:26:42 -04:00
e1ba137317
attachment: Add admin() pagespec to test if the uploading user is a wiki admin.
2008-09-25 16:49:30 -04:00
093e815440
aggregate: Avoid uninitialized value warnings for pages with no recorded ctime.
...
I saw this in the wild, apparently a page was not present on disk, but was
in the aggregate db, and not marked as expired either. Not sure how that
happened, but such pages should get marked as expired since they have an
effectively zero ctime.
2008-09-25 15:38:51 -04:00
3f5ba52ee0
recentchanges: Fix redirects to non-page files.
2008-09-25 13:46:12 -04:00
e00df8575f
rename: Hide type field from rename form when renaming attachments.
2008-09-23 19:31:34 -04:00
40dc92a67b
multiple rename support is working
...
most edge cases seem handled too
2008-09-23 19:21:05 -04:00
544da9b0da
Merge branch 'master' into tova
2008-09-23 17:42:38 -04:00
8e0180d8ca
rename, remove: Don't rely on a form parameter to tell whether the page should be treated as an attachment.
2008-09-23 17:41:05 -04:00
cf4db49567
factor out fixlinks
2008-09-23 17:26:46 -04:00
9b57602394
factor out do_rename
2008-09-23 17:04:01 -04:00
9cbc46f49a
add checkbox to rename subpages too
2008-09-23 16:56:57 -04:00
8494104b39
layout
2008-09-23 14:57:13 -04:00
9cbcda14ac
Print a debug message if a page has multiple source files.
2008-09-23 13:32:41 -04:00
a32c0ecd51
include perl error in warning about openid
...
it may be some other module missing, this way you can tell by reading the
log
2008-09-23 12:59:43 -04:00
c7804cafa5
Fix typo in skeleton.pm.example: sessionncgi (with extra n)
...
(cherry picked from commit 72ffc85d6acb8b99839ac98a2c23dbef410b5666)
2008-09-23 12:47:02 -04:00
7f82594410
remove: redirect via urlto(), avoiding mentions of index.html
2008-09-21 18:26:48 +01:00
02923917c8
recentchanges: construct redirections via urlto(), avoiding mentions of index.html
2008-09-21 18:26:48 +01:00
97e3263ad1
poll: Use urlto to produce redirection URLs, avoiding mentions of index.html
2008-09-21 18:26:48 +01:00
e73987b01d
editpage: beautify redirection URLs, avoiding exposing the implementation detail that index.html exists
2008-09-21 18:26:42 +01:00
4c68e149e5
handle templates with special characters in name
...
The template field is really a link, so needs to be converted to a page
name in stored state.
2008-09-20 23:00:19 -04:00
5e713047b4
avoid uninitialised value warning
2008-09-20 22:51:42 -04:00
12eb585353
add missing page name sanity check
2008-09-20 22:48:22 -04:00
748d375954
avoid warning if percent value is not numeric
2008-09-20 16:31:27 -04:00
84347a1247
avoid duplicate template lookup
2008-09-20 16:23:15 -04:00
6088ad861c
revert colon part of change
2008-09-20 16:21:04 -04:00
a6fc3b411f
edittemplate patch from Willu
...
* edittemplate: Default new page file type to the same type as the template.
(willu)
* edittemplate: Add "silent" parameter. (Willu)
* edittemplate: Link to template, to allow creating it. (Willu)
2008-09-20 16:19:09 -04:00
9a9b25346d
i18n
2008-09-19 13:52:01 -04:00
779c5214f3
progress: Display an error if the progress cannot be parsed, and allow the percent parameter to only optionally end with "%".
2008-09-19 13:09:50 -04:00
914c92c4e1
fix check for nonexistant content
2008-09-17 18:19:52 -04:00
89953e3e19
store ctime for use by expiry code
...
The expiry code does need to make sure to sort in ctime order, even if
expiring by count, so it expires the right ones.
2008-09-17 18:11:22 -04:00
1cb4154bc8
aggregate: Support atom feeds with only a summary element, and no content elements.
2008-09-17 15:56:58 -04:00
da7c6eb1b4
editdiff: Broken since 2.62 due to wrong syntax, now fixed.
2008-09-17 14:34:02 -04:00
b540b263de
aggregate: Allow expirecount to work on the first pass. (expireage still needs to wait for the pages to be rendered though)
2008-09-17 14:27:31 -04:00
ee94407891
rootpage is not a pagespec
...
So ./posts won't be interpreted right. Just "posts" should do, I think.
2008-09-14 13:50:34 -04:00
bc7381c4f9
listdirectives: Enable use of the directives underlay.
2008-09-11 18:46:32 -04:00
d76c8aa013
change git hook description
...
It doesn't have to be a post-update hook.
2008-09-11 15:53:25 -04:00
d9d783c4bc
goodstuff update
...
* goodstuff: Remove otl plugin from the bundle since it needs a significant
external dependency and is not commonly used. If you use otl, make sure
you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.
2008-09-09 16:11:16 -04:00
5d53fab853
img: Support sizes like 200x. Closes : #475149
2008-09-09 15:20:06 -04:00
6f46cc3b31
progress: New plugin to generate progress bars (willu)
2008-09-09 14:44:58 -04:00
2b53de66a0
ddate: Stop clobbering timeformat when not enabled.
2008-09-08 19:40:23 -04:00
f888ceafee
minor optimisation
2008-09-08 12:28:56 -04:00
0f67e7d969
editpage: New core plugin factoring out page editing to allow disabling it if desired.
2008-09-05 13:57:25 -04:00
7d3047b6d8
UNIVERSAL not used in this plugin
2008-09-05 13:44:52 -04:00
3c022e2cd7
use yesno
2008-09-02 18:20:17 -04:00
657bf7846d
table: Support header=column to make the table header be the first column of the data. (AlexandreDupas)
2008-09-02 14:57:20 -04:00
b7458c48d8
filecheck: Fall back to testing for binary or plain text files if no mime type is detected.
2008-09-01 15:00:15 -04:00
000c87f510
don't fail if %config is not set
2008-09-01 11:26:03 -04:00
2a29641097
Set cookies HttpOnly.
2008-08-28 16:09:58 -04:00
2b602e2e9f
filecheck: Fixed two bits broken in move from attachment.
2008-08-28 13:04:45 -04:00
b9efeba972
humansize moved to filecheck
...
It's not used there, but it makes sense to keep it there as it's the
inverse of parsesize.
2008-08-27 15:31:48 -04:00
b1d8437f8a
if extrafooter is already set, append to it
...
to interoperate with future plugins using it
2008-08-26 18:04:45 -04:00
a326ffed1f
autoindex: Avoid re-adding previously deleted (or renamed) pages.
2008-08-26 14:39:47 -04:00
042a057778
color: New plugin from ptecza.
2008-08-26 13:22:34 -04:00
6364949dfc
remove dead code
2008-08-26 12:28:59 -04:00
d06096ad0d
edittemplate: Don't wipe out edits on preview.
2008-08-25 20:51:10 -04:00
78e34fbdc2
filecheck: New plugin factoring out the PageSpec additions that were originally part of the attachment plugin.
2008-08-25 19:52:34 -04:00
8eb65c1ef1
update
2008-08-25 14:21:04 -04:00
4956623ee6
rename plugin
...
I don't want to be stuck renameing it later if preprocessor directives are
turned into postprocessor directives. Also, "directives" is shorter and
clearer than "preprocessors".
2008-08-25 13:38:44 -04:00
c62cbc31c2
indentation, style, and fixed name of preprocessor_description_dir
2008-08-25 13:36:06 -04:00
029edd9b45
plugin by willu
2008-08-25 13:28:25 -04:00
69e35d3c51
willu's teximg changes
...
* teximg: The prefix is configurable, and has changed to not include the
nonstandard mhchem by default. (willu)
* teximg: dvipng is used if available to render images. Its output is
antialiased and better than dvips. If not available, the old dvips+convert
chain will be used. (willu)
* Drop suggests on texlive-science, add suggests on dvipng.
2008-08-24 15:21:51 -04:00
9b10f5eab2
map: The fix for #449285 was buggy and broke display of parents in certian circumstances.
...
The use of $dummy was not sufficient, because it only stuck around for the
first element after a dummy parent, and was then lost. Instead, use a
$addparent that contains the actual dummy parent, so it can be compared
with the new item to see if we're still under that parent or have moved to
another one.
2008-08-23 13:10:49 -04:00
d84e43faac
fix my broken fix
2008-08-23 12:48:01 -04:00
d23943ebea
fix off-by-one, and fix link
...
The link was broken if the inserted dir was not under the destpage
2008-08-23 12:37:19 -04:00
15a0a151bf
fix links to inserted parent pages
...
The parent page names had "/" prepended, which caused broken links.
2008-08-23 12:28:18 -04:00
3069c7b36a
fix directory uniquification code
2008-08-22 21:52:03 -04:00
4643233c18
monotone updates
...
- Try to configure a wrapper
- Fix (?) ikiwiki-makerepo repo name mangling
- Add big warning about passphrases
- Doc updates
2008-08-22 00:22:02 -04:00
6cf96b5819
Fix bug in wikiname sanitisation in the setup automator.
2008-08-21 23:40:11 -04:00
00a4271290
improve handling of typoed or problem rcs
2008-08-21 23:07:29 -04:00
5d83e7359d
graphviz: Fix breakage of the name of the preprocessor directive.
2008-08-14 14:44:30 -04:00
6432d15cb4
fix a common case typo
2008-08-12 15:48:44 -04:00
d50376a05d
default to looking at page source file if no file is specified
...
This will allow these pagespecs to be used a bit more generally.
2008-08-12 15:34:47 -04:00
88e389ef1e
error if ping fails, rather than printing debug
2008-08-11 13:03:30 -04:00
3de7d39ec6
use srcfile/destfile
...
avoids a commit message of "renamed foo to foo"
2008-08-07 16:20:35 -04:00
11550f9593
avoid link fixup if page name stayed the same
2008-08-07 16:17:50 -04:00
46b9a83b61
page file type rename patch from willu
2008-08-07 16:09:41 -04:00
581381e335
inline: Ignore parent dirs when sorting pages by title.
2008-08-07 15:47:59 -04:00
adc2eb3d8c
Options set in the setup file are now immediatly loaded by ikiwiki -setup. This allows later switches to override them. Previously, setup file options overrode most command line options.
2008-08-06 01:58:04 -04:00
6fb6d51524
fix inverted test
2008-08-06 01:15:48 -04:00
86660e9c82
external: Fix support for hooks called in an array context.
2008-08-06 01:05:44 -04:00
9cb415f4a4
autoindex: Ignore internal pages, and take underlay directories into account. Also, avoid making index pages for directories that contain no files.
2008-08-06 00:04:05 -04:00
bf8558f346
save to real setup file, and rebuild/refresh
2008-08-05 20:11:56 -04:00
83888b75f1
save the full path to the setup file
2008-08-05 20:11:23 -04:00
46b3f54ab6
typo
2008-08-05 19:58:33 -04:00
4b4bce5006
Revert "typo"
...
This reverts commit c8d3626c51
2008-08-05 19:39:30 -04:00
4b994ffed1
avoid forcing syslog setting
...
This avoids forcing the setting to 0 if it was not set at all.
2008-08-05 19:36:53 -04:00
c8d3626c51
typo
2008-08-05 19:30:09 -04:00
6e2f9e97f3
Add simple patch to silence a warning when using monotone
2008-08-04 15:00:47 -04:00
e48f8ff8a9
hm
2008-08-04 14:53:11 -04:00
0c3291d4f3
plugin enable/disable working and bugfixes
2008-08-03 22:16:38 -04:00
a4ce6550eb
loosen qw regexp
2008-08-03 22:16:38 -04:00
6d15912e8f
work around strange problem with banned_users
...
Its value was being ignored. Some kind of formbuilder bug?
Anyway, prefixing all keys with a section seems like a good idea
generally, in case there's ever overlap.
2008-08-03 21:06:13 -04:00
4b79a43db6
checkboxes back
2008-08-03 20:51:46 -04:00
2a712c8817
use radio, not checkbox, for booleans
...
Had to do this due to one of CGI::FormBuilder's more annoying quirks -- it
loses the value of a checkbox field with only one option, always treating
it as checked.
2008-08-03 20:20:25 -04:00
3905645342
add plugin safe/rebuild info (part 3 of 3)
2008-08-03 19:36:11 -04:00
219afc3f9c
support rebuild tristate
...
also some fixes to change minimisation logic
2008-08-03 18:23:17 -04:00
018321f2c8
fix misc breakage from plugin safe/rebuild data addition
2008-08-03 18:17:13 -04:00
39195de96e
add plugin safe/rebuild info (part 2 of 3)
...
(brain.. melting..)
2008-08-03 17:20:21 -04:00
1230e914b1
anonok is safe
2008-08-03 17:03:20 -04:00
1a37848346
move plugin toggles to before config setting again
2008-08-03 16:58:16 -04:00
b7d6a49be4
ui improvements
2008-08-03 16:46:38 -04:00
aacec52a07
show force disabled plugins in advanced mode
2008-08-03 16:43:42 -04:00
903213e63f
add plugin safe/rebuild info (part 1 of 2)
...
too many plugins.. brain exploding..
2008-08-03 16:40:12 -04:00
9e0cbb73fe
plugin safe/rebuild controls
2008-08-03 16:23:41 -04:00
4405cebd0a
add advanced and basic modes
2008-08-03 14:57:24 -04:00
5c0f539950
avoid adding extra disabled fields for arrays
2008-08-03 14:41:53 -04:00
d00f3edf13
properly support all types of data in arrays
2008-08-03 14:39:34 -04:00
0f06504422
remove description_html, add link
2008-08-03 14:36:17 -04:00
5ef45ca7e1
support arrays
2008-08-03 00:27:27 -04:00
d8b49840dd
update
2008-08-02 23:59:40 -04:00
7baa6320e0
rebuild detection
2008-08-02 23:32:40 -04:00
8c02d670d0
pull values from form to config
2008-08-02 23:14:59 -04:00
f6babf662b
fix syntax error with corrupt data
...
Just because it's supposed to be an integer or boolean doesn't mean the
vlaue really is..
2008-08-02 23:14:23 -04:00
94c59d3254
collect a hash of shown fields
...
Need to do this to know what fields to take from CGI.
(Can't trust that only safe ones are sent..)
2008-08-02 23:06:25 -04:00
c762b65ce4
show unsafe options (RO) by default
...
Small data leak, but only to admins, and I think it's worth it to see the
stuff that cannot be configured.
2008-08-02 22:50:09 -04:00
5dbd053da3
avoid syslog whining from broken plugins
2008-08-02 22:22:53 -04:00
6f65cb1cbe
avoid setting default value in websetup_force_plugins
...
This would make changes not be seen later.
2008-08-02 22:20:26 -04:00
15341aed01
don't install demo external plugins by default
2008-08-02 16:53:20 -04:00
4708aeceb3
websetup form display done
2008-08-02 16:41:37 -04:00
b0f4767448
basic form display done
2008-08-02 16:41:36 -04:00
102f29e500
add description_html
2008-08-02 16:41:36 -04:00
0b6dd9247b
refactor
2008-08-02 16:41:35 -04:00
d3cad5d2ca
relocate
2008-08-02 16:41:35 -04:00
Joey Hess
Simon McVittie
intrigeri
Peter Simons