Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / fileupload.mdwn

diff --git a/doc/todo/fileupload.mdwn b/doc/todo/fileupload.mdwn
index 3a3f27dc44dac9a5922afe198ce86d9bacf2b08b..8c9b18b19976a927ddd32a732cb0444508aaf036 100644 (file)
--- a/doc/todo/fileupload.mdwn
+++ b/doc/todo/fileupload.mdwn
@@ -1,3 +1,5 @@
+(I've written a [[proposal|todo/fileupload/soc-proposal]] for this feature --Ben).
+

 Support for uploading files is useful for many circumstances:
 
 * Uploading images.
 Support for uploading files is useful for many circumstances:
 
 * Uploading images.


@@ -20,6 +22,7 @@ the work is in securing it. Several classes of controls seem appropriate:
   browsers are probably too smart for their own good and may ignore the
   extension / mime info and process as the actual detected file type. It
   may be necessary to use `file` to determine a file's true type.
   browsers are probably too smart for their own good and may ignore the
   extension / mime info and process as the actual detected file type. It
   may be necessary to use `file` to determine a file's true type.

+* Optional ability to test a file using a virus scanner like clamav.

 * Limits to who can upload what type of files.
 * Limits to what files can be uploaded where.
 
 * Limits to who can upload what type of files.
 * Limits to what files can be uploaded where.
 


@@ -41,12 +44,20 @@ as a wikifs. Maybe.
 And if that's done, it can also be used to lock users from editing a pages
 or the whole wiki:
 
 And if that's done, it can also be used to lock users from editing a pages
 or the whole wiki:
 

-       ( user(spammer) and * ) or
-       ( user(annoying) and index) or
-       ( immutable_page )
+       !(( user(spammer) and * ) or
+        ( user(42.12.*) and * ) or
+        ( user(http://evilopenidserver/*) and * ) or
+        ( user(annoying) and index) or
+        ( immutable_page ))

 
 That would obsolete the current simple admin prefs for banned users and
 locked pages. Suddenly all the access controls live in one place.
 Wonderbar!
 
 
 That would obsolete the current simple admin prefs for banned users and
 locked pages. Suddenly all the access controls live in one place.
 Wonderbar!
 

-[[tag soc]]
+(Note that pagespec_match will now return an object that stringifies to a
+message indicating why the pagespec matched, or failed to match, so if a
+pagespec lock like the above prevents an edit or upload from happening,
+ikiwiki could display a reasonable message to the user, indicating what
+they've done wrong.)
+
+[[!tag soc done]]