Commit Graph

1679 Commits (1c7c9e95f227a3ff7906c000ec15bb163edc463f)

Author SHA1 Message Date
joey 99292550fd * Add an orphans plugin for finding pages that nothing links to.
* Removed backlinks page, which it turns out nothing used.
2006-05-02 06:15:31 +00:00
joey f84b47d080 fix undef warning 2006-05-02 04:37:31 +00:00
joey fe6b271501 deep copy/untaint arrays in setup 2006-05-02 04:18:44 +00:00
joey e7f97eae60 * Smarter behavior when creating a page and a page of the same name (but
different location) already exists.
2006-05-02 02:57:45 +00:00
joey 54d5308cd8 * Added plugin system, currently only supporting for PreProcessorDirectives.
* Added a pagecount plugin, enabled by default.
* Support PreProcessorDirectives with no parameters, ie "[[pagecount ]]".
* Fixed/optimised backlinks code, to avoid rebuilding pages to update
  backlinks when the backlinks hadn't really changed.
* Moved inline page support, rss generation etc into the inline plugin,
  enabled by default.
* Added brokenlinks plugin, not enabled by default, but rather handy.
* Fix several broken links in the doc wiki.
2006-05-02 02:34:33 +00:00
joey 457d6bbbbf change calling convention for preprocessor functions 2006-05-01 23:18:09 +00:00
joey 819a31ed24 * Rename inlinepage to depends, so that it can be used to refer to more
dependency relationships than just inlining. This will require a rebuild
  on upgrade to this version.
* Move the rss link, put it in the blogpost form if there is one and at the
  top if not. This is both nicer because easier to find, and it cleans up
  the code which had used inlinepage as a flag for adding the link later.
* Allow the depends GlobList to be built up from multiple sources (such as
  plugins) during a page render.
* Which means that more than one blog is now supported to appear on a
  single page. (With some limitations.)
2006-05-01 22:27:37 +00:00
joey 188d7c1961 two notify bug fixes:
- run it after refreshing so that all the page info is current
- convert filenames into page names before checking against glob
2006-04-28 05:16:24 +00:00
joey 5cd32c2eee - fix typo
- avoid sending commit mails to the user who made the commit
2006-04-25 20:24:44 +00:00
joey bfa96ad282 prevent users from registering with name that is not a valid wikifile
avoids XSS attacks and is generally a good limitation
2006-04-25 05:53:22 +00:00
joey d7aecf6ddc implemented html sanitisation 2006-04-25 03:18:21 +00:00
joey 1f06b39788 fix a deadloop if from ended in a / 2006-04-25 01:15:20 +00:00
joey 1ba7023746 more 2006-04-25 00:45:10 +00:00
joey 1f66fb8a28 formatting 2006-04-25 00:29:06 +00:00
joey b7f64d884c subscription nearly done 2006-04-25 00:22:41 +00:00
joey 13e3bf8671 commit changes for email subscriptions 2006-04-24 23:09:26 +00:00
joey 170a6de6ab fix comment 2006-04-21 16:39:59 +00:00
joey 958468b088 fix broken example config file and detect this breakage 2006-04-20 13:34:11 +00:00
joey 3ff14ce12a fix --anonok 2006-04-14 18:10:18 +00:00
joey 7a5ae22e5a Convert postprocessordirectives into preprocessordirectives, so they are
expanded before markdown. Consequences:

 - No need to worry about markdown messing with parameters of
   preprocessordirectives. (If you had to escape stuff in one before, you'll
   need to undo that escaping now.)
 - No need for ugly </p> hacks before inlined subpages. Instead, subpages
   are wrapped in a <div>, and this prevents markdown from touching them.
   (This can also be used to add style to subpages.)
 - rss generation is less of a hack.
