Skip to content

Commit 204cfee

Browse files
SvenDowideitSvenDowideit
authored andcommitted
Item109: TWikiGuest -> WikiGuest
1 parent 80d49d1 commit 204cfee

File tree

61 files changed

+112
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+112
-112
lines changed

BlogPlugin/data/_BlogPlugin/BlogAbout.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ have to come back and check all the time if something has changed. To
1919
subscribe, please click
2020
%REDDOT{"WebNotify" text="here" style="margin:0;padding:0;font-size:100%;"}%
2121
and add your e-mail address or your <nop>%WIKITOOLNAME% username if you are a
22-
[[%MAINWEB%.TWikiUsers][registered user]].
22+
[[%MAINWEB%.%WIKIUSERSTOPIC%][registered user]].
2323

2424
---++ Contact
2525
%STARTINCLUDE%

DirectedGraphWebMapPlugin/data/TWiki/DirectedGraphWebMapPlugin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Extends the DirectedGraphPlugin and draws a map of a web, part of a web, or of t
99

1010
This is a sample of a web drawn by <nop>%TOPIC% - the "Main" web in a default installation of TWiki.
1111

12-
<map id="SampleMainWebMap" name="SampleMainWebMap"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/NobodyGroup" title="NobodyGroup" alt="" coords="633,7,714,34"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiAdminGroup" title="TWikiAdminGroup" alt="" coords="623,61,724,88"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroups" title="TWikiGroups" alt="" coords="1189,115,1266,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiUsers" title="TWikiUsers" alt="" coords="772,329,842,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/SteffenPoulsen" title="SteffenPoulsen" alt="" coords="705,383,787,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/ProjectContributor" title="ProjectContributor" alt="" coords="596,383,691,410"><area shape="rect" href="%SCRIPTURL%/view/%USERSWEB%/SitePreferences" title="SitePreferences" alt="" coords="626,115,721,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroupTemplate" title="TWikiGroupTemplate" alt="" coords="1238,168,1350,195"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuest" title="WikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/RegistrationAgent" title="RegistrationAgent" alt="" coords="922,383,1044,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UnknownUser" title="UnknownUser" alt="" coords="828,383,909,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserList" title="UserList" alt="" coords="1377,383,1433,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/PatternSkinUserViewTemplate" title="PatternSkinUserViewTemplate" alt="" coords="180,276,329,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserViewTemplate" title="UserViewTemplate" alt="" coords="299,329,401,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserForm" title="UserForm" alt="" coords="397,222,460,249"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuestLeftBar" title="WikiGuestLeftBar" alt="" coords="7,329,110,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByDateJoined" title="UserListByDateJoined" alt="" coords="1397,544,1511,571"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByLocation" title="UserListByLocation" alt="" coords="1401,490,1507,517"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByPhotograph" title="UserListByPhotograph" alt="" coords="1476,436,1593,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListHeader" title="UserListHeader" alt="" coords="1348,436,1435,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserHomepageHeader" title="UserHomepageHeader" alt="" coords="371,276,486,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WebAtom" title="WebAtom" alt="" coords="828,276,892,302">
12+
<map id="SampleMainWebMap" name="SampleMainWebMap"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/NobodyGroup" title="NobodyGroup" alt="" coords="633,7,714,34"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiAdminGroup" title="TWikiAdminGroup" alt="" coords="623,61,724,88"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroups" title="TWikiGroups" alt="" coords="1189,115,1266,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiUsers" title="WikiUsers" alt="" coords="772,329,842,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/SteffenPoulsen" title="SteffenPoulsen" alt="" coords="705,383,787,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/ProjectContributor" title="ProjectContributor" alt="" coords="596,383,691,410"><area shape="rect" href="%SCRIPTURL%/view/%USERSWEB%/SitePreferences" title="SitePreferences" alt="" coords="626,115,721,142"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/TWikiGroupTemplate" title="TWikiGroupTemplate" alt="" coords="1238,168,1350,195"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuest" title="WikiGuest" alt="" coords="511,383,583,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/RegistrationAgent" title="RegistrationAgent" alt="" coords="922,383,1044,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UnknownUser" title="UnknownUser" alt="" coords="828,383,909,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserList" title="UserList" alt="" coords="1377,383,1433,410"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/PatternSkinUserViewTemplate" title="PatternSkinUserViewTemplate" alt="" coords="180,276,329,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserViewTemplate" title="UserViewTemplate" alt="" coords="299,329,401,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserForm" title="UserForm" alt="" coords="397,222,460,249"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WikiGuestLeftBar" title="WikiGuestLeftBar" alt="" coords="7,329,110,356"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByDateJoined" title="UserListByDateJoined" alt="" coords="1397,544,1511,571"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByLocation" title="UserListByLocation" alt="" coords="1401,490,1507,517"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListByPhotograph" title="UserListByPhotograph" alt="" coords="1476,436,1593,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserListHeader" title="UserListHeader" alt="" coords="1348,436,1435,463"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/UserHomepageHeader" title="UserHomepageHeader" alt="" coords="371,276,486,302"><area shape="rect" href="%SCRIPTURL%/view/%MAINWEB%/WebAtom" title="WebAtom" alt="" coords="828,276,892,302">
1313
</map>
1414
<img usemap="#SampleMainWebMap" src="%ATTACHURLPATH%/SampleMainWebMap.png">
1515

