Item109: Renaming TWikiRegistration to UserRegistration

git-svn-id: http://svn.foswiki.org/trunk@733 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 16, 2008 · 3045c5c · 3045c5c
1 parent 71c0795
commit 3045c5c
Show file tree

Hide file tree

Showing 63 changed files with 716 additions and 716 deletions.
diff --git a/PatternSkin/data/TWiki/WebLeftBarLogin.txt b/PatternSkin/data/TWiki/WebLeftBarLogin.txt
@@ -1,6 +1,6 @@
 %META:TOPICINFO{author="ProjectContributor" date="0" format="1.1" version="$Rev$"}%
 %STARTINCLUDE%<div class="patternLeftBarPersonal">
-%IF{"context authenticated" then='%MAKETEXT{"Hello [_1]" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%'}%%IF{"$ LOGOUT != ''" then='%BR%<ul><li class="patternLogOut">%LOGOUT%</li></ul>'}%%IF{"$ LOGIN != '' and not context authenticated" then='<ul><li class="patternLogIn">%LOGIN% %IF{"context registration_supported AND context registration_enabled" then="%MAKETEXT{"or"}% [[%SYSTEMWEB%.TWikiRegistration][%MAKETEXT{"Register"}%]]"}%</li></ul>'}%
+%IF{"context authenticated" then='%MAKETEXT{"Hello [_1]" args="[[%WIKIUSERNAME%][%SPACEOUT{%WIKINAME%}%]]"}%'}%%IF{"$ LOGOUT != ''" then='%BR%<ul><li class="patternLogOut">%LOGOUT%</li></ul>'}%%IF{"$ LOGIN != '' and not context authenticated" then='<ul><li class="patternLogIn">%LOGIN% %IF{"context registration_supported AND context registration_enabled" then="%MAKETEXT{"or"}% [[%SYSTEMWEB%.UserRegistration][%MAKETEXT{"Register"}%]]"}%</li></ul>'}%
 %IF{"'%USERNAME%'!='guest'" then="<div class=\"patternLeftBarPersonalContent\">
 $percntINCLUDE{$quot$percntMAINWEB$percnt.$percntWIKINAME$percntLeftBar$quot warn=$quot<ul><li><a href='%SCRIPTURLPATH{edit}%/%MAINWEB%/%WIKINAME%LeftBar?templatetopic=%SYSTEMWEB%.WebLeftBarPersonalTemplate&amp;topicparent=%WIKINAME%'>%MAKETEXT{Create personal sidebar}%</a></li></ul>$quot }$percnt
 </div><!--/patternLeftBarPersonalContent-->"}%</div><!--/patternLeftBarPersonal-->
diff --git a/TopicUserMappingContrib/data/Main/RegistrationAgent.txt b/TopicUserMappingContrib/data/Main/RegistrationAgent.txt
@@ -3,6 +3,6 @@
 
 This is a TWiki User used by TWiki when it registers new users. This user has special access to write to [[%WIKIUSERSTOPIC%]], and does not need an entry in the password system.
 
-__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]]
+__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.UserRegistration][UserRegistration]]
 
 %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="AdminGroup"}%
diff --git a/TopicUserMappingContrib/data/Main/UserHomepageHeader.txt b/TopicUserMappingContrib/data/Main/UserHomepageHeader.txt
@@ -12,5 +12,5 @@ The part between the horizontal rules gets included at the top of every [[%WIKIU
 %STOPINCLUDE%
 -----
 
-__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.UserForm][UserForm]], [[%SYSTEMWEB%.NewUserTemplate][NewUserTemplate]], [[%SYSTEMWEB%.TWikiRegistration][TWikiRegistration]], [[%SYSTEMWEB%.DataForms][DataForms]]
+__Related topics:__ [[%WIKIUSERSTOPIC%]], [[%SYSTEMWEB%.UserForm][UserForm]], [[%SYSTEMWEB%.NewUserTemplate][NewUserTemplate]], [[%SYSTEMWEB%.UserRegistration][UserRegistration]], [[%SYSTEMWEB%.DataForms][DataForms]]
 
diff --git a/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt b/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt
@@ -20,7 +20,7 @@ configuration.
 You don't have to have user home pages in TWiki for Authentication to
 work - see TWikiUserAuthentication for details.
 
