Merge branch 'master' into stable

1 files changed, 27 insertions, 0 deletions

diff --git a/_test/conf/acl.auth.php b/_test/conf/acl.auth.php
new file mode 100644
index 000000000..8a1b01f23
--- /dev/null
+++ b/_test/conf/acl.auth.php
@@ -0,0 +1,27 @@
+# acl.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Editing this file by hand shouldn't be necessary. Use the ACL
+# Manager interface instead.
+#
+# If your auth backend allows special char like spaces in groups
+# or user names you need to urlencode them (only chars <128, leave
+# UTF-8 multibyte chars as is)
+#
+# none   0
+# read   1
+# edit   2
+# create 4
+# upload 8
+# delete 16
+
+*               @ALL        8
+
+# for testing wildcards:
+users:*            @ALL         1
+users:%USER%:*     %USER%       16
+groups:*           @ALL         1
+groups:%GROUP%:*   %GROUP%      16