FindElsewherePlugin/data/TWiki/FindElsewherePlugin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ __Single hits__
2626
| Found here | =<nop>WebHome= | WebHome | %SYSTEMWEB%.WebHome |
2727
| Found singular here | =<nop>WebHomes= | WebHomes | [[%SYSTEMWEB%.WebHome][WebHomes]] |
2828
| Found elsewhere | =<nop>WebSearch= | WebSearch | [[%SYSTEMWEB%.WebSearch][WebSearch]] |
29-
| Found elsewhere (LOOKELSEWHEREFORLOCAL enabled) | =<nop>%SYSTEMWEB%.TWikiUsers= | %SYSTEMWEB%.TWikiUsers | [[Main.TWikiUsers][TWikiUsers]] |
30-
| Found elsewhere (LOOKELSEWHEREFORLOCAL disabled) | =<nop>%SYSTEMWEB%.TWikiUsers= | %SYSTEMWEB%.TWikiUsers | [[TWiki.TWikiUsers][TWikiUsers]] (non-existing) |
29+
| Found elsewhere (LOOKELSEWHEREFORLOCAL enabled) | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[Main.WikiUsers][WikiUsers]] |
30+
| Found elsewhere (LOOKELSEWHEREFORLOCAL disabled) | =<nop>%SYSTEMWEB%.WikiUsers= | %SYSTEMWEB%.WikiUsers | [[TWiki.WikiUsers][WikiUsers]] (non-existing) |
3131
| Found elsewhere | =[<nop>[TWikiAdminGroup][twiki admins]]= | [[TWikiAdminGroup][twiki admins]] | [[Main.TWikiAdminGroup][twiki admins]] |
3232
| Don't touch direct links | =[<nop>[%MAINWEB%.TWikiAdminGroup][twiki admins]]= | [[%MAINWEB%.TWikiAdminGroup][twiki admins]] | [[Main.TWikiAdminGroup][twiki admins]] |
3333
| Found singular elsewhere | =<nop>WebSearches= | WebSearches | [[%SYSTEMWEB%.WebSearch][WebSearches]] |

