Skip to content

Commit

Permalink
Item175: change MAINWEB to USERSWEB
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@1015 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
SvenDowideit authored and SvenDowideit committed Nov 27, 2008
1 parent 4d962b6 commit b8bc8ca
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions TopicUserMappingContrib/data/System/BulkRegistration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Below are the details.

---++ Settings
* Define where to pick up the table of users to register
* Set REGISTERTOPIC = %MAINWEB%.UnprocessedRegistrations
* Set REGISTERTOPIC = %USERSWEB%.UnprocessedRegistrations
* Use this to define where to log the bulk registration process. It needs
to be a topic name in this web.
* Set LOGTOPIC = %REGISTERTOPIC%Log
Expand Down Expand Up @@ -102,4 +102,4 @@ Make sure that the extra fields also appear on the %SYSTEMWEB%.UserForm.
%INCLUDE{"%LOGTOPIC%" warn="off"}%


__Related Topics:__ AdminToolsCategory
__Related Topics:__ AdminToolsCategory
6 changes: 3 additions & 3 deletions TopicUserMappingContrib/data/System/BulkResetPassword.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Users whose passwords are reset with this will be sent an e-mail at the address
%TABLE{databg="transparent" tableborder="0" tablerules="none"}%
%SEARCH{
"%META:FORM.*[U]serForm"
web="%MAINWEB%"
web="%USERSWEB%"
type="regex"
header="|*WikiName* |*User page created* |*User page changed* | *Reset* |"
format="| $web.$topic |$createdate |$date | <input %NOTMODIFYABLE% type='checkbox' name='LoginName' value='$topic'> |"
Expand Down Expand Up @@ -52,5 +52,5 @@ Welcome! The site is ready for your use. Please use the login name and password
%BR%
__Related Topics:__ AdminToolsCategory

* Set ALLOWTOPICVIEW = %MAINWEB%.AdminGroup
* Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup
* Set ALLOWTOPICVIEW = %USERSWEB%.AdminGroup
* Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup
2 changes: 1 addition & 1 deletion TopicUserMappingContrib/data/System/ChangeEmailAddress.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Registered e-mail addresses for currently logged in user (=%USERINFO{format="$wi

<div class="twikiHelp">
* %ICON{info}% %MAKETEXT{"If you have any questions, please contact [_1]" args="%WIKIWEBMASTER%"}%
* %ICON{info}% %MAKETEXT{"[_1] has a list of other TWiki users" args="%MAINWEB%.%WIKIUSERSTOPIC%"}%
* %ICON{info}% %MAKETEXT{"[_1] has a list of other TWiki users" args="%USERSWEB%.%WIKIUSERSTOPIC%"}%
</div>

%STOPINCLUDE%
Expand Down
2 changes: 1 addition & 1 deletion TopicUserMappingContrib/data/System/ChangePassword.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ __%MAKETEXT{"Forgotten your password?"}%__ %MAKETEXT{"Use [_1] instead." args="R

<div class="twikiHelp">
* %ICON{info}% %MAKETEXT{"If you have any questions, please contact [_1]" args="%WIKIWEBMASTER%"}%
* %ICON{info}% %MAKETEXT{"[_1] has a list of other Foswiki users" args="%MAINWEB%.%WIKIUSERSTOPIC%"}%
* %ICON{info}% %MAKETEXT{"[_1] has a list of other Foswiki users" args="%USERSWEB%.%WIKIUSERSTOPIC%"}%
</div>

%STOPINCLUDE%
Expand Down
2 changes: 1 addition & 1 deletion TopicUserMappingContrib/data/System/LoginName.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ You cannot alter your !LoginName: you have to get the administrator to do this f

---++ How to Find Yours

Look in %MAINWEB%.WikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
Look in %USERSWEB%.WikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.

e.g.

Expand Down
14 changes: 7 additions & 7 deletions TopicUserMappingContrib/data/System/ManagingUsers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ _Note that the below features are only relevant when you use an internal passwor
---++ Changing User Account Names

To change the user's WikiName:
* Rename the user's TWiki homepage in the %MAINWEB% web, such as
* Rename the user's TWiki homepage in the %USERSWEB% web, such as
from =JaneSmith= to =JaneMiller=.
* Fix backlinks in the %MAINWEB% web only
* Fix backlinks in the %USERSWEB% web only
* Make sure the group topics are updated (if any.)
* Edit the [[%MAINWEB%.WikiUsers]] topic and move the user's entry so
* Edit the [[%USERSWEB%.WikiUsers]] topic and move the user's entry so
that the list is in proper alphabetical order.
* Recreate the old topic with a pointer to the new topic, so that links
in other webs work properly. Example content:%BR%
Expand All @@ -56,7 +56,7 @@ To change the user's WikiName:
If external authentication is used and you want to change the login name:
* The login name needs to be changed in the authentication server (e.g.
Active Directory)
* In TWiki's [[%MAINWEB%.WikiUsers]] topic, fix the mapping from
* In TWiki's [[%USERSWEB%.WikiUsers]] topic, fix the mapping from
login name to WikiName:%BR%
=&nbsp; * !JaneSmith - jsmith - 13 Sep 2006= %BR%
to: %BR%
Expand All @@ -71,14 +71,14 @@ To remove a user account (<nop>FredQuimby, who logs in as "fred"):
* *Warning:* Do *not* use the Apache =htpasswd= program with
=.htpasswd= files generated by TWiki! =htpasswd= wipes out email
addresses that TWiki plants in the info fields of this file.
2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.WikiUsers
2 Remove the =FredQuimby - fred= line from the <nop>%USERSWEB%.WikiUsers
topic
3 Remove =FredQuimby= from all groups and from all the
=ALLOWWEB/ALLOWTOPIC...= declarations, if any.%BR% __Note:__ If you
fail to do this you risk creating a security hole, as the next user to
register with the wikiname Fred<nop>Quimby will inherit the old
Fred<nop>Quimby's permissions.
4 _[optional]_ Delete their user topic %MAINWEB%.<nop>FredQuimby
4 _[optional]_ Delete their user topic %USERSWEB%.<nop>FredQuimby
(including attachments, if any.)

__Note:__ Consider leaving the user topic file in place so their past signatures and revision author entries don't end up looking like AnUncreatedTopic.
Expand Down Expand Up @@ -127,7 +127,7 @@ Content-Transfer-Encoding: 8bit
</verbatim>
* __note the use of %<nop>WIKINAME%, %<nop>FIRSTLASTNAME%, %<nop>EMAILADDRESS% passed in from the INCLUDE so that the topic below is similar to the original template__

and then create a topic %NOP%%MAINWEB%.RegisterNotifyEmail:
and then create a topic %NOP%%USERSWEB%.RegisterNotifyEmail:
<verbatim>
Welcome to %WIKITOOLNAME%.

Expand Down
4 changes: 2 additions & 2 deletions TopicUserMappingContrib/data/System/NewUserTemplate.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Uncomment [[%SYSTEMWEB%.PreferenceSettings][preference settings]] to activate th

* [[%SYSTEMWEB%.ChangePassword][ChangePassword]] for changing your password
* [[%SYSTEMWEB%.ChangeEmailAddress][ChangeEmailAddress]] for changing your email address
* [[%MAINWEB%.%WIKIUSERSTOPIC%][%WIKIUSERSTOPIC%]] has a list of other TWiki users
* [[%USERSWEB%.%WIKIUSERSTOPIC%][%WIKIUSERSTOPIC%]] has a list of other TWiki users
* [[%SYSTEMWEB%.UserDocumentationCategory][UserDocumentationCategory]] is a list of TWiki user documentation
* [[%SYSTEMWEB%.UserToolsCategory][UserToolsCategory]] lists all TWiki user tools

Expand Down Expand Up @@ -82,7 +82,7 @@ Text for multilingual wiki community, copy from here to %<nop>ENDSECTION{type="t

* %MAKETEXT{"[_1] for changing your password" args="[[%SYSTEMWEB%.ChangePassword][ChangePassword]]"}%
* %MAKETEXT{"[_1] for changing your email address" args="[[%SYSTEMWEB%.ChangeEmailAddress][ChangeEmailAddress]]"}%
* %MAKETEXT{"[_1] has a list of other TWiki users" args="[[%MAINWEB%.%WIKIUSERSTOPIC%][%WIKIUSERSTOPIC%]]"}%
* %MAKETEXT{"[_1] has a list of other TWiki users" args="[[%USERSWEB%.%WIKIUSERSTOPIC%][%WIKIUSERSTOPIC%]]"}%
* %MAKETEXT{"[_1] is a list of TWiki user documentation" args="[[%SYSTEMWEB%.UserDocumentationCategory][UserDocumentationCategory]]"}%
* %MAKETEXT{"[_1] lists all TWiki user tools" args="[[%SYSTEMWEB%.UserToolsCategory][UserToolsCategory]]"}%

Expand Down
4 changes: 2 additions & 2 deletions TopicUserMappingContrib/data/System/ResetPassword.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ __%MAKETEXT{"Remember your password?"}%__ %MAKETEXT{"Use [_1] instead." args="Ch



<form name="resetpasswd" action="%SCRIPTURLPATH{"resetpasswd"}%/%MAINWEB%/%HOMETOPIC%" method="post">
<form name="resetpasswd" action="%SCRIPTURLPATH{"resetpasswd"}%/%USERSWEB%/%HOMETOPIC%" method="post">
<div class="twikiFormSteps">
<div class="twikiFormStep">

Expand Down Expand Up @@ -35,7 +35,7 @@ __%MAKETEXT{"Remember your password?"}%__ %MAKETEXT{"Use [_1] instead." args="Ch
</form>

<div class="twikiHelp">
* %ICON{info}% %MAKETEXT{"[_1] has a list of other TWiki users" args="%MAINWEB%.%WIKIUSERSTOPIC%"}%
* %ICON{info}% %MAKETEXT{"[_1] has a list of other TWiki users" args="%USERSWEB%.%WIKIUSERSTOPIC%"}%
* %ICON{info}% %MAKETEXT{"If you have any questions, please contact [_1]" args="%WIKIWEBMASTER%"}%
</div>
%STOPINCLUDE%
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ One line description, required for extensions repository catalog.
The _User Mapping Manager_ interface provides services for mapping between a 'user identity' as used when talking to an external authentication provider,
an internal canonical user ID, and the displayed name used to identify the user in topics.
This is the default <nop>TopicUserMapping in which user information is stored in topics - one per user, and then any mapping needed is done using the
<nop>WikiUsers topic in the %MAINWEB%.
<nop>WikiUsers topic in the %USERSWEB%.

See [[http://twiki.org/cgi-bin/view/Codev/SimplifiedUserMappingCodeInterface][SimplifiedUserMappingCodeInterface]] for a more detailed discussion
of the concepts.
Expand Down
12 changes: 6 additions & 6 deletions TopicUserMappingContrib/data/System/UserForm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
__Note:__ This is a maintenance topic, used by the Wiki administrator.

This form defines the form of the home pages of registered TWiki users listed
in %MAINWEB%.%WIKIUSERSTOPIC%. *Do not edit this topic* - if you want to customise the
in %USERSWEB%.%WIKIUSERSTOPIC%. *Do not edit this topic* - if you want to customise the
user form, then:
1 Take a copy of this topic and save it to %MAINWEB%.<nop>UserForm
1 Customise %MAINWEB%.<nop>UserForm
1 Take a copy of NewUserTemplate and save it to %MAINWEB%.<nop>NewUserTemplate
1 Modify %MAINWEB%.<nop>NewUserTemplate and change the form to select your new user form.
1 Take a copy of this topic and save it to %USERSWEB%.<nop>UserForm
1 Customise %USERSWEB%.<nop>UserForm
1 Take a copy of NewUserTemplate and save it to %USERSWEB%.<nop>NewUserTemplate
1 Modify %USERSWEB%.<nop>NewUserTemplate and change the form to select your new user form.

|*Name* |*Type* |*Size* |*Values* |*Tooltip message* |*Attributes* |
| <nop>FirstName | text | 40 | | | |
Expand All @@ -30,5 +30,5 @@ user form, then:

__%X% Note:__ Please keep the %SYSTEMWEB%.UserRegistration form and this form definition in sync. When you update this form you need to edit/save the %SYSTEMWEB%.NewUserTemplate topic. This ensures that the fields are in the right order.

__Related topics:__ %MAINWEB%.%WIKIUSERSTOPIC%, %MAINWEB%.UserViewTemplate, %SYSTEMWEB%.NewUserTemplate, %MAINWEB%.UserHomepageHeader, %SYSTEMWEB%.DataForms, %SYSTEMWEB%.UserRegistration
__Related topics:__ %USERSWEB%.%WIKIUSERSTOPIC%, %USERSWEB%.UserViewTemplate, %SYSTEMWEB%.NewUserTemplate, %USERSWEB%.UserHomepageHeader, %SYSTEMWEB%.DataForms, %SYSTEMWEB%.UserRegistration

0 comments on commit b8bc8ca

Please sign in to comment.