-   * TWikiRegistration is used when you want new users to individually
+   * UserRegistration is used when you want new users to individually
      register with TWiki by filling out a form
    * You can create a custom versions of %SYSTEMWEB%.NewUserTemplate and
      %SYSTEMWEB%.UserForm

diff --git a/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt b/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt
@@ -19,33 +19,33 @@ It includes the topics that are used when registering and managing users and gro
 
 it includes:
    * Registration and user management topics
-      * TWiki.TWikiRegistration
-      * TWiki.ResetPassword
-      * TWiki.ChangePassword           
-      * TWiki.ChangeEmailAddress       
-      * TWiki.BulkRegistration         
-      * TWiki.BulkResetPassword        
+      * %SYSTEMWEB%.UserRegistration
+      * %SYSTEMWEB%.ResetPassword
+      * %SYSTEMWEB%.ChangePassword           
+      * %SYSTEMWEB%.ChangeEmailAddress       
+      * %SYSTEMWEB%.BulkRegistration         
+      * %SYSTEMWEB%.BulkResetPassword        
    * Documentation topics
-      * TWiki.ManagingUsers            
-      * TWiki.UserToolsCategory
-      * TWiki.LoginName                
+      * %SYSTEMWEB%.ManagingUsers            
+      * %SYSTEMWEB%.UserToolsCategory
+      * %SYSTEMWEB%.LoginName                
    * default groups and user
-      * Main.NobodyGroup
-      * Main.AdminGroup
-      * Main.RegistrationAgent    
+      * %USERSWEB%.NobodyGroup
+      * %USERSWEB%.AdminGroup
+      * %USERSWEB%.RegistrationAgent    
    * User lists
-      * Main.UserList                  
-      * Main.UserListHeader            
-      * Main.UserListByDateJoined      
-      * Main.UserListByLocation        
-      * Main.UserListByPhotograph      
+      * %USERSWEB%.UserList                  
+      * %USERSWEB%.UserListHeader            
+      * %USERSWEB%.UserListByDateJoined      
+      * %USERSWEB%.UserListByLocation        
+      * %USERSWEB%.UserListByPhotograph      
    * User and Group template files
-      * TWiki.NewUserTemplate
-      * TWiki.UserForm
-      * TWiki.UsersTemplate
-      * Main.UserHomepageHeader        
-      * TWiki.UserSetting
-      * Main.GroupTemplate        
+      * %SYSTEMWEB%.NewUserTemplate
+      * %SYSTEMWEB%.UserForm
+      * %SYSTEMWEB%.UsersTemplate
+      * %USERSWEB%.UserHomepageHeader        
+      * %SYSTEMWEB%.UserSetting
+      * %USERSWEB%.GroupTemplate        
 
 If you are developing a non-TWiki based User mapper, you might like to consider removeing or replacing the files installed by this Contrib.
 

diff --git a/TopicUserMappingContrib/data/TWiki/UserForm.txt b/TopicUserMappingContrib/data/TWiki/UserForm.txt
@@ -28,7 +28,7 @@ user form, then:
 | <nop>HomePage | text | 40 | | | |
 | Comment | textarea | 50x6 | | | |
 
-__%X% Note:__ Please keep the %SYSTEMWEB%.TWikiRegistration 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.
+__%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%.TWikiRegistration
+__Related topics:__ %MAINWEB%.%WIKIUSERSTOPIC%, %MAINWEB%.UserViewTemplate, %SYSTEMWEB%.NewUserTemplate, %MAINWEB%.UserHomepageHeader, %SYSTEMWEB%.DataForms, %SYSTEMWEB%.UserRegistration
 
diff --git a/...gContrib/data/TWiki/TWikiRegistration.txt → ...ngContrib/data/TWiki/UserRegistration.txt b/...gContrib/data/TWiki/TWikiRegistration.txt → ...ngContrib/data/TWiki/UserRegistration.txt
diff --git a/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt b/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt
@@ -1,7 +1,7 @@
 %META:TOPICINFO{author="AdminGroup" date="1178574333" format="1.1" reprev="1.2" version="1.2"}%
 ---+ List of <nop>%WIKITOOLNAME% users
 
-Below is a list of users with accounts. If you want to edit topics or see protected areas of the site then you can get added to the list by registering: fill out the form in %SYSTEMWEB%.TWikiRegistration. 
+Below is a list of users with accounts. If you want to edit topics or see protected areas of the site then you can get added to the list by registering: fill out the form in %SYSTEMWEB%.UserRegistration. 
 
 If you forget your password, %SYSTEMWEB%.ResetPassword will get a new one sent to you.
 