HTTPDUserAdminContrib/data/TWiki/HTTPDUserAdminContrib.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ though the [[http://search.cpan.org/~lds/HTTPD-User-Manage-1.66/lib/HTTPD/UserAd
1212

1313
It has been developed and tested for the TWiki-4.2, though _may_ be useable for previous releases.
1414

15-
You receive maximal performance benefit by using the =SQL= mode, and ensuring ={Register}{AllowLoginName}= is off (so that the %MAINWEB%.TWikiUsers topic is not needed to convert login names to Wiki Names.
15+
You receive maximal performance benefit by using the =SQL= mode, and ensuring ={Register}{AllowLoginName}= is off (so that the %MAINWEB%.WikiUsers topic is not needed to convert login names to Wiki Names.
1616

1717
See the Extensions | HTTPDUserAdminContrib section of =configure= to set up the specific options.
1818

HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUser.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ use Error qw( :try );
3333
3434
Password manager that uses HTTPD::UserAdmin to manage users and passwords.
3535
36-
Subclass of [[TWikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
36+
Subclass of [[WikiUsersPasswordDotPm][ =TWiki::Users::Password= ]].
3737
See documentation of that class for descriptions of the methods of this class.
3838
3939
Duplicates functionality of
40-
[[TWikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
40+
[[WikiUsersHtPasswdUserDotPm][ =TWiki::Users::HtPasswdUser=]];
4141
and Adds the possiblilty of using DBM files, and databases to store the user information.
4242
4343
see http://search.cpan.org/~lds/HTTPD-User-Manage-1.66/lib/HTTPD/UserAdmin.pm

HTTPDUserAdminContrib/lib/TWiki/Users/HTTPDUserAdminUserMapping.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ sub getLoginName {
213213
214214
---++ ObjectMethod _userReallyExists ($login) -> boolean
215215
216-
test if the login is in the TWikiUsers topic, or in the password file
216+
test if the login is in the WikiUsers topic, or in the password file
217217
depending on the AllowLoginNames setting
218218
219219
=cut
@@ -434,7 +434,7 @@ sub findUserByWikiName {
434434
if( $this->isGroup( $wn )) {
435435
push( @users, $wn);
436436
} elsif( $TWiki::cfg{Register}{AllowLoginName} ) {
437-
# Add additional mappings defined in TWikiUsers
437+
# Add additional mappings defined in WikiUsers
438438

439439
my @usernames = $this->{passwords}->listMatchingUsers($TWiki::cfg{HTTPDUserAdminContrib}{WikiNameField}, $wn);
440440
push( @users, @usernames );
@@ -515,7 +515,7 @@ sub passwordError {
515515

516516

517517
#######################################################################
518-
# don't create or use the MAIN.TWikiUsers topic
518+
# don't create or use the MAIN.WikiUsers topic
519519
# this is a copy of the functionality in TopicUserMapping, with the TWikiUser topic part removed
520520
#TODO: shame that its the UI::Registration code that creates the User topic - tahts close to pointless too
521521

HistoryPlugin/data/TWiki/HistoryPlugin.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ __Note:__ You do not need to install anything on the browser to use this plugin.
6565
* Test if the installation was successful:
6666
* Here should appear the history of this document inline:
6767
%HISTORY{" r1.$rev - $date - $wikiusername%BR%"}%
68-
* Show the history of Main.TWikiUsers :%BR%
69-
%SCRIPTURL{oops}%/Main/TWikiUsers?template=oopshistory
68+
* Show the history of Main.WikiUsers :%BR%
69+
%SCRIPTURL{oops}%/Main/WikiUsers?template=oopshistory
7070

7171
---++ Plugin Info
7272
<!--

LdapContrib/lib/TWiki/Users/LdapUserMapping.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ sub getListOfGroups {
130130

131131
=pod
132132
133-
---++++ groupMembers($group) -> @listOfTWikiUsers
133+
---++++ groupMembers($group) -> @listOfWikiUsers
134134
135135
Returns a list of all members of a given group. Members are
136136
TWiki::User objects.

MailToTWikiAddOn/bin/mailtotwiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ sub lookup_mailaddr
245245

246246
# Fetch the %MAINWEB%.TWikiUser topic
247247
my $mainweb = TWiki::Func::getMainWebname();
248-
my $topic1 = TWiki::Func::readTopicText($mainweb, 'TWikiUsers');
248+
my $topic1 = TWiki::Func::readTopicText($mainweb, 'WikiUsers');
249249

250250
# For each likely-looking user, open the topic, get the email address.
251251
while ($topic1 =~ /^\s+\*\s+(\w+)\s+-\s+\S+\s+-\s+/mg) {

NatSkin/data/TWiki/NatSearch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ exclude this term from the hit set.
3838

3939
---++ Examples
4040
| *Search* | *Description* |
41-
| <nop>TWikiUsers | if the current web is the %MAINWEB% go to the <nop>TWikiUsers |
41+
| <nop>WikiUsers | if the current web is the %MAINWEB% go to the <nop>WikiUsers |
4242
| | if the current web is the %SYSTEMWEB% go to the <nop>UsersGuide |
43-
| g:twikiusers | list all topics in all webs whose name match "twikiusers" |
43+
| g:WikiUsers | list all topics in all webs whose name match "WikiUsers" |
4444
| g:copyright -webpref | list all topics that contain the word "copyright" but not "webpref" |
4545
| g:"Good morning" -natskin | list all topics that contain the term "Good morning" but not "natskin" |
4646
| e:Sandbox.TestTopic411 | edit <nop>Sandbox.TestTopic411 |

0 commit comments

Comments
 (0)