Changeset 662


Ignore:
Timestamp:
11/15/08 02:59:22 (5 years ago)
Author:
SvenDowideit
Message:

Item109: make rego agent a cfg param

Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/Release04x02/data/TWiki/AccessControl.txt

    r610 r662  
    101101 
    102102Creation and renaming of sub-webs is controlled by the WEBCHANGE setting on the parent web (or ROOTCHANGE for [[#RootWebs][root webs]]). Renaming is additionally restricted by the setting of WEBRENAME in the web itself. 
    103  
    104 __Note:__  If you restrict access to the %USERSWEB%, make sure to add the =TWikiRegistrationAgent= so that users can register. Example: 
    105       * ==Set <nop>ALLOWWEBCHANGE = !TWikiAdminGroup, !TWikiRegistrationAgent== 
    106103 
    107104__Note:__  For Web level access rights Setting any of these settings to an empty value has the same effect as not setting them at all. Please note that the documentation of TWiki 4.0 and earlier versions of TWiki 4.1 did not reflect the actual implementation, e.g. an empty ALLOWWEBVIEW does _not_ prevent anyone from viewing the web, and an an empty DENYWEBVIEW does _not_ allow all to view the web. 

  • branches/Release04x02/data/TWiki/ReleaseNotes01x00.txt

    r632 r662  
    438438| [[%BUGS%/Item3759][Item3759]] | MailerContrib not mailing groups | 
    439439| [[%BUGS%/Item3758][Item3758]] | Remark "There is no size limit for uploaded files." is not relevant to users | 
    440 | [[%BUGS%/Item3756][Item3756]] | TWikiRegistrationAgent produces wrongly formated entries | 
     440| [[%BUGS%/Item3756][Item3756]] | RegistrationAgent produces wrongly formated entries | 
    441441| [[%BUGS%/Item3755][Item3755]] | Need to document parameterized include | 
    442442| [[%BUGS%/Item3752][Item3752]] | Doc fix to !AdminSkillsAssumptions | 

  • branches/Release04x02/lib/TWiki/UI/Register.pm

    r630 r662  
    4646require TWiki::Sandbox; 
    4747 
    48 my $agent = 'RegistrationAgent'; 
    49  
    5048# Keys from the user data that should *not* be included in 
    5149# the user topic. 
    … …  
    10091007 
    10101008    $session->{store}->saveTopic( 
    1011         $session->{users}->getCanonicalUserID($agent), 
     1009        $session->{users}->getCanonicalUserID($TWiki::cfg{Register}{RegistrationAgentWikiName}), 
    10121010        $TWiki::cfg{UsersWebName}, 
    10131011        $user, $text, $meta 

  • branches/Release04x02/lib/TWiki/Users/BaseUserMapping.pm

    r624 r662  
    3030 
    3131---++ Users 
    32    * TWikiAdmin - uses the password that was set in Configure (IF its not null) 
    33    * TWikiGuest 
     32   * $TWiki::cfg{AdminUserLogin} - TWikiAdmin - uses the password that was set in Configure (IF its not null) 
     33   * $TWiki::cfg{DefaultUserLogin} - TWikiGuest 
    3434   * UnknownUser 
    3535   * ProjectContributor - 1 Jan 2005 
    36    * RegistrationAgent - 1 Jan 2005 
     36   * $TWiki::cfg{Register}{RegistrationAgentWikiName} - RegistrationAgent - 1 Jan 2005 
    3737 
    3838---+++ Groups 
    … …  
    7070        unknown                       => $this->{mapping_id} . '999', 
    7171        ProjectContributor              => $this->{mapping_id} . '111', 
    72         RegistrationAgent        => $this->{mapping_id} . '222' 
     72        $TWiki::cfg{Register}{RegistrationAgentWikiName}        => $this->{mapping_id} . '222' 
    7373    }; 
    7474    $this->{U2L} = { 
    … …  
    7777        $this->{mapping_id} . '999' => 'unknown', 
    7878        $this->{mapping_id} . '111' => 'ProjectContributor', 
    79         $this->{mapping_id} . '222' => 'RegistrationAgent' 
     79        $this->{mapping_id} . '222' => $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    8080    }; 
    8181    $this->{U2W} = { 
    … …  
    8484        $this->{mapping_id} . '999' => 'UnknownUser', 
    8585        $this->{mapping_id} . '111' => 'ProjectContributor', 
    86         $this->{mapping_id} . '222' => 'RegistrationAgent' 
     86        $this->{mapping_id} . '222' => $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    8787    }; 
    8888    $this->{W2U} = { 
    … …  
    9191        UnknownUser                      => $this->{mapping_id} . '999', 
    9292        ProjectContributor               => $this->{mapping_id} . '111', 
    93         RegistrationAgent           => $this->{mapping_id} . '222' 
     93        $TWiki::cfg{Register}{RegistrationAgentWikiName}    => $this->{mapping_id} . '222' 
    9494    }; 
    9595    $this->{U2E} = 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt

    r628 r662  
    5050 
    5151__Access Control:__ 
    52    * Set ALLOWTOPICCHANGE = TWikiAdminGroup, RegistrationAgent 
     52   * Set ALLOWTOPICCHANGE = TWikiAdminGroup 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/Config.spec

    r639 r662  
    1515# a link sent in an email to the user's registered email address 
    1616$TWiki::cfg{Register}{NeedVerification} = $FALSE; 
     17 
     18# **STRING 20 EXPERT** 
     19# The internal user that creates user topics on new registrations. You are recommended not to change this. 
     20$TWiki::cfg{Register}{RegistrationAgentWikiName} = 'RegistrationAgent'; 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribTests.pm

    r641 r662  
    8888    my $this = shift; 
    8989 
    90     my $agent = 'RegistrationAgent'; 
    9190    my $userLogin; 
    9291    my $userWikiName; 
    … …  
    290289    $this->assert( $basemapping->handlesUser( undef, 'unknown' ) ); 
    291290    $this->assert( $basemapping->handlesUser( undef, 'ProjectContributor' ) ); 
    292     $this->assert( $basemapping->handlesUser( undef, 'RegistrationAgent' ) ); 
     291    $this->assert( $basemapping->handlesUser( undef, $TWiki::cfg{Register}{RegistrationAgentWikiName} ) ); 
    293292 
    294293    $this->assert( 
    … …  
    306305        $basemapping->handlesUser( undef, undef, 'ProjectContributor' ) ); 
    307306    $this->assert( 
    308         $basemapping->handlesUser( undef, undef, 'RegistrationAgent' ) ); 
     307        $basemapping->handlesUser( undef, undef, $TWiki::cfg{Register}{RegistrationAgentWikiName} ) ); 
    309308 
    310309    $this->assert( 
    … …  
    329328    $this->assert( 
    330329        $basemapping->handlesUser( 
    331             undef, 'RegistrationAgent', 'RegistrationAgent' 
     330            undef, $TWiki::cfg{Register}{RegistrationAgentWikiName}, $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    332331        ) 
    333332    ); 

  • branches/Release04x02/twikiplugins/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingTests.pm

    r641 r662  
    174174    my $ttpath = 
    175175"$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; 
    176     my $me = "RegistrationAgent"; 
     176    my $me = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    177177 
    178178    open( F, ">$ttpath" ) || $this->assert( 0, "open $ttpath failed" ); 
    … …  
    204204    my $this = shift; 
    205205 
    206     my $me = "RegistrationAgent"; 
     206    my $me = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    207207    $ttpath = 
    208208"$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; 
    … …  
    255255sub groupFix { 
    256256    my $this = shift; 
    257     my $me   = "RegistrationAgent"; 
     257    my $me   = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    258258    $twiki->{users}->{mapping}->addUser( "auser", "AaronUser",    $me ); 
    259259    $twiki->{users}->{mapping}->addUser( "guser", "GeorgeUser",   $me ); 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/ClientTests.pm

    r632 r662  
    1717use TWiki::UI::Edit; 
    1818 
    19 my $agent = 'RegistrationAgent'; 
    2019my $userLogin; 
    2120my $userWikiName; 

  • branches/Release04x02/twikiplugins/UnitTestContrib/test/unit/FuncUsersTests.pm

    r632 r662  
    305305        my $sadmin = TWiki::Func::isAnAdmin($u); 
    306306        if ( $u eq $TWiki::cfg{AdminUserWikiName} || 
    307             $u eq 'RegistrationAgent' || 
     307            $u eq $TWiki::cfg{Register}{RegistrationAgentWikiName} || 
    308308            $u eq 'UserA' ) { 
    309309            $this->assert( $sadmin, $u ); 

  • trunk/TopicUserMappingContrib/data/TWiki/UsersTemplate.txt

    r647 r662  
    5050 
    5151__Access Control:__ 
    52    * Set ALLOWTOPICCHANGE = TWikiAdminGroup, RegistrationAgent 
     52   * Set ALLOWTOPICCHANGE = TWikiAdminGroup 

  • trunk/TopicUserMappingContrib/lib/TWiki/Contrib/TopicUserMappingContrib/Config.spec

    r647 r662  
    1515# a link sent in an email to the user's registered email address 
    1616$TWiki::cfg{Register}{NeedVerification} = $FALSE; 
     17 
     18# **STRING 20 EXPERT** 
     19# The internal user that creates user topics on new registrations. You are recommended not to change this. 
     20$TWiki::cfg{Register}{RegistrationAgentWikiName} = 'RegistrationAgent'; 

  • trunk/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingContribTests.pm

    r647 r662  
    8888    my $this = shift; 
    8989 
    90     my $agent = 'RegistrationAgent'; 
    9190    my $userLogin; 
    9291    my $userWikiName; 
    … …  
    290289    $this->assert( $basemapping->handlesUser( undef, 'unknown' ) ); 
    291290    $this->assert( $basemapping->handlesUser( undef, 'ProjectContributor' ) ); 
    292     $this->assert( $basemapping->handlesUser( undef, 'RegistrationAgent' ) ); 
     291    $this->assert( $basemapping->handlesUser( undef, $TWiki::cfg{Register}{RegistrationAgentWikiName} ) ); 
    293292 
    294293    $this->assert( 
    … …  
    306305        $basemapping->handlesUser( undef, undef, 'ProjectContributor' ) ); 
    307306    $this->assert( 
    308         $basemapping->handlesUser( undef, undef, 'RegistrationAgent' ) ); 
     307        $basemapping->handlesUser( undef, undef, $TWiki::cfg{Register}{RegistrationAgentWikiName} ) ); 
    309308 
    310309    $this->assert( 
    … …  
    329328    $this->assert( 
    330329        $basemapping->handlesUser( 
    331             undef, 'RegistrationAgent', 'RegistrationAgent' 
     330            undef, $TWiki::cfg{Register}{RegistrationAgentWikiName}, $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    332331        ) 
    333332    ); 

  • trunk/TopicUserMappingContrib/test/unit/TopicUserMappingContrib/TopicUserMappingTests.pm

    r647 r662  
    174174    my $ttpath = 
    175175"$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; 
    176     my $me = "RegistrationAgent"; 
     176    my $me = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    177177 
    178178    open( F, ">$ttpath" ) || $this->assert( 0, "open $ttpath failed" ); 
    … …  
    204204    my $this = shift; 
    205205 
    206     my $me = "RegistrationAgent"; 
     206    my $me = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    207207    $ttpath = 
    208208"$TWiki::cfg{DataDir}/$TWiki::cfg{UsersWebName}/$TWiki::cfg{UsersTopicName}.txt"; 
    … …  
    255255sub groupFix { 
    256256    my $this = shift; 
    257     my $me   = "RegistrationAgent"; 
     257    my $me   = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    258258    $twiki->{users}->{mapping}->addUser( "auser", "AaronUser",    $me ); 
    259259    $twiki->{users}->{mapping}->addUser( "guser", "GeorgeUser",   $me ); 

  • trunk/UnitTestContrib/test/unit/ClientTests.pm

    r649 r662  
    1616use TWiki::UI::Edit; 
    1717 
    18 my $agent = 'RegistrationAgent'; 
     18my $agent = $TWiki::cfg{Register}{RegistrationAgentWikiName}; 
    1919my $userLogin; 
    2020my $userWikiName; 

  • trunk/UnitTestContrib/test/unit/FuncUsersTests.pm

    r650 r662  
    276276        my $sadmin = TWiki::Func::isAnAdmin($u); 
    277277        if ($u eq $TWiki::cfg{AdminUserWikiName} ||  
    278             $u eq 'RegistrationAgent' || 
     278            $u eq $TWiki::cfg{Register}{RegistrationAgentWikiName} || 
    279279            $u eq 'UserA') { 
    280280                $this->assert($sadmin, $u); 

  • trunk/UserInfoPlugin/lib/TWiki/Plugins/UserInfoPlugin/Core.pm

    r626 r662  
    7373    '|'.'TWikiAdminGroup' . 
    7474    '|'.'UnknownUser' . 
    75     '|'.'RegistrationAgent' . 
     75    '|'.$TWiki::cfg{Register}{RegistrationAgentWikiName} . 
    7676    '|'.'ProjectContributor'; 
    7777 

  • trunk/core/lib/TWiki/UI/Register.pm

    r648 r662  
    4646require TWiki::Sandbox; 
    4747 
    48 my $agent = 'RegistrationAgent'; 
    49  
    5048# Keys from the user data that should *not* be included in 
    5149# the user topic. 
    … …  
    1001999 
    10021000    $session->{store}->saveTopic( 
    1003         $session->{users}->getCanonicalUserID($agent), 
     1001        $session->{users}->getCanonicalUserID($TWiki::cfg{Register}{RegistrationAgentWikiName}), 
    10041002        $TWiki::cfg{UsersWebName}, 
    10051003        $user, $text, $meta 

  • trunk/core/lib/TWiki/Users/BaseUserMapping.pm

    r626 r662  
    3030 
    3131---++ Users 
    32    * TWikiAdmin - uses the password that was set in Configure (IF its not null) 
    33    * TWikiGuest 
     32   * $TWiki::cfg{AdminUserLogin} - TWikiAdmin - uses the password that was set in Configure (IF its not null) 
     33   * $TWiki::cfg{DefaultUserLogin} - TWikiGuest 
    3434   * UnknownUser 
    3535   * ProjectContributor - 1 Jan 2005 
    36    * RegistrationAgent - 1 Jan 2005 
     36   * $TWiki::cfg{Register}{RegistrationAgentWikiName} - RegistrationAgent - 1 Jan 2005 
    3737 
    3838---+++ Groups 
    … …  
    6969        $TWiki::cfg{DefaultUserLogin} => $this->{mapping_id} . '666', 
    7070        unknown                       => $this->{mapping_id} . '999', 
    71         ProjectContributor            => $this->{mapping_id} . '111', 
    72         RegistrationAgent        => $this->{mapping_id} . '222' 
     71        ProjectContributor              => $this->{mapping_id} . '111', 
     72        $TWiki::cfg{Register}{RegistrationAgentWikiName}        => $this->{mapping_id} . '222' 
    7373    }; 
    7474    $this->{U2L} = { 
    … …  
    7777        $this->{mapping_id} . '999' => 'unknown', 
    7878        $this->{mapping_id} . '111' => 'ProjectContributor', 
    79         $this->{mapping_id} . '222' => 'RegistrationAgent' 
     79        $this->{mapping_id} . '222' => $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    8080    }; 
    8181    $this->{U2W} = { 
    … …  
    8484        $this->{mapping_id} . '999' => 'UnknownUser', 
    8585        $this->{mapping_id} . '111' => 'ProjectContributor', 
    86         $this->{mapping_id} . '222' => 'RegistrationAgent' 
     86        $this->{mapping_id} . '222' => $TWiki::cfg{Register}{RegistrationAgentWikiName} 
    8787    }; 
    8888    $this->{W2U} = { 
    … …  
    9191        UnknownUser                      => $this->{mapping_id} . '999', 
    9292        ProjectContributor               => $this->{mapping_id} . '111', 
    93         RegistrationAgent           => $this->{mapping_id} . '222' 
     93        $TWiki::cfg{Register}{RegistrationAgentWikiName}    => $this->{mapping_id} . '222' 
    9494    }; 
    9595    $this->{U2E} = 
Note: See TracChangeset for help on using the changeset viewer.