*** empty log message ***

git-svn-id: svn://pmwiki.org/trunk/pmwiki@436 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 8 insertions, 8 deletions

diff --git a/wikilib.d/PmWiki.PasswordsAdmin b/wikilib.d/PmWiki.PasswordsAdmin
index f89a8f9d..d487680d 100644
--- a/wikilib.d/PmWiki.PasswordsAdmin
+++ b/wikilib.d/PmWiki.PasswordsAdmin
@@ -1,11 +1,11 @@
-version=pmwiki-2.0.beta3
+version=pmwiki-2.0.beta7
 newline=²
-text=PmWiki has built-in support for password-protecting various areas of the wiki site.  Passwords can be applied to individual pages, to [[WikiGroup]]s, or to the entire wiki site.  Note that the password protection mechanisms described here are only a small part of overall system (and wiki) security, see [[PmWiki.Security]] for more discussion of this.²²PmWiki supports several levels of access to wiki pages:²-> @@read@@ passwords allow viewing the contents of wiki pages²-> @@edit@@ passwords control editing and modification of wiki pages²-> @@attr@@ passwords control who is able to set passwords on pages (and potentially other future attributes)²-> if uploads are enabled, @@upload@@ passwords control uploading of files and attachments²²Finally, there is an @@admin@@ access for the entire wiki site that allows an administrator to override the passwords set for any individual page or group. All passwords are stored in an encrypted format so that other users on the system cannot simply browse the contents of files to determine the passwords.²²By default, PmWiki is configured with empty @@read@@ and @@edit@@ passwords for the whole site (allowing anyone to view or edit pages), the @@attr@@ password is locked for the Main and PmWiki groups, and the @@admin@@ password is locked entirely.  You can unlock the attr password for either of those groups by accessing that group's attributes page, and entering @@clear@@ in the appropriate field (you'll need to set the global admin password to do this, since it's also locked by default).  Global passwords for the wiki site are controlled by the [=$DefaultPasswords=] array in ''config.php''. To set an admin password to "@@mysecret@@" for a site, you can add the following line to ''config.php'':²²    $DefaultPasswords['admin'] = crypt('mysecret');²²Of course, anyone able to view ''config.php'' would be able to find out your secret password, so we'd like to encrypt it somehow.  Add @@?action=crypt@@ or @@&action=crypt@@ to the end of any PmWiki URL (or jump to ThisWiki:?action=crypt ) and you'll be presented with a form to give you the encrypted form of the password.  For example, when the ''crypt'' action is given the password "@@mysecret@@", PmWiki gives back a string like ²²    [=$1$hMMhCdfT$mZSCh.BJOidMRn4SOUUSi1=]²²(it may be different on your system).  This can then be put directly into ''config.php'' as:²    [=²    $DefaultPasswords['admin'] = '$1$hMMhCdfT$mZSCh.BJOidMRn4SOUUSi1';  =]²²''(Note: The crypt keyword and parenthesis have been removed, since the inserted text is already encrypted. The sample-config.php has the crypt keyword present, be sure to remove this when switching your passwords to pre-encrypted.)''²²Note that the encrypted password has to be enclosed in single-quotes.  Here, the password is still "@@mysecret@@", but somebody looking at ''config.php'' won't be able to see that just from looking at the encrypted form.  ''Crypt'' may give you different encryptions for the same password--this is normal (and makes it harder for someone else to determine the original password).²²Similarly, you can set @@[=$DefaultPasswords['read']=]@@, @@[=$DefaultPasswords['edit']=]@@, and @@[=$DefaultPasswords['attr']=]@@ to control default @@read@@, @@edit@@, and @@attr@@ passwords for the entire site.  The default passwords are used only for pages and groups which do not have passwords set.  Also, any of these values may be arrays of encrypted passwords.²²TODO: give example of encrypted password²²In PmWiki, page passwords override group passwords, group passwords override the default passwords, and the admin password always allows access.  This gives a great deal of flexibility in controlling access to wiki pages in PmWiki.  You can also use the special password "nopass" (defined by the $AllowPassword variable) to have a non-password protected page within a password-protected group, or a non-password protected group with a site-wide default password set.²²To use PmWiki itself to set passwords on individual wiki pages and [[WikiGroup]]s, see [[PmWiki.Passwords]].²²²%trail%<<|PmWiki.DocumentationIndex|>>²
-time=1101888395
-host=154.20.243.254
-agent=Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)
-rev=38
+text=PmWiki has built-in support for password-protecting various areas of the wiki site.  Passwords can be applied to individual pages, to [[WikiGroup]]s, or to the entire wiki site.  Note that the password protection mechanisms described here are only a small part of overall system (and wiki) security, see [[PmWiki.Security]] for more discussion of this.²²Authors can use PmWiki to add passwords to individual pages and WikiGroups as described in [[PmWiki.Passwords]].  However, [[WikiAdministrator]]s can also set passwords in [[local customization(s)]] files as described below.²²PmWiki supports several levels of access to wiki pages:²-> @@read@@ passwords allow viewing the contents of wiki pages²-> @@edit@@ passwords control editing and modification of wiki pages²-> @@attr@@ passwords control who is able to set passwords on pages (and potentially other future attributes)²-> if uploads are enabled, @@upload@@ passwords control uploading of files and attachments²²Finally, there is an @@admin@@ password that allows an administrator to override the passwords set for any individual page or group. ²²Pages have their passwords as "page attributes" that are accessed by using ?action=attr at the end of a URL.  Group passwords are held in a special page called "GroupAttributes" for each group.  Global site-wide passwords are controlled by the $DefaultPasswords array.  All passwords are stored in an encrypted format so that other users on the system cannot simply browse the contents of files to determine the passwords.²²By default, $DefaultPasswords is set with empty @@read@@, @@edit@@, and @@attr@@ passwords and locked @@admin@@ and @@upload@@ passwords.  In addition, as distributed, the Main.GroupAttributes and PmWiki.GroupAttributes have locked @@attr@@ passwords on them to prevent authors from setting passwords on pages in those groups.  (To change these passwords, use [[Main.GroupAttributes?action=attr]] or [[PmWiki.GroupAttributes?action=attr]].)²²To set the site-wide admin password to "@@mysecret@@", an administrator can place the following line in ''config.php'':²²    $DefaultPasswords['admin'] = crypt('mysecret');²²Of course, as written here anyone able to view ''config.php'' would immediately know the site's password, so some sites would like it to be encrypted in the ''config.php'' file as well.  Add @@?action=crypt@@ to the end of any PmWiki URL (or jump to [[{$Name}?action=crypt]]) and you'll be presented with a form to give you the encrypted form of the password.  For example, when the ''crypt'' action is given the password "@@mysecret@@", PmWiki gives back a string like ²²    [=$1$hMMhCdfT$mZSCh.BJOidMRn4SOUUSi1=]²²(it may be different on your system).  This string can then be put directly into ''config.php'' as:²    [=²    $DefaultPasswords['admin'] = '$1$hMMhCdfT$mZSCh.BJOidMRn4SOUUSi1';  ²    =]²²Note that in the encrypted form the ''crypt'' keyword and parentheses are removed, since the password is already encrypted.  Also, the encrypted password must be²in single quotes.  In this example the password is still "@@mysecret@@", but somebody looking at ''config.php'' won't be able to see that just from looking at the encrypted form.  ''Crypt'' may give you different encryptions for the same password--this is normal (and makes it harder for someone else to determine the original password).²²Similarly, you can set @@[=$DefaultPasswords['read']=]@@, @@[=$DefaultPasswords['edit']=]@@, and @@[=$DefaultPasswords['attr']=]@@ to control default @@read@@, @@edit@@, and @@attr@@ passwords for the entire site.  The default passwords are used only for pages and groups which do not have passwords set.  Also, each of the $DefaultPasswords values may be arrays of encrypted passwords.²²To remove a site password entirely, such as the default locked password for uploads, just set it to empty:²²    $DefaultPasswords['uploads'] = '';²²In PmWiki, page passwords override group passwords, group passwords override the default passwords, and the admin password always allows access.  This gives a great deal of flexibility in controlling access to wiki pages in PmWiki.  You can also use the special password "nopass" (defined by the $AllowPassword variable) to have a non-password protected page within a password-protected group, or a non-password protected group with a site-wide default password set.²²To use PmWiki itself to set passwords on individual wiki pages and [[WikiGroup]]s via ?action=attr, see [[PmWiki.Passwords]].²²%trail%<<|PmWiki.DocumentationIndex|>>
+time=1102709544
+host=24.1.28.47
+agent=Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0
+rev=43
 post= Save
-author=Steven Leite
+author=Pm
 name=PmWiki.PasswordsAdmin
-targets=PmWiki.WikiGroup,PmWiki.Security,PmWiki.PmWiki,PmWiki.ThisWiki,PmWiki.Passwords,PmWiki.PerGroupCustomizations,PmWiki.UploadsAdmin,PmWiki.DocumentationIndex
+targets=PmWiki.WikiGroup,PmWiki.Security,PmWiki.PmWiki,PmWiki.Passwords,PmWiki.WikiAdministrator,PmWiki.LocalCustomizations,PmWiki.WikiGroups,PmWiki.GroupAttributes,Main.GroupAttributes,PmWiki.PasswordsAdmin,PmWiki.PerGroupCustomizations,PmWiki.UploadsAdmin,PmWiki.DocumentationIndex