Changeset 674


Ignore:
Timestamp:
11/15/08 06:37:48 (4 years ago)
Author:
SvenDowideit
Message:

Item109: WikiAdminUser->AdminUser

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/Release04x02/data/Main/AdminUser.txt

    r673 r674  
    1515      * click the [[%LOGOUTURL%][Logout link]] 
    1616 
    17 __%X% NOTE:__ If you lock yourself out of <nop>WikiAdminUser during setup activities or have forgotten the configure password, 
     17__%X% NOTE:__ If you lock yourself out of <nop>AdminUser during setup activities or have forgotten the configure password, 
    1818you can unset the configure password by editing the =lib/LocalSite.cfg= file and deleting the line that starts 
    1919with =$TWiki::cfg{Password}= and then set it again by saving your settings in =configure=. 

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

    r672 r674  
    322322      * Set DOCWEB = %SYSTEMWEB% 
    323323       
    324    * show extra help for !ApacheLogin users for Main.WikiAdminUser login 
     324   * show extra help for !ApacheLogin users for Main.AdminUser login 
    325325      * Set ADMINLOGIN = %IF{"{LoginManager} = 'TWiki::LoginManager::ApacheLogin' AND NOT context authenticated" 
    326326        then="TWiki is configured using <nop>ApacheLogin, please [[%LOGINURL%][login]] as a normal user first. Then the Admin Login will replace this text" 

  • branches/Release04x02/lib/MANIFEST

    r671 r674  
    5555data/Main/ProjectContributor.txt 0644 
    5656data/Main/SitePreferences.txt 0644 
    57 data/Main/WikiAdminUser.txt 0644 
     57data/Main/AdminUser.txt 0644 
    5858data/Main/TWikiGroups.txt 0644 
    5959data/Main/WikiGuest.txt 0644 

  • branches/Release04x02/lib/TWiki.spec

    r671 r674  
    311311# **STRING 20 EXPERT** 
    312312# An internal admin user login name (matched with the configure password, if set) 
    313 # which can be used as a temporary Admin login (see: Main.WikiAdminUser). 
     313# which can be used as a temporary Admin login (see: Main.AdminUser). 
    314314# This login name is additionally required by the install script for some addons 
    315315# and plugins, usually to gain write access to the TWiki web. 
    … …  
    320320# An admin user WikiName what is displayed for actions done by the AdminUserLogin 
    321321# You should normally not need to change this. (you will need to move the  
    322 # %USERSWEB%.WikiAdminUser topic to match) 
    323 $TWiki::cfg{AdminUserWikiName} = 'WikiAdminUser'; 
     322# %USERSWEB%.AdminUser topic to match) 
     323$TWiki::cfg{AdminUserWikiName} = 'AdminUser'; 
    324324 
    325325# **STRING 20 EXPERT** 
    … …  
    373373#  determine user information, and group memberships. 
    374374# </li><li> 
    375 #  TWiki::Users::BaseUserMapping - has only pseudo users such as {WikiAdminUser} and 
     375#  TWiki::Users::BaseUserMapping - has only pseudo users such as {AdminUser} and 
    376376#  {DefaultUserWikiName}, with the Admins login and password being set from this 
    377377#  configure script. <b>Does not support User registration</b>, and 

  • trunk/AttachmentListPlugin/data/TWiki/AttachmentListPlugin.txt

    r671 r674  
    4040| =excludeextension=  | Comma-separated list of file extensions to not show | none | =excludeextension="htm"= | 
    4141| =user=  | Comma-separated list of user names (that have attached an attachment) to be listed. To find attachments where no user is specified, use =UnknownUser=. | none | =user="ProjectContributor"= | 
    42 | =excludeuser=  | Comma-separated list of user names (that have attached an attachment) to not show | none | =excludeuser="<nop>ProjectContributor, <nop>WikiAdminUser, <nop>WikiGuest, <nop>UnknownUser"= | 
     42| =excludeuser=  | Comma-separated list of user names (that have attached an attachment) to not show | none | =excludeuser="<nop>ProjectContributor, <nop>AdminUser, <nop>WikiGuest, <nop>UnknownUser"= | 
    4343| =hide=      | Set to "on" to show only non-hidden attachments | show all attachments | =hide="on"= | 
    4444| =fromdate=, =todate=  | Date range filter: show attachments between =fromdate= and =todate=; dates are specified in format =yyyy/mm/dd= \ 

  • trunk/AttachmentListPlugin/test/unit/AttachmentListPlugin/AttachmentListPluginTests.pm

    r671 r674  
    6464            name    => 'F_report.doc', 
    6565            size    => 0, 
    66             user    => 'WikiAdminUser', 
     66            user    => 'AdminUser', 
    6767            date    => 1600000000, 
    6868            hidden  => '', 
    … …  
    8282            name    => 'H_AUTHORS', 
    8383            size    => 2, 
    84             user    => 'WikiAdminUser', 
     84            user    => 'AdminUser', 
    8585            date    => 1800000000, 
    8686            hidden  => '', 
    … …  
    9090    topic5 => { 
    9191        name        => 'AttachmentListTestTopic5', 
    92         text        => "\n   * Set ALLOWTOPICVIEW = WikiAdminUser", 
     92        text        => "\n   * Set ALLOWTOPICVIEW = AdminUser", 
    9393        attachment1 => { 
    9494            name    => 'I_no_permission.txt', 
    … …  
    101101            name    => 'J_DIRECTORS', 
    102102            size    => 20, 
    103             user    => 'WikiAdminUser', 
     103            user    => 'AdminUser', 
    104104            date    => 1800000000, 
    105105            hidden  => '', 
    … …  
    10021002 
    10031003    my $expected = 
    1004       'MaryDoe,AdamBlithe,WikiAdminUser,UnknownUser,WikiAdminUser'; 
     1004      'MaryDoe,AdamBlithe,AdminUser,UnknownUser,AdminUser'; 
    10051005 
    10061006    $this->do_test( $testTopic1, $expected, $source ); 
    … …  
    13181318 
    13191319    my $expected = 
    1320 'AdamBlithe,JohnDoe,JohnDoe,KathyJones,MaryDoe,WikiAdminUser,WikiAdminUser,UnknownUser'; 
     1320'AdamBlithe,JohnDoe,JohnDoe,KathyJones,MaryDoe,AdminUser,AdminUser,UnknownUser'; 
    13211321 
    13221322    $this->do_test( $testTopic1, $expected, $source ); 
    … …  
    13381338 
    13391339    my $expected = 
    1340 'UnknownUser,WikiAdminUser,WikiAdminUser,MaryDoe,KathyJones,JohnDoe,JohnDoe,AdamBlithe'; 
     1340'UnknownUser,AdminUser,AdminUser,MaryDoe,KathyJones,JohnDoe,JohnDoe,AdamBlithe'; 
    13411341 
    13421342    $this->do_test( $testTopic1, $expected, $source ); 
    … …  
    13581358 
    13591359    my $expected = 
    1360 'UnknownUser,WikiAdminUser,WikiAdminUser,MaryDoe,KathyJones,JohnDoe,JohnDoe,AdamBlithe'; 
     1360'UnknownUser,AdminUser,AdminUser,MaryDoe,KathyJones,JohnDoe,JohnDoe,AdamBlithe'; 
    13611361 
    13621362    $this->do_test( $testTopic1, $expected, $source ); 

  • trunk/FormFieldListPlugin/data/TWiki/FormFieldListPlugin.txt

    r671 r674  
    3333| *Parameter* | *Comment* | *Default value* | *Example* | 
    3434| =user=  | Comma-separated list of user names (that have changed the containing topic last) to be listed. To find topics where no user is specified, use =UnknownUser=. | none | =user="ProjectContributor"= | 
    35 | =excludeuser=  | Comma-separated list of user names (that have changed the containing topic last) to not show. | none | =excludeuser="<nop>ProjectContributor, <nop>WikiAdminUser, <nop>WikiGuest, <nop>UnknownUser"= | 
     35| =excludeuser=  | Comma-separated list of user names (that have changed the containing topic last) to not show. | none | =excludeuser="<nop>ProjectContributor, <nop>AdminUser, <nop>WikiGuest, <nop>UnknownUser"= | 
    3636| =fromdate=, =todate=  | Date range filter: show topics between =fromdate= and =todate= (topic changed dates); dates are specified in format =yyyy/mm/dd= \ 
    3737%BB% =fromdate="" todate="2007/09/01"= selects all topics up to 1 Sep 2007 \ 

  • trunk/FormFieldListPlugin/test/unit/FormFieldListPlugin/FormFieldListPluginTests.pm

    r671 r674  
    7979    topic4 => { 
    8080        name   => 'FormFieldListTestTopic4', 
    81         user   => 'WikiAdminUser', 
     81        user   => 'AdminUser', 
    8282        date   => 1400000000, 
    8383        form   => 'ProjectForm', 
    … …  
    667667topic=FormFieldListTestTopic3, last changed by WikiGuest 
    668668topic=FormFieldListTestTopic3, last changed by WikiGuest 
    669 topic=FormFieldListTestTopic4, last changed by WikiAdminUser 
    670 topic=FormFieldListTestTopic4, last changed by WikiAdminUser 
    671 topic=FormFieldListTestTopic4, last changed by WikiAdminUser'; 
     669topic=FormFieldListTestTopic4, last changed by AdminUser 
     670topic=FormFieldListTestTopic4, last changed by AdminUser 
     671topic=FormFieldListTestTopic4, last changed by AdminUser'; 
    672672 
    673673    $this->do_test( $testTopic, $expected, $source ); 
    … …  
    15171517user=ScumBag 
    15181518user=ScumBag 
    1519 user=WikiAdminUser 
    1520 user=WikiAdminUser 
    1521 user=WikiAdminUser 
     1519user=AdminUser 
     1520user=AdminUser 
     1521user=AdminUser 
    15221522user=ProjectContributor 
    15231523user=ProjectContributor 

  • trunk/core/data/Main/AdminUser.txt

    r673 r674  
    1515      * click the [[%LOGOUTURL%][Logout link]] 
    1616 
    17 __%X% NOTE:__ If you lock yourself out of <nop>WikiAdminUser during setup activities or have forgotten the configure password, 
     17__%X% NOTE:__ If you lock yourself out of <nop>AdminUser during setup activities or have forgotten the configure password, 
    1818you can unset the configure password by editing the =lib/LocalSite.cfg= file and deleting the line that starts 
    1919with =$TWiki::cfg{Password}= and then set it again by saving your settings in =configure=. 

  • trunk/core/data/TWiki/DefaultPreferences.txt

    r672 r674  
    322322      * Set DOCWEB = %SYSTEMWEB% 
    323323       
    324    * show extra help for !ApacheLogin users for Main.WikiAdminUser login 
     324   * show extra help for !ApacheLogin users for Main.AdminUser login 
    325325      * Set ADMINLOGIN = %IF{"{LoginManager} = 'TWiki::LoginManager::ApacheLogin' AND NOT context authenticated" 
    326326        then="TWiki is configured using <nop>ApacheLogin, please [[%LOGINURL%][login]] as a normal user first. Then the Admin Login will replace this text" 

  • trunk/core/lib/TWiki.spec

    r671 r674  
    311311# **STRING 20 EXPERT** 
    312312# An internal admin user login name (matched with the configure password, if set) 
    313 # which can be used as a temporary Admin login (see: Main.WikiAdminUser). 
     313# which can be used as a temporary Admin login (see: Main.AdminUser). 
    314314# This login name is additionally required by the install script for some addons 
    315315# and plugins, usually to gain write access to the TWiki web. 
    … …  
    320320# An admin user WikiName what is displayed for actions done by the AdminUserLogin 
    321321# You should normally not need to change this. (you will need to move the  
    322 # %USERSWEB%.WikiAdminUser topic to match) 
    323 $TWiki::cfg{AdminUserWikiName} = 'WikiAdminUser'; 
     322# %USERSWEB%.AdminUser topic to match) 
     323$TWiki::cfg{AdminUserWikiName} = 'AdminUser'; 
    324324 
    325325# **STRING 20 EXPERT** 
    … …  
    373373#  determine user information, and group memberships. 
    374374# </li><li> 
    375 #  TWiki::Users::BaseUserMapping - has only pseudo users such as {WikiAdminUser} and 
     375#  TWiki::Users::BaseUserMapping - has only pseudo users such as {AdminUser} and 
    376376#  {DefaultUserWikiName}, with the Admins login and password being set from this 
    377377#  configure script. <b>Does not support User registration</b>, and 

  • trunk/core/lib/TWiki/Contrib/core/MANIFEST

    r671 r674  
    5959data/Main/ProjectContributor.txt 0644 
    6060data/Main/SitePreferences.txt 0644 
    61 data/Main/WikiAdminUser.txt 0644 
     61data/Main/AdminUser.txt 0644 
    6262data/Main/TWikiGroups.txt 0644 
    6363data/Main/WikiGuest.txt 0644 
Note: See TracChangeset for help on using the changeset viewer.