diff --git a/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST b/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST
@@ -17,7 +17,7 @@ data/Main/UserHomepageHeader.txt 0644
 data/Main/UserListByLocation.txt 0644
 data/Main/GroupTemplate.txt 0644
 
-data/TWiki/TWikiRegistration.txt 0644
+data/TWiki/UserRegistration.txt 0644
 data/TWiki/UsersTemplate.txt 0644 Default template for a new WikiUsers topic
 data/TWiki/ChangeEmailAddress.txt 0644
 data/TWiki/BulkResetPassword.txt 0644

diff --git a/UnitTestContrib/test/unit/RegisterTests.pm b/UnitTestContrib/test/unit/RegisterTests.pm
@@ -414,7 +414,7 @@ sub registerVerifyOk {
     $TWiki::cfg{Register}{NeedVerification}  =  1;
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -442,7 +442,7 @@ sub registerVerifyOk {
                                       ]
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -474,7 +474,7 @@ sub registerVerifyOk {
                                     'verify'
                                    ]
                       });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin},$query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -511,7 +511,7 @@ sub verify_registerBadVerify {
     $TWiki::cfg{Register}{NeedVerification}  =  1;
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -538,7 +538,7 @@ sub verify_registerBadVerify {
                                        'register'
                                       ]
                          });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -570,7 +570,7 @@ sub verify_registerBadVerify {
             'verify'
            ]
     });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -606,7 +606,7 @@ sub verify_registerNoVerifyOk {
     $TWiki::cfg{Register}{NeedVerification}  =  0;
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -634,7 +634,7 @@ sub verify_registerNoVerifyOk {
                                       ]
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -682,7 +682,7 @@ sub verify_rejectShortPassword {
     $TWiki::cfg{PasswordManager}             =  'TWiki::Users::HtPasswdUser';
     $TWiki::cfg{Register}{AllowLoginName}    =  0;
     my $query = new Unit::Request ({
-                          'TopicName'     => ['TWikiRegistration'],
+                          'TopicName'     => ['UserRegistration'],
                           'Twk1Email'     => [$this->{new_user_email}],
                           'Twk1WikiName'  => [$this->{new_user_wikiname}],
                           'Twk1Name'      => [$this->{new_user_fullname}],
@@ -695,7 +695,7 @@ sub verify_rejectShortPassword {
                           'action'        => ['register'],
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -728,7 +728,7 @@ sub verify_shortPassword {
     $TWiki::cfg{Register}{AllowLoginName}    =  1;
     my $query = new Unit::Request(
         {
-            'TopicName'     => ['TWikiRegistration'],
+            'TopicName'     => ['UserRegistration'],
             'Twk1Email'     => [$this->{new_user_email}],
             'Twk1WikiName'  => [$this->{new_user_wikiname}],
             'Twk1Name'      => [$this->{new_user_fullname}],
@@ -741,7 +741,7 @@ sub verify_shortPassword {
             'action'        => ['register'],
         });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -778,7 +778,7 @@ sub verify_duplicateActivation {
 
     # Start similar to registration with verification
     $TWiki::cfg{Register}{NeedVerification}  =  1;
-    my $query = new Unit::Request ({'TopicName'     => ['TWikiRegistration'],
+    my $query = new Unit::Request ({'TopicName'     => ['UserRegistration'],
                           'Twk1Email'     => [$this->{new_user_email}],
                           'Twk1WikiName'  => [$this->{new_user_wikiname}],
                           'Twk1Name'      => [$this->{new_user_fullname}],
@@ -787,7 +787,7 @@ sub verify_duplicateActivation {
                           'Twk1LastName'  => [$this->{new_user_sname}],
                           'action'        => ['register'],
                       });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki} = TWiki->new($TWiki::cfg{DefaultUserName}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
     try {
@@ -815,7 +815,7 @@ sub verify_duplicateActivation {
     $query = new Unit::Request ({'code'   => [$code],
                         'action' => ['verify'],
                     });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki} = TWiki->new($TWiki::cfg{DefaultUserName},$query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
     try {
@@ -839,7 +839,7 @@ sub verify_duplicateActivation {
     $query = new Unit::Request ({'code'   => [$code],
                         'action' => ['verify'],
                     });
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki} = TWiki->new($TWiki::cfg{DefaultUserName},$query);
     $this->{twiki}->net->setMailHandler(\&sentMail);
     try {
@@ -1265,7 +1265,7 @@ sub verify_disabled_registration {
     $TWiki::cfg{Register}{NeedVerification}  =  0;
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -1293,7 +1293,7 @@ sub verify_disabled_registration {
                                       ]
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -1330,7 +1330,7 @@ sub test_3951 {
     $TWiki::cfg{PasswordManager} = 'TWiki::Users::HtPasswdUser';
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -1355,7 +1355,7 @@ sub test_3951 {
                                       ]
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);
@@ -1390,7 +1390,7 @@ sub test_4061 {
     $TWiki::cfg{PasswordManager} = 'TWiki::Users::HtPasswdUser';
     my $query = new Unit::Request ({
                           'TopicName' => [
-                                          'TWikiRegistration'
+                                          'UserRegistration'
                                          ],
                           'Twk1Email' => [
                                           $this->{new_user_email}
@@ -1418,7 +1418,7 @@ sub test_4061 {
     # Make WikiUsers read-only
     chmod(0444, "$TWiki::cfg{DataDir}/$this->{users_web}/$TWiki::cfg{UsersTopicName}.txt");
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
     $this->{twiki}->finish();
     $this->{twiki} = new TWiki( $TWiki::cfg{DefaultUserLogin}, $query);
     $this->{twiki}->net->setMailHandler(\&TWikiFnTestCase::sentMail);

diff --git a/UnitTestContrib/test/unit/SaveScriptTests.pm b/UnitTestContrib/test/unit/SaveScriptTests.pm
@@ -37,7 +37,7 @@ HERE
 my $testtext1 = <<'HERE';
 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 4579 $"}%
 
-A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %SYSTEMWEB%.TWikiRegistration and create your own page.
+A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %SYSTEMWEB%.UserRegistration and create your own page.
 
 %META:FORM{name="TestForm1"}%
 %META:FIELD{name="Select" attributes="" title="Select" value="Value_2"}%
@@ -50,7 +50,7 @@ HERE
 
 my $testtext_nometa = <<'HERE';
 
-A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %SYSTEMWEB%.TWikiRegistration and create your own page.
+A guest of this TWiki web, not unlike yourself. You can leave your trace behind you, just add your name in %SYSTEMWEB%.UserRegistration and create your own page.
 
 HERE
 

diff --git a/UnitTestContrib/test/unit/TWikiFnTestCase.pm b/UnitTestContrib/test/unit/TWikiFnTestCase.pm
@@ -100,7 +100,7 @@ sub registerUser {
     my ($this, $loginname, $forename, $surname, $email) = @_;
 
     my $query = new Unit::Request ({
-                          'TopicName' => [ 'TWikiRegistration'  ],
+                          'TopicName' => [ 'UserRegistration'  ],
                           'Twk1Email' => [ $email ],
                           'Twk1WikiName' => [ "$forename$surname" ],
                           'Twk1Name' => [ "$forename $surname" ],
@@ -111,7 +111,7 @@ sub registerUser {
                           'action' => [ 'register' ]
                          });
 
-    $query->path_info( "/$this->{users_web}/TWikiRegistration" );
+    $query->path_info( "/$this->{users_web}/UserRegistration" );
 
     my $twiki = new TWiki(undef, $query);
     $twiki->net->setMailHandler(\&TWikiFnTestCase::sentMail);

diff --git a/core/bin/.htaccess.txt b/core/bin/.htaccess.txt
@@ -61,11 +61,11 @@ AuthType Basic
 #AuthType Basic
 
 # File to return on access control error (e.g. wrong password)
-# By convention this is the TWikiRegistration page, that allows users
+# By convention this is the UserRegistration page, that allows users
 # to register with the TWiki. Apache requires this to be a *local* path.
 # Comment this out if you setup TWiki to completely deny access to WikiGuest
 # in all webs or change the path to a static html page.
-ErrorDocument 401 {ScriptUrlPath}/view/TWiki/TWikiRegistration
+ErrorDocument 401 {ScriptUrlPath}/view/TWiki/UserRegistration
 # Alternatively if your users are all known to be registered you may want
 # to redirect them to the ResetPassword page.
 # ErrorDocument 401 {ScriptUrlPath}/view/TWiki/ResetPassword