Changeset 647
- Timestamp:
- 11/14/08 10:18:11 (4 years ago)
- Location:
- trunk/TopicUserMappingContrib
- Files:
-
- 1 added
- 26 edited
- 1 moved
-
data/Main/NobodyGroup.txt (modified) (1 diff)
-
data/Main/RegistrationAgent.txt (modified) (1 diff)
-
data/Main/TWikiAdminGroup.txt (modified) (1 diff)
-
data/Main/TWikiGroupTemplate.txt (modified) (1 diff)
-
data/Main/UserList.txt (modified) (1 diff)
-
data/Main/UserListByDateJoined.txt (modified) (1 diff)
-
data/Main/UserListByLocation.txt (modified) (1 diff)
-
data/TWiki/BulkRegistration.txt (modified) (1 diff)
-
data/TWiki/BulkResetPassword.txt (modified) (1 diff)
-
data/TWiki/ChangePassword.txt (modified) (1 diff)
-
data/TWiki/LoginName.txt (modified) (1 diff)
-
data/TWiki/ManagingUsers.txt (modified) (1 diff)
-
data/TWiki/ResetPassword.txt (modified) (1 diff)
-
data/TWiki/TWikiRegistration.txt (modified) (1 diff)
-
data/TWiki/TWikiUserSetting.txt (modified) (2 diffs)
-
data/TWiki/TopicUserMappingContrib.txt (modified) (6 diffs)
-
data/TWiki/UserForm.txt (modified) (1 diff)
-
data/TWiki/UsersTemplate.txt (moved) (moved from trunk/TopicUserMappingContrib/data/TWiki/TWikiUsersTemplate.txt)
-
lib/TWiki/Contrib/TopicUserMappingContrib.pm (modified) (1 diff)
-
lib/TWiki/Contrib/TopicUserMappingContrib/Config.spec (added)
-
lib/TWiki/Contrib/TopicUserMappingContrib/DEPENDENCIES (modified) (1 diff)
-
lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST (modified) (2 diffs)
-
lib/TWiki/Contrib/TopicUserMappingContrib/build.pl (modified) (1 diff)
-
lib/TWiki/Users/TopicUserMapping.pm (modified) (8 diffs)
-
test/unit/TopicUserMappingContrib/TopicUserMappingContribSuite.pm (modified) (1 diff)
-
test/unit/TopicUserMappingContrib/TopicUserMappingContribTests.pm (modified) (7 diffs)
-
test/unit/TopicUserMappingContrib/TopicUserMappingTests.pm (modified) (4 diffs)
-
tools/upgrade_emails.pl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/TopicUserMappingContrib/data/Main/NobodyGroup.txt
r611 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 1 5171$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 16686 $"}% 2 2 ---+ Nobody Group 3 3 -
trunk/TopicUserMappingContrib/data/Main/RegistrationAgent.txt
r626 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 1 5171$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 16686 $"}% 2 2 ---+ The <nop>RegistrationAgent User 3 3 -
trunk/TopicUserMappingContrib/data/Main/TWikiAdminGroup.txt
r611 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 1 5508$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 17023 $"}% 2 2 ---+ TWiki Administrator Group 3 3 -
trunk/TopicUserMappingContrib/data/Main/TWikiGroupTemplate.txt
r611 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 1 5171$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111931141" format="1.0" version="$Rev: 16686 $"}% 2 2 %META:TOPICPARENT{name="TWikiGroups"}% 3 3 ---+!! <nop>%URLPARAM{"topic"}% -
trunk/TopicUserMappingContrib/data/Main/UserList.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 1 3685$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 15206 $"}% 2 2 ---+ User List sorted by name 3 3 -
trunk/TopicUserMappingContrib/data/Main/UserListByDateJoined.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 1 3685$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 15206 $"}% 2 2 ---+ User List sorted by date joined / updated 3 3 -
trunk/TopicUserMappingContrib/data/Main/UserListByLocation.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 1 3685$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1163619832" format="1.0" version="$Rev: 15206 $"}% 2 2 ---+ User List sorted by location 3 3 -
trunk/TopicUserMappingContrib/data/TWiki/BulkRegistration.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 1 4842$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 16363 $"}% 2 2 %META:TOPICPARENT{name="ManagingUsers"}% 3 3 ---+ Bulk Registration -
trunk/TopicUserMappingContrib/data/TWiki/BulkResetPassword.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 1 4182$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 15703 $"}% 2 2 ---+ Bulk Reset Passwords 3 3 -
trunk/TopicUserMappingContrib/data/TWiki/ChangePassword.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 1 5307$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 16822 $"}% 2 2 ---+ %MAKETEXT{"Change Password"}% 3 3 %STARTINCLUDE% -
trunk/TopicUserMappingContrib/data/TWiki/LoginName.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1158277691" format="1.0" version="$Rev: 1 4048$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1158277691" format="1.0" version="$Rev: 15569 $"}% 2 2 %META:TOPICPARENT{name="ChangePassword"}% 3 3 ---+ The name you log in with -
trunk/TopicUserMappingContrib/data/TWiki/ManagingUsers.txt
r611 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1158277691" format="1.1" version="$Rev: 1 6192$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1158277691" format="1.1" version="$Rev: 17703 $"}% 2 2 %STARTINCLUDE% 3 3 ---+ Manage Users -
trunk/TopicUserMappingContrib/data/TWiki/ResetPassword.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 1 4182$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 15703 $"}% 2 2 %META:TOPICPARENT{name="ChangePassword"}% 3 3 ---+ %MAKETEXT{"Reset Password"}% -
trunk/TopicUserMappingContrib/data/TWiki/TWikiRegistration.txt
r482 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1216489724" format="1.0" version="$Rev: 1 5549$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1216489724" format="1.0" version="$Rev: 17064 $"}% 2 2 ---+ %MAKETEXT{"Registration"}% 3 3 -
trunk/TopicUserMappingContrib/data/TWiki/TWikiUserSetting.txt
r526 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1187649998" format="1.1" version="1.2"}% 1 %META:TOPICINFO{author="SteP" date="1187649998" format="1.1" version="1.2"}% 2 %META:TOPICPARENT{name="DefaultPreferences"}% 2 3 ---+++ User Settings -- preference variables customizable by users 3 4 Some of the preferences are explicitly intended to be customized by TWiki users, though a default is provided in [[%SYSTEMWEB%.%WIKIPREFSTOPIC%]], and a site customisation can take place in [[%LOCALSITEPREFS%]]. … … 15 16 *See also:* 16 17 * TWikiVariables - an alphabetical list of all variables 17 * %SYSTEMWEB%.DefaultPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined18 * DefaultPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined -
trunk/TopicUserMappingContrib/data/TWiki/TopicUserMappingContrib.txt
r645 r647 1 ---+!! !T WikiUserMappingContrib1 ---+!! !TopicUserMappingContrib 2 2 <!-- 3 3 One line description, required for extensions repository catalog. … … 10 10 The _User Mapping Manager_ interface provides services for mapping between a 'user identity' as used when talking to an external authentication provider, 11 11 an internal TWiki canonical user ID, and the displayed name used to identify the user in TWiki. 12 This is the default <nop>T WikiUserMapping in which user information is stored in TWiki topics - one per user, and then any mapping needed is done using the12 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 13 13 <nop>TWikiUsers topic in the %MAINWEB%. 14 14 … … 20 20 it includes: 21 21 * Registration and user management topics 22 * TWiki. ikiRegistration22 * TWiki.TWikiRegistration 23 23 * TWiki.ResetPassword 24 24 * TWiki.ChangePassword … … 43 43 * TWiki.NewUserTemplate 44 44 * TWiki.UserForm 45 * TWiki. TWikiUsersTemplate45 * TWiki.UsersTemplate 46 46 * Main.UserHomepageHeader 47 47 * TWiki.TWikiUserSetting … … 51 51 52 52 ---++ Settings 53 The T WikiUserMappingContrib specific settings have not yet been moved out of the standard TWiki.spec. This will be done in a future release.53 The TopicUserMappingContrib specific settings have not yet been moved out of the standard TWiki.spec. This will be done in a future release. 54 54 55 55 ---++ Installation Instructions … … 67 67 | 4.2.0 | 22 Jan 2008 - Distributed with TWiki 4.2.0 | 68 68 | Dependencies: | %$DEPENDENCIES% | 69 | Contrib Home: | http://twiki.org/cgi-bin/view/Plugins/T WikiUserMappingContrib |70 | Feedback: | http://twiki.org/cgi-bin/view/Plugins/T WikiUserMappingContribDev |71 | Appraisal: | http://twiki.org/cgi-bin/view/Plugins/T WikiUserMappingContribAppraisal |69 | Contrib Home: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContrib | 70 | Feedback: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContribDev | 71 | Appraisal: | http://twiki.org/cgi-bin/view/Plugins/TopicUserMappingContribAppraisal | 72 72 73 73 <!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the Dev topic instead. --> -
trunk/TopicUserMappingContrib/data/TWiki/UserForm.txt
r604 r647 1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 1 4048$"}%1 %META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 15569 $"}% 2 2 ---+ User Form 3 3 -
trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib.pm
r643 r647 12 12 # http://www.gnu.org/copyleft/gpl.html 13 13 14 package TWiki::Contrib::T WikiUserMappingContrib;14 package TWiki::Contrib::TopicUserMappingContrib; 15 15 16 16 use strict; -
trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/DEPENDENCIES
r14 r647 1 # Dependencies for T WikiUserMappingContrib1 # Dependencies for TopicUserMappingContrib 2 2 # Example: 3 3 # Time::ParseDate,>=2003.0211,cpan,Required. -
trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/MANIFEST
r626 r647 1 # Release manifest for TWikiUserMappingContrib 2 data/TWiki/TWikiUserMappingContrib.txt 0644 Documentation 3 lib/TWiki/Contrib/TWikiUserMappingContrib.pm 0444 Perl module 4 lib/TWiki/Users/TWikiUserMapping.pm 0444 Perl module 1 # Release manifest for TopicUserMappingContrib 2 data/TWiki/TopicUserMappingContrib.txt 0644 Documentation 3 lib/TWiki/Contrib/TopicUserMappingContrib.pm 0444 Perl module 4 lib/TWiki/Users/TopicUserMapping.pm 0444 Perl module 5 lib/TWiki/Contrib/TopicUserMappingContrib/Config.spec 5 6 6 7 # Topic based Usermapping topics … … 18 19 19 20 data/TWiki/TWikiRegistration.txt 0644 20 data/TWiki/ TWikiUsersTemplate.txt 0644 Default template for a new TWikiUsers topic21 data/TWiki/UsersTemplate.txt 0644 Default template for a new TWikiUsers topic 21 22 data/TWiki/ChangeEmailAddress.txt 0644 22 23 data/TWiki/BulkResetPassword.txt 0644 -
trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/build.pl
r14 r647 6 6 7 7 # Create the build object 8 $build = new TWiki::Contrib::Build('T WikiUserMappingContrib');8 $build = new TWiki::Contrib::Build('TopicUserMappingContrib'); 9 9 10 10 # (Optional) Set the details of the repository for uploads. -
trunk/TopicUserMappingContrib/lib/TWiki/Users/TopicUserMapping.pm
r645 r647 20 20 =begin twiki 21 21 22 ---+ package TWiki::Users::T WikiUserMapping22 ---+ package TWiki::Users::TopicUserMapping 23 23 24 24 The User mapping is the process by which TWiki maps from a username (a login name) … … 40 40 =cut 41 41 42 package TWiki::Users::T WikiUserMapping;42 package TWiki::Users::TopicUserMapping; 43 43 use base 'TWiki::UserMapping'; 44 44 … … 48 48 49 49 #use Monitor; 50 #Monitor::MonitorMethod('TWiki::Users::T WikiUserMapping');50 #Monitor::MonitorMethod('TWiki::Users::TopicUserMapping'); 51 51 52 52 =begin twiki … … 84 84 { 85 85 $session->writeWarning( 86 'T WikiUserMapping has TURNED OFF EnableNewUserRegistration, because the password file is read only.'86 'TopicUserMapping has TURNED OFF EnableNewUserRegistration, because the password file is read only.' 87 87 ); 88 88 $TWiki::cfg{Register}{EnableNewUserRegistration} = 0; … … 144 144 first, then login, then wikiname. This mapping is special - for backwards 145 145 compatibility, it assumes responsibility for _all_ non BaseMapping users. 146 If you're needing to mix the T WikiuserMapping with other mappings,147 define $this->{mapping_id} = 'T WikiUserMapping_';146 If you're needing to mix the TopicUserMapping with other mappings, 147 define $this->{mapping_id} = 'TopicUserMapping_'; 148 148 149 149 =cut … … 159 159 else { 160 160 161 # Used when (if) T WikiUserMapping is subclassed161 # Used when (if) TopicUserMapping is subclassed 162 162 return 1 if ( defined $cUID && $cUID =~ /^($this->{mapping_id})/ ); 163 163 } … … 339 339 else { 340 340 ( $meta, $text ) = $store->readTopic( undef, $TWiki::cfg{SystemWebName}, 341 ' TWikiUsersTemplate' );341 'UsersTemplate' ); 342 342 } 343 343 … … 1051 1051 sub _getListOfGroups { 1052 1052 my $this = shift; 1053 ASSERT( ref($this) eq 'TWiki::Users::T WikiUserMapping' ) if DEBUG;1053 ASSERT( ref($this) eq 'TWiki::Users::TopicUserMapping' ) if DEBUG; 1054 1054 1055 1055 unless ( $this->{groupsList} ) { -
trunk/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribSuite.pm
r645 r647 1 package T WikiUserMappingContribSuite;1 package TopicUserMappingContribSuite; 2 2 use base 'Unit::TestSuite'; 3 3 4 4 sub include_tests { 5 return qw(T WikiUserMappingContribTests TWikiUserMappingTests);5 return qw(TopicUserMappingContribTests TopicUserMappingTests); 6 6 } 7 7 -
trunk/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribTests.pm
r645 r647 2 2 3 3 # 4 # Tests the T WikiUserMappingContrib, including dealing with legacy login4 # Tests the TopicUserMappingContrib, including dealing with legacy login 5 5 # names and wiki names stored in topics, in TOPICINFO and FILEATTACHMENT 6 6 # meta-data. … … 8 8 # Only works with the RCS store. 9 9 # 10 package T WikiUserMappingContribTests;10 package TopicUserMappingContribTests; 11 11 12 12 use base qw( TWikiFnTestCase ); … … 24 24 25 25 sub new { 26 my $self = shift()->SUPER::new( 'T WikiuserMappingContribTests', @_ );26 my $self = shift()->SUPER::new( 'TopicUserMappingContribTests', @_ ); 27 27 return $self; 28 28 } 29 29 30 30 sub fixture_groups { 31 return ( [ 'NormalT WikiUserMapping', 'NamedTWikiUserMapping', ] );32 } 33 34 sub NormalT WikiUserMapping {35 my $this = shift; 36 $TWiki::Users::T WikiUserMapping::TWIKI_USER_MAPPING_ID = '';31 return ( [ 'NormalTopicUserMapping', 'NamedTopicUserMapping', ] ); 32 } 33 34 sub NormalTopicUserMapping { 35 my $this = shift; 36 $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = ''; 37 37 $this->set_up_for_verify(); 38 38 } 39 39 40 sub NamedT WikiUserMapping {40 sub NamedTopicUserMapping { 41 41 my $this = shift; 42 42 43 43 # Set a mapping ID for purposes of testing named mappings 44 $TWiki::Users::T WikiUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_';44 $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 45 45 $this->set_up_for_verify(); 46 46 } … … 64 64 #default settings 65 65 $TWiki::cfg{LoginManager} = 'TWiki::LoginManager::TemplateLogin'; 66 $TWiki::cfg{UserMappingManager} = 'TWiki::Users::T WikiUserMapping';66 $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 67 67 $TWiki::cfg{UseClientSessions} = 1; 68 68 $TWiki::cfg{PasswordManager} = "TWiki::Users::HtPasswdUser"; … … 116 116 } 117 117 118 #TODO: add tests for when you're not using T WikiUserMapping at all...118 #TODO: add tests for when you're not using TopicUserMapping at all... 119 119 #New 4.2 cUID based topics 120 sub verify_WikiNameT WikiUserMapping {120 sub verify_WikiNameTopicUserMapping { 121 121 my $this = shift; 122 122 $this->setup_new_session(); … … 126 126 } 127 127 128 sub verify_LoginNameT WikiUserMapping {128 sub verify_LoginNameTopicUserMapping { 129 129 my $this = shift; 130 130 $TWiki::cfg{Register}{AllowLoginName} = 1; … … 265 265 <div class="twikiAttachments"> 266 266 | *I* | *%MAKETEXT{"Attachment"}%* | *%MAKETEXT{"Action"}%* | *%MAKETEXT{"Size"}%* | *%MAKETEXT{"Date"}%* | *%MAKETEXT{"Who"}%* | *%MAKETEXT{"Comment"}%* | 267 | <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/DocumentGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> | 4.1 K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryT WikiuserMappingContribTestsUsersWeb.JoeDoe | |267 | <img width="16" alt="png" align="top" src="%PUBURLPATH%/TWiki/DocumentGraphics/png.gif" height="16" border="0" /><span class="twikiHidden">png</span> | <a href="%ATTACHURLPATH%/%ENCODE{home.org.au.png}%">home.org.au.png</a> | <a href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?filename=%ENCODE{"home.org.au.png"}%;revInfo=1" title="%MAKETEXT{"change, update, previous revisions, move, delete..."}%" rel="nofollow">%MAKETEXT{"manage"}%</a> | 4.1 K|<span class="twikiNoBreak">31 May 2007 - 21:58</span> |TemporaryTopicUserMappingContribTestsUsersWeb.JoeDoe | | 268 268 </div> 269 269 THIS -
trunk/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingTests.pm
r645 r647 1 1 use strict; 2 2 3 package T WikiUserMappingTests;4 5 # Some basic tests for TWiki::Users::T WikiUserMapping3 package TopicUserMappingTests; 4 5 # Some basic tests for TWiki::Users::TopicUserMapping 6 6 # 7 7 # The tests are performed using the APIs published by the facade class, 8 # TWiki:Users, not the actual TWiki::Users::T WikiuserMapping8 # TWiki:Users, not the actual TWiki::Users::TopicUserMapping 9 9 10 10 use base qw(TWikiTestCase); … … 12 12 use TWiki; 13 13 use TWiki::Users; 14 use TWiki::Users::T WikiUserMapping;14 use TWiki::Users::TopicUserMapping; 15 15 use Error qw( :try ); 16 16 … … 19 19 my $ttpath; 20 20 21 my $testSysWeb = 'TemporaryT WikiUserMappingTestsSystemWeb';22 my $testNormalWeb = "TemporaryT WikiUserMappingTestsNormalWeb";23 my $testUsersWeb = "TemporaryT WikiUserMappingTestsUsersWeb";21 my $testSysWeb = 'TemporaryTopicUserMappingTestsSystemWeb'; 22 my $testNormalWeb = "TemporaryTopicUserMappingTestsNormalWeb"; 23 my $testUsersWeb = "TemporaryTopicUserMappingTestsUsersWeb"; 24 24 my $testUser; 25 25 26 26 sub fixture_groups { 27 return ( [ 'NormalT WikiUserMapping', 'NamedTWikiUserMapping', ] );28 } 29 30 sub NormalT WikiUserMapping {31 my $this = shift; 32 $TWiki::Users::T WikiUserMapping::TWIKI_USER_MAPPING_ID = '';27 return ( [ 'NormalTopicUserMapping', 'NamedTopicUserMapping', ] ); 28 } 29 30 sub NormalTopicUserMapping { 31 my $this = shift; 32 $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = ''; 33 33 $this->set_up_for_verify(); 34 34 } 35 35 36 sub NamedT WikiUserMapping {36 sub NamedTopicUserMapping { 37 37 my $this = shift; 38 38 39 39 # Set a mapping ID for purposes of testing named mappings 40 $TWiki::Users::T WikiUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_';40 $TWiki::Users::TopicUserMapping::TWIKI_USER_MAPPING_ID = 'TestMapping_'; 41 41 $this->set_up_for_verify(); 42 42 } … … 58 58 $TWiki::cfg{SystemWebName} = $testSysWeb; 59 59 $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.SitePreferences"; 60 $TWiki::cfg{UserMappingManager} = 'TWiki::Users::T WikiUserMapping';60 $TWiki::cfg{UserMappingManager} = 'TWiki::Users::TopicUserMapping'; 61 61 $TWiki::cfg{Register}{AllowLoginName} = 1; 62 62 $TWiki::cfg{Register}{EnableNewUserRegistration} = 1; -
trunk/TopicUserMappingContrib/tools/upgrade_emails.pl
r14 r647 18 18 19 19 use TWiki; 20 use TWiki::Users::T WikiUserMapping; # required to get email addresses20 use TWiki::Users::TopicUserMapping; # required to get email addresses 21 21 22 22 my $twiki = new TWiki(); … … 62 62 } else { 63 63 # Get emails *from the TWiki user mapping manager* 64 @em = TWiki::Users::T WikiUserMapping::mapper_getEmails(64 @em = TWiki::Users::TopicUserMapping::mapper_getEmails( 65 65 $twiki, $cUID); 66 66 if( scalar( @em )) {
Note: See TracChangeset
for help on using the changeset viewer.