2006-04-04 20:57:46 +00:00
joey f50bd57bce proper binmode settings so that with -CSD, ikiwiki will support unicode
however, due to robustness, that's not enabled by default yet
2006-04-04 19:34:50 +00:00
joey 46302e698d Verified that the action parameter on cgi forms is needed for at least the
prefs form. Use $config{cgiurl}.
2006-04-04 18:43:26 +00:00
joey 5cdcec9f49 comment out action => $q->request_uri setting, which is reporedly
unnecessary and doesn't work with old CGI.pm's (it's an undocumented
variable)
2006-04-02 22:28:08 +00:00
joey c4e0e8c36c - add <base> to cgi output, this is especially useful for output containing
wikilinks since the urls should work now in more situations
- drop --limit from svn log run, since a) it needs a fairly new svn and 
  b) in some cases, it would limit it to too few entries to display the
  requested number of changes
- Use driver:DB_File and not driver:db_file for better compatability with
  old versions of CGI::Session.
- Note that HTML::Template 3.02.02 is needed.
2006-04-02 22:24:08 +00:00
joey 9922c37d73 improved logic 2006-03-30 00:17:28 +00:00
joey 5f1e794045 fixes 2006-03-29 22:36:23 +00:00
joey 0d9539d577 added --hyperestraier switch, which turns on search support
(ok, the way I run estseek.cgi is admittedly pretty nasty, but it works..)
2006-03-29 22:21:23 +00:00
joey efe91335c6 improve fix for symlink attacks to check subdirectories for symlinks too
before writing
2006-03-29 18:50:36 +00:00
joey 2a16e15122 fix for replacing from underlay 2006-03-29 18:35:04 +00:00
joey 975ae0944c Implemented --underlaydir, and moved files provided by underlay out of doc
so I don't need to maintain two copies anymore.

You might also want to remove the files provided in the basewiki underlay
from your wiki, if you have not created custom local versions of them, so
that these pages will be automatically updated in future ikiwiki upgrades.
2006-03-29 18:21:01 +00:00
joey 5591d621b9 css support 2006-03-29 07:24:03 +00:00
joey e41dd1e24e html validation fixes:
- escape & in urls (also clean up cgi url generation)
 - since markdown wraps inlined pages in <p></p>, close and re-open
   the paragraph tags when generating the embedded html
 - added XHTML 1.0 doctypes to templates
 - fixed <hr /> and <br /> in templates
 - add an alt attribute to inline images, based on the WikiLink to the
   image. Allows things like [[my_image|img.png]] to customise alt text.
