Item109: TWikiGuest -> WikiGuest

git-svn-id: http://svn.foswiki.org/trunk@666 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

HistoryPlugin/data/TWiki/HistoryPlugin.txt

@@ -65,8 +65,8 @@ __Note:__ You do not need to install anything on the browser to use this plugin.
    * Test if the installation was successful:
       * Here should appear the history of this document inline: 
         %HISTORY{"      r1.$rev - $date - $wikiusername%BR%"}%
-      * Show the history of Main.TWikiUsers :%BR%
-        %SCRIPTURL{oops}%/Main/TWikiUsers?template=oopshistory
+      * Show the history of Main.WikiUsers :%BR%
+        %SCRIPTURL{oops}%/Main/WikiUsers?template=oopshistory
 
 ---++ Plugin Info
 <!--

PatternSkin/data/TWiki/WebLeftBar.txt

@@ -2,7 +2,7 @@
 %INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
 
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
-   * %IF{"istopic '%USERSWEB%.TWikiUsers'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.TWikiUsers][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
+   * %IF{"istopic '%USERSWEB%.%WIKIUSERSTOPIC%'" else=" $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt" then="[[$percntUSERSWEB$percnt.$percntWIKIUSERSTOPIC$percnt][ $percntICON{\"person\"}$percnt $percntMAKETEXT{\"Users\"}$percnt]]"}%
    * [[%USERSWEB%.TWikiGroups][ %ICON{"group"}% %MAKETEXT{"Groups"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]
    * [[%INCLUDINGWEB%.WebSearch][ %ICON{"searchtopic"}% %MAKETEXT{"Search"}%]]

TopicUserMappingContrib/data/Main/UserListHeader.txt

@@ -1,2 +1,2 @@
 %META:TOPICINFO{author="ProjectContributor" date="1127307283" format="1.1" version="$Rev$"}%
-__Related topics:__ %SEARCH{"^(TWikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%
+__Related topics:__ %SEARCH{"^(WikiUsers|TWikiGroups|UserList$|UserListBy)" type="regex" web="%MAINWEB%" scope="topic" separator=", " nonoise="on" format="[[$web.$topic][$topic]]" excludetopic="%INCLUDINGTOPIC%"}%

TopicUserMappingContrib/data/TWiki/LoginName.txt

@@ -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%.TWikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
+Look in %MAINWEB%.WikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
 
 e.g.
 

TopicUserMappingContrib/data/TWiki/ManagingUsers.txt

@@ -47,7 +47,7 @@ To change the user's WikiName:
      from =JaneSmith= to =JaneMiller=.
       * Fix backlinks in the %MAINWEB% web only
       * Make sure the group topics are updated (if any.)
-   * Edit the [[%MAINWEB%.TWikiUsers]] topic and move the user's entry so
+   * Edit the [[%MAINWEB%.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%
@@ -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%.TWikiUsers]] topic, fix the mapping from
+   * In TWiki's [[%MAINWEB%.WikiUsers]] topic, fix the mapping from
      login name to WikiName:%BR%
      =   * !JaneSmith - jsmith - 13 Sep 2006= %BR%
      to: %BR%
@@ -71,7 +71,7 @@ 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%.TWikiUsers
+   2 Remove the =FredQuimby - fred= line from the <nop>%MAINWEB%.WikiUsers
      topic
    3 Remove =FredQuimby= from all groups and from all the
       =ALLOWWEB/ALLOWTOPIC...= declarations, if any.%BR% __Note:__ If you
@@ -107,7 +107,7 @@ then add =myskin= to the beginning of the =SKIN= setting in %USERSWEB%.SitePrefe
 
 From this point on, your myskin templates will be used for the registration emails.
 
-To make it possible for TWikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
+To make it possible for WikiUsers to modify the email contents, you could use a parameterized =%<nop>INCLUDE%=
 statement in your customized version. eg:
 
 <verbatim>

TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt

@@ -11,7 +11,7 @@ Users can customize these variables by assigning them values. Example:
 
 *The following variables are classified as user settings:*
 
-%SEARCH{"TWikiUserSetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
+%SEARCH{"WikiUsersetting" type="regex" topic="Var*" format="   * $topic" nonoise="on"}%
 
 *See also:*
    * TWikiVariables - an alphabetical list of all variables

TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt

@@ -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 TWiki canonical user ID, and the displayed name used to identify the user in TWiki. 
 This is the default <nop>TopicUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the
-<nop>TWikiUsers topic in the %MAINWEB%.
+<nop>WikiUsers topic in the %MAINWEB%.
 
 see [[http://twiki.org/cgi-bin/view/Codev/SimplifiedUserMappingCodeInterface][SimplifiedUserMappingCodeInterface]] on TWiki.org for a more detailed discussion
 of the concepts.
@@ -44,7 +44,7 @@ it includes:
       * TWiki.UserForm
       * TWiki.UsersTemplate
       * Main.UserHomepageHeader        
-      * TWiki.TWikiUserSetting
+      * TWiki.WikiUsersetting
       * Main.TWikiGroupTemplate        
 
 If you are developing a non-TWiki based User mapper, you might like to consider removeing or replacing the files installed by this Contrib.

TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST

@@ -18,10 +18,10 @@ data/Main/UserListByLocation.txt 0644
 data/Main/TWikiGroupTemplate.txt 0644
 
 data/TWiki/TWikiRegistration.txt 0644
-data/TWiki/UsersTemplate.txt 0644 Default template for a new TWikiUsers topic
+data/TWiki/UsersTemplate.txt 0644 Default template for a new WikiUsers topic
 data/TWiki/ChangeEmailAddress.txt 0644
 data/TWiki/BulkResetPassword.txt 0644
-data/TWiki/TWikiUserSetting.txt 0644
+data/TWiki/WikiUsersetting.txt 0644
 data/TWiki/UserForm.txt 0644 Default form attached to a user topic
 data/TWiki/NewUserTemplate.txt 0644 Default new user topic template
 data/TWiki/ResetPassword.txt 0644

TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm

@@ -26,7 +26,7 @@ to a wikiname and back. It is also where groups are defined.
 
 By default TWiki maintains user topics and group topics in the %MAINWEB% that
 define users and group. These topics are
-   * !TWikiUsers - stores a mapping from usernames to TWiki names
+   * !WikiUsers - stores a mapping from usernames to TWiki names
    * !WikiName - for each user, stores info about the user
    * !GroupNameGroup - for each group, a topic ending with "Group" stores a list of users who are part of that group.
 
@@ -229,14 +229,14 @@ sub getLoginName {
     return $cUID;
 }
 
-# test if the login is in the TWikiUsers topic, or in the password file
+# test if the login is in the WikiUsers topic, or in the password file
 # depending on the AllowLoginNames setting
 sub _userReallyExists {
     my ( $this, $login ) = @_;
 
     if ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # need to use the TWikiUsers file
+        # need to use the WikiUsers file
         _loadMapping($this);
         return 1 if ( defined( $this->{L2U}->{$login} ) );
     }
@@ -270,7 +270,7 @@ throws an Error::Simple
 
 Add a user to the persistant mapping that maps from usernames to wikinames
 and vice-versa. The default implementation uses a special topic called
-"TWikiUsers" in the users web. Subclasses will provide other implementations
+"WikiUsers" in the users web. Subclasses will provide other implementations
 (usually stubs if they have other ways of mapping usernames to wikinames).
 Names must be acceptable to $TWiki::cfg{NameFilter}
 $login must *always* be specified. $wikiname may be undef, in which case
@@ -931,7 +931,7 @@ sub findUserByWikiName {
     }
     elsif ( $TWiki::cfg{Register}{AllowLoginName} ) {
 
-        # Add additional mappings defined in TWikiUsers
+        # Add additional mappings defined in WikiUsers
         _loadMapping($this);
         if ( $this->{W2U}->{$wn} ) {
 

UnitTestContrib/test/unit/Fn_REVINFO.pm

@@ -122,7 +122,7 @@ sub test_formatUser {
 sub test_compatibility1 {
     my $this = shift;
     # Create a topic with raw meta to force a wikiname into the author field.
-    # The wikiname must be for a user who is in TWikiUsers.
+    # The wikiname must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
     if ($TWiki::cfg{StoreImpl} ne 'RcsLite' &&
@@ -145,7 +145,7 @@ HERE
 sub test_compatibility2 {
     my $this = shift;
     # Create a topic with raw meta to force a login into the author field.
-    # The login must be for a user who is in TWikiUsers.
+    # The login must be for a user who is in WikiUsers.
     # This test is specific to the "traditional" text database implementation,
     # either RcsWrap or RcsLite.
     if ($TWiki::cfg{StoreImpl} ne 'RcsLite' &&

UnitTestContrib/test/unit/RegisterTests.pm

@@ -1415,8 +1415,8 @@ sub test_4061 {
                                       ]
                          });
 
-    # Make TWikiUsers read-only
-    chmod(0444, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt");
+    # Make WikiUsers read-only
+    chmod(0444, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt");
 
     $query->path_info( "/$this->{users_web}/TWikiRegistration" );
     $this->{twiki}->finish();
@@ -1454,7 +1454,7 @@ sub test_4061 {
     } otherwise {
         $this->assert(0, "expected an oops redirect");
     } finally {
-        chmod(0777, "$TWiki::cfg{DataDir}/$this->{users_web}/TWikiUsers.txt");
+        chmod(0777, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt");
     };
 }
 
@@ -1523,15 +1523,15 @@ sub verify_resetEmailOkay {
 }
 
 #test for http://develop.twiki.org/~twiki4/cgi-bin/view/Bugs/Item3400
-sub verify_resetPassword_NoTWikiUsersEntry {
+sub verify_resetPassword_NoWikiUsersEntry {
     my $this = shift;
 
     ## Need to create an account (else oopsnotwikiuser)
     ### with a known email address (else oopsregemail)
 
     $this->registerAccount();
 
-    #Remove the TWikiUsers entry - by deleting it :)
+    #Remove the WikiUsers entry - by deleting it :)
     $this->{twiki}->{store}->moveTopic(
         $TWiki::cfg{UsersWebName}, $TWiki::cfg{UsersTopicName}, 
         $TWiki::cfg{UsersWebName}, $TWiki::cfg{UsersTopicName}.'DELETED',

WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm

@@ -459,11 +459,11 @@ HERE
       {
           exec => $TML2HTML|$ROUNDTRIP,
           name => 'variousWikiWords',
-          html => "<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.TWikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
+          html => "<p>${linkon}WebPreferences${linkoff}</p><p>$protecton<br />%MAINWEB%$protectoff.WikiUsers</p><p>${linkon}CompleteAndUtterNothing${linkoff}</p><p>${linkon}LinkBox$linkoff${linkon}LinkBoxs${linkoff}${linkon}LinkBoxies${linkoff}${linkon}LinkBoxess${linkoff}${linkon}LinkBoxesses${linkoff}${linkon}LinkBoxes${linkoff}</p>",
           tml => <<'YYY',
 WebPreferences
 
-%MAINWEB%.TWikiUsers
+%MAINWEB%.WikiUsers
 
 CompleteAndUtterNothing
 
@@ -473,8 +473,8 @@ YYY
       {
           exec => $HTML2TML | $ROUNDTRIP,
           name => 'variousWikiWordsNopped',
-          html => "${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.TWikiUsers ${nop}CompleteAndUtterNothing",
-          tml => '<nop>WebPreferences %<nop>MAINWEB%.TWikiUsers <nop>CompleteAndUtterNothing',
+          html => "${nop}${linkon}WebPreferences${linkoff} %${nop}MAINWEB%.WikiUsers ${nop}CompleteAndUtterNothing",
+          tml => '<nop>WebPreferences %<nop>MAINWEB%.WikiUsers <nop>CompleteAndUtterNothing',
       },
       {
           exec => $ROUNDTRIP,

core/data/TWiki/DefaultPreferences.txt

@@ -75,7 +75,7 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
 
 ---++ Default User Settings
 
-%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.TWikiUsers
+%X% *NOTE:* They are typically redefined in topics of individual %USERSWEB%.WikiUsers
 
    * Show tool-tip topic info on mouse-over of WikiWord links. Setting can be on, off, or customized. An empty setting or off setting disables the tool-tips (for better performance). The setting can contain $summary to show the topic summary, $date for the last change date, $rev for the revision, $username for the login name of the last editor, $wikiname for the <nop>WikiName, $wikiusername for <nop>%USERSWEB%.WikiName, $topic for the topic name, and $web for the web name
       * Set LINKTOOLTIPINFO = off

core/data/TWiki/GlossaryOfTerms.txt

@@ -9,7 +9,7 @@
 | Page: | A regular Web page. A page in TWiki is composed of the _template/skin_ decoration and _topic_ content. |
 | Plugin: | Prepackaged server-side extension that adds all sorts of additional functions, seamlessly integrated into TWiki. [[Plugins][Details...]] |
 | Plugin API: | The standard interface for creating TWiki _Plugins_ and add-on programs that ensure a perfect integration. [[TWikiFuncDotPm][Details...]] |
-| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.TWikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
+| Preferences: | The site-wide, single _web_ and single user-level preferences settings. The settings are stored in DefaultPreferences, WebPreferences and %USERSWEB%.WikiUsers home pages. [[TWikiVariables#PreferencesVariables][Details...]] |
 | Site: | A TWiki installation consisting of one or more _webs_. [[TWikiSite][Details...]] |
 | Skin: | Skins overlay regular _templates_ with alternate header/footer layout of _pages_; topic text is not affected. Skins are typically enabled site-wide or per _web_. [[Skins][Details...]] |
 | Templates: | (1) Regular templates define header/footer layout of _pages_; topic text is not affected. (2) Template topics set the default content for new _topics_. [[SkinTemplates][Details...]] |

core/data/TWiki/ReleaseHistory.txt

@@ -13,7 +13,7 @@ __New Features and Enhancements of TWiki Release 4.2__
 
    * *Easier Installation and Upgrade*
       * New Internal Admin Login feature
-      * The !Main.TWikiUsers topic is no longer distributed as a default topic in Main web
+      * The !Main.WikiUsers topic is no longer distributed as a default topic in Main web
       * A new directory =working= which per default is located in the TWiki root which contains registration_approvals, tmp, and work_areas
       * Configure can now authenticate when connecting to local plugins repository.
 
@@ -35,7 +35,7 @@ __New Features and Enhancements of TWiki Release 4.2__
       * Many new functions in the API for plugin developers
       * Table of Content (TOC) feature enhanced
       * re-architected Pluggable user mapping (between login name and !WikiName) to integrate with alternative authentication and Management schemes
-      * Topic based User management has been extracted into a separately update-able package (!TWikiUsersContrib)
+      * Topic based User management has been extracted into a separately update-able package (!WikiUsersContrib)
 
    * *Enhancements of Pre-installed Plugins*
       * CommentPlugin: New =templatetopic= parameter to point to custom comment template topic
@@ -647,7 +647,7 @@ __Major New Features__
    * *25 Feb 2000* - TWiki:Main.PeterThoeny
       * New preference variables =%<nop>EDITBOXWIDTH%= and =%<nop>EDITBOXHEIGHT%= to specify the edit box size. 
    * *25 Feb 2000* - TWiki:Main.PeterThoeny
-      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (!TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.TWikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
+      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (!TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.WikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.  
    * *11 Feb 2000* - TWiki:Main.PeterThoeny
       * New variable =%<nop>SCRIPTSUFFIX%= / $scriptSuffix containing an optional file extension of the TWiki Perl script. Templates have been changed to use this variable. This allows you to rename the Perl script files to have a file extension like for example ".cgi". 
    * *11 Feb 2000* - TWiki:Main.PeterThoeny
@@ -750,7 +750,7 @@ __Major New Features__
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
       * Added TWiki variables, enclosed in % signs =%<nop>TOPIC%= (Topic name), =%<nop>WEB%= (web name), =%<nop>SCRIPTURL%= (script URL), =%<nop>DATE%= (current date), =%<nop>WIKIWEBMASTER%= (Wiki webmaster address), =%<nop>WIKIVERSION%= (Wiki version), =%<nop>USERNAME%= (user name), =%<nop>WIKIUSERNAME%= (Wiki user name). 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
-      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.TWikiUsers. 
+      * Topic WebChanges shows Wiki username instead of Intranet username, e.g. =PeterThoeny= instead of =thoeny= in case the Wiki username exists. Implementation Automatic lookup of Wiki username in topic Main.WikiUsers. 
    * *28 Jul 1998* - TWiki:Main.PeterThoeny
       * Topic index. (Technically speaking a simple '.*' search on topic names.)  
    * *28 Jul 1998* - TWiki:Main.PeterThoeny