2006-03-29 03:18:21 +00:00
joey 0a95ac2144 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 02:14:55 +00:00
joey b5656f595d Change the name of the session cookie. This will avoid problems with
multiple wikis on the same host.
2006-03-29 00:21:57 +00:00
joey d9f1b12149 support [[linktext|pagename]] links 2006-03-28 23:31:53 +00:00
joey d73574e19f There was a bug that [[inline archive="yes]] created an RSS link, but no feed.
Fixed in the easiest way by creating an RSS feed for archive pages (it will
include only a limited number of items, not everything).

Alternative fix would be to track separately which pages are archives and
which not, and only create feeds for non-archives.
2006-03-28 23:06:28 +00:00
joey bce9a327c3 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-28 22:56:56 +00:00
joey ffc0be87d7 add --refresh and make it with with --setup 2006-03-26 05:08:41 +00:00
joey da1f96550e don't keep the wiki locked while rendering recentchanges 2006-03-26 04:32:41 +00:00
joey 7b8a14b751 fix rss url in nested pages 2006-03-26 03:33:49 +00:00
joey bb8096264e don't escape "/" in title when making a blog entry, allow creating a subdir 2006-03-26 02:49:34 +00:00
joey 9092356173 added --getctime 2006-03-26 02:30:44 +00:00
joey 61c909e2f2 implemented upgradehooksh 2006-03-24 21:36:37 +00:00
joey efb605ded6 finish up the blog form 2006-03-24 05:33:23 +00:00
joey 49524c429e add blog post template 2006-03-24 05:03:16 +00:00
joey 693a7a6902 big speedup 2006-03-24 03:21:46 +00:00
joey e910e67424 fixes 2006-03-24 02:42:19 +00:00
joey b056a106b8 load index before refresh 2006-03-24 02:11:10 +00:00
joey 8926a3bfbe Removed the rss feeds for every page, which wasn't really entirely useful.
Let's only do them for blog pages.
2006-03-24 02:00:40 +00:00
joey 5951c1dc82 add archive pages and fix some bugs 2006-03-24 01:49:42 +00:00
joey 7b4600df3f hold onto your hats, full-fledged blogging has arrived in ikiwiki! 2006-03-24 01:16:32 +00:00
joey ad4760ad78 load index for all cgi scripts, fixes links on RecentChanges 2006-03-23 22:11:05 +00:00
joey 4f93b8e2b4 preserve ctimes across rebuilds 2006-03-23 21:54:30 +00:00
joey 72e8ace28d Add file cretion times to the index file.
(Note that it's not really the file creation time, just the first time
ikiwiki saw it.)
2006-03-23 21:52:12 +00:00
joey 4155fd3c96 fix for already relative urls 2006-03-23 21:21:31 +00:00
joey 801a6d61b9 improve description field for rss 2006-03-23 21:17:57 +00:00
joey ca366fc902 add support for generating per-page rss feeds 2006-03-23 21:00:51 +00:00
joey a223f4540f support arbitrary characters in page titles, via some ugly use of unicode
character numbers
2006-03-23 19:25:08 +00:00
joey f5a5df14b7 stupid MakeMaker.. 2006-03-23 19:23:48 +00:00
joey 0943c375d4 another sub, wow 2006-03-23 08:04:34 +00:00
joey 5513fb4654 lock wiki here too 2006-03-23 07:58:43 +00:00
joey e3b9e716d0 missing include 2006-03-23 07:55:25 +00:00
joey 384327bfd0 proper main sub and loadindex optimisation for cgis 2006-03-23 07:51:52 +00:00
joey bb0193aff3 benchmarking suggests that meoization doesn't help even when doing a
--rebuild, so remove it
2006-03-23 07:42:24 +00:00
joey b645dc5a41 Getopt::Long is a huge, heavy perl module. So why use it?
This {gross,amazing} hack makes all wrapped uses of ikiwiki forgo any
option parsing at all. Options come in preparses via an env var from the
wrapper. As a bonus, Wrapper.pm no longer needs to be updated when command
line options are added to the program. Load time is sped up by around 10%.

ikiwikiwrap --params is no longer supported by this change. You will need
to rebuild your wrappers to take advantage of it.
2006-03-23 07:37:16 +00:00
joey 6c8cf5dd57 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 06:51:15 +00:00
joey 2eb5893ce7 fix config restoration after wrapper gen 2006-03-23 04:07:58 +00:00
joey 8978c1d959 fix oops in %config handling 2006-03-23 04:02:19 +00:00
joey e4d9da55d9 At Branden's request, clean up the hardcoded ".ikiwiki" everywhere, and add
checkoptions() that can be used to set defaults for this and other options
based on existing options.

Also involved some cleanups to how gen_wrapper is used.
2006-03-23 04:01:02 +00:00
joey befdf00f8a fixes 2006-03-15 04:59:39 +00:00
joey 0a52e8fd82 config files now based on perl modules
add MakeMaker foo for module
2006-03-15 03:24:34 +00:00
Joey Hess a990afd2f7 avoid uninitialized value warning 2008-11-18 13:46:03 -05:00
Joey Hess e307eeda3d html escaping complication
Can't escape things to entities if the template then escapes the entities.
(aggregate doesn't have this problem.)
2008-11-18 02:48:24 -05:00
Joey Hess 15269fed64 improve escaping of wikilinks and preprocessor directives
The old method failed for '[' x 3.
2008-11-18 02:43:17 -05:00
Joey Hess 75f262f44d call decode_utf8 inside eval
holger reported that decode_utf8 was crashing with perl 5.8.8. Earlier, I
thought that passing 0 to the function avoided this with old perls, but
that was apparently not enough, it still crashes. So, put it inside the
eval, so we can at least recover from it crashing.
2008-11-17 15:56:15 -05:00
Joey Hess 181bdbe1a9 use HTML::Entities 2008-11-17 14:27:11 -05:00
Joey Hess e8a945845b use perl modules up front
The old code actually did the same thing, just obfuscated -- since the eval
use wasn't quoted, it used the modules on load. Thus, the error (not to
mentioned the return) was bypassed, and it just failed on load.

But that seems like the right thing to do, really, so just made it clearer
that's what happens.
2008-11-17 14:19:15 -05:00
Simon McVittie e7a840ed9a htmlbalance: new plugin that balances tags by parsing and re-serializing 2008-11-17 10:46:21 +00:00
Joey Hess 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
Joey Hess eef8b966b3 O_CREATE needs mode 2008-11-11 15:53:55 -05:00
Joey Hess 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
Joey Hess 6611f3a2d9 bzr: Fix dates for recentchanges. 2008-11-11 13:44:47 -05:00
Joey Hess 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
Joey Hess f8a09ba105 tag: Normalize tagbase so leading/trailing slashes in it don't break things. 2008-11-10 19:48:58 -05:00
Joey Hess 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
Joey Hess 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
Joey Hess db5ea4d4f0 meta: Plugin is now enabled by default since the basewiki uses it. 2008-11-06 16:08:11 -05:00
Joey Hess 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
Joey Hess 42b4abee1d use error for two messages 2008-11-05 01:38:36 -05:00
Joey Hess d71caffb7b preprocess text before htmlizing it 2008-11-02 12:21:15 -05:00
Joey Hess 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
Joey Hess ae0a9d50be set ctime in --render mode if not known
Avoids some uninitialised value warnings.
2008-10-30 14:50:33 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 5b7677faba fix display of error msg 2008-10-29 13:38:26 -04:00
Joey Hess 8530e827b0 git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit. 2008-10-27 14:45:54 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 4a7ac5c251 remember how to write C code
been a while!
2008-10-24 15:49:55 -04:00
Joey Hess 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
Joey Hess 761dee41b1 export CALLER_UID 2008-10-24 15:46:29 -04:00
Joey Hess 739e2ca0b4 can't lock wiki due to permissions (probably)
luckily, don't really need to here
2008-10-24 15:02:54 -04:00
Joey Hess 1a883b3c50 include temp file for attachment change too 2008-10-24 13:44:03 -04:00
Joey Hess 0196e1f9fc updates 2008-10-24 13:29:41 -04:00
Joey Hess fbcb8553df really fix calls to check_can* 2008-10-24 13:29:30 -04:00
Joey Hess 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
Joey Hess f349e4ef36 fix calls to check_*
These throw errors, do not have useful return codes.
2008-10-23 18:05:12 -04:00
Joey Hess ad9e443f22 check_canattach hooked up 2008-10-23 16:56:40 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess 327adadf04 disable warnings when redefining functions 2008-10-21 17:03:08 -04:00
Joey Hess ee1ccfa863 use relativedate as the css class for dates that should display relative 2008-10-20 19:22:22 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess db146d9f1e need to use localtime, fix width 2008-10-19 19:39:32 -04:00
Joey Hess 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
Joey Hess 2321906cd7 mark up date so relativedate will work 2008-10-19 15:17:00 -04:00
Joey Hess cb9a695443 fix url 2008-10-17 22:04:43 -04:00
Joey Hess 35c56622ea tweak recentchanges permalink code
Need to handle the case where url is not set.
2008-10-17 21:54:42 -04:00
Joey Hess fdb5da46b0 Patch for anchor-based change permalinks in recent changes feed
from JasonBlevins
2008-10-17 21:49:55 -04:00
Joey Hess 745dc1c62f add missing getsetup hook 2008-10-17 21:29:05 -04:00
Joey Hess 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
Joey Hess 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
Joey Hess 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
Joey Hess f36080ae02 aggregate: Avoid bug that caused immediate expiration of items with a date in the future. 2008-10-16 18:20:16 -04:00