Changeset 809 for trunk/core/lib/Foswiki.pm

Timestamp:

11/19/08 13:40:25 (4 years ago)

Author:

CrawfordCurrie

Message:

Item175: First bulk rename pass. Note: not quite ready yet

File:

• trunk/core/lib/Foswiki.pm (moved) (moved from trunk/core/lib/TWiki.pm) (95 diffs)

trunk/core/lib/Foswiki.pm

@@ -1 +1 @@
 # See bottom of file for license and copyright information
-package TWiki;
+package Foswiki;
 
 =pod
@@ -16 +16 @@
 
 ---++ Public Data members
-   * =request=          Pointer to the TWiki::Request
-   * =response=         Pointer to the TWiki::Respose
+   * =request=          Pointer to the Foswiki::Request
+   * =response=         Pointer to the Foswiki::Respose
    * =context=          Hash of context ids
-   * moved: =loginManager=     TWiki::LoginManager singleton (moved to TWiki::Users)
-   * =plugins=          TWiki::Plugins singleton
-   * =prefs=            TWiki::Prefs singleton
+   * moved: =loginManager=     Foswiki::LoginManager singleton (moved to Foswiki::Users)
+   * =plugins=          Foswiki::Plugins singleton
+   * =prefs=            Foswiki::Prefs singleton
    * =remoteUser=       Login ID when using ApacheLogin. Maintained for
                         compatibility only, do not use.
    * =requestedWebName= Name of web found in URL path or =web= URL parameter
-   * =sandbox=          TWiki::Sandbox singleton
+   * =sandbox=          Foswiki::Sandbox singleton
    * =scriptUrlPath=    URL path to the current script. May be dynamically
                         extracted from the URL path if {GetScriptUrlFromCgi}.
                         Only required to support {GetScriptUrlFromCgi} and
                         not consistently used. Avoid.
-   * =security=         TWiki::Access singleton
+   * =security=         Foswiki::Access singleton
    * =SESSION_TAGS=     Hash of TWiki variables whose value is specific to
                         the current request.
-   * =store=            TWiki::Store singleton
+   * =store=            Foswiki::Store singleton
    * =topicName=        Name of topic found in URL path or =topic= URL
                         parameter
@@ -40 +40 @@
                         {DefaultUrlHost}
    * =user=             Unique user ID of logged-in user
-   * =users=            TWiki::Users singleton
+   * =users=            Foswiki::Users singleton
    * =webName=          Name of web found in URL path, or =web= URL parameter,
                         or {UsersWebName}
@@ -50 +50 @@
 use Error qw( :try );
 use CGI;    # Always required to get html generation tags;
-use TWiki::Response;
-use TWiki::Request;
+
+BEGIN { $Package::Alias::BRAVE = 1 }
+use Package::Alias
+  'TWiki::Plugins' => 'Foswiki::Plugins',
+  'TWiki::Func' => 'Foswiki::Func';
+{ package TWiki::Func; }
+
+use Foswiki::Response;
+use Foswiki::Request;
 
 require 5.005;    # For regex objects and internationalisation
@@ -60 +67 @@
 # Uncomment this and the __END__ to enable AutoLoader
 #use AutoLoader 'AUTOLOAD';
-# You then need to autosplit TWiki.pm:
+# You then need to autosplit Foswiki.pm:
 # cd lib
-# perl -e 'use AutoSplit; autosplit("TWiki.pm", "auto")'
+# perl -e 'use AutoSplit; autosplit("Foswiki.pm", "auto")'
 
 # Other computed constants
@@ -96 +103 @@
 ---++ StaticMethod getTWikiLibDir() -> $path
 
-Returns the full path of the directory containing TWiki.pm
+Returns the full path of the directory containing Foswiki.pm
 
 =cut
@@ -105 +112 @@
     }
 
-    # FIXME: Should just use $INC{"TWiki.pm"} to get path used to load this
+    # FIXME: Should just use $INC{"Foswiki.pm"} to get path used to load this
     # module.
     my $dir = '';
     foreach $dir (@INC) {
-        if ( $dir && -e "$dir/TWiki.pm" ) {
+        if ( $dir && -e "$dir/Foswiki.pm" ) {
             $twikiLibDir = $dir;
             last;
@@ -156 +163 @@
 BEGIN {
     require Monitor;
-    require TWiki::Sandbox;                  # system command sandbox
-    require TWiki::Configure::Load;          # read configuration files
+    require Foswiki::Sandbox;                  # system command sandbox
+    require Foswiki::Configure::Load;          # read configuration files
 
     $TRUE  = 1;
@@ -256 +263 @@
     $contextFreeSyntax{IF} = 1;
 
-    unless ( ( $TWiki::cfg{DetailedOS} = $^O ) ) {
+    unless ( ( $Foswiki::cfg{DetailedOS} = $^O ) ) {
         require Config;
-        $TWiki::cfg{DetailedOS} = $Config::Config{'osname'};
-    }
-    $TWiki::cfg{OS} = 'UNIX';
-    if ( $TWiki::cfg{DetailedOS} =~ /darwin/i ) {    # MacOS X
-        $TWiki::cfg{OS} = 'UNIX';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /Win/i ) {
-        $TWiki::cfg{OS} = 'WINDOWS';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /vms/i ) {
-        $TWiki::cfg{OS} = 'VMS';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /bsdos/i ) {
-        $TWiki::cfg{OS} = 'UNIX';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /dos/i ) {
-        $TWiki::cfg{OS} = 'DOS';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /^MacOS$/i ) {    # MacOS 9 or earlier
-        $TWiki::cfg{OS} = 'MACINTOSH';
-    }
-    elsif ( $TWiki::cfg{DetailedOS} =~ /os2/i ) {
-        $TWiki::cfg{OS} = 'OS2';
+        $Foswiki::cfg{DetailedOS} = $Config::Config{'osname'};
+    }
+    $Foswiki::cfg{OS} = 'UNIX';
+    if ( $Foswiki::cfg{DetailedOS} =~ /darwin/i ) {    # MacOS X
+        $Foswiki::cfg{OS} = 'UNIX';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /Win/i ) {
+        $Foswiki::cfg{OS} = 'WINDOWS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /vms/i ) {
+        $Foswiki::cfg{OS} = 'VMS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /bsdos/i ) {
+        $Foswiki::cfg{OS} = 'UNIX';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /dos/i ) {
+        $Foswiki::cfg{OS} = 'DOS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /^MacOS$/i ) {    # MacOS 9 or earlier
+        $Foswiki::cfg{OS} = 'MACINTOSH';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /os2/i ) {
+        $Foswiki::cfg{OS} = 'OS2';
     }
 
@@ -290 +297 @@
     {
         $ENV{SERVER_NAME} =
-          TWiki::Sandbox::untaintUnchecked( $ENV{SERVER_NAME} );
-    }
-
-    # readConfig is defined in TWiki::Configure::Load to allow overriding it
-    TWiki::Configure::Load::readConfig();
-
-    if ( $TWiki::cfg{WarningsAreErrors} ) {
+          Foswiki::Sandbox::untaintUnchecked( $ENV{SERVER_NAME} );
+    }
+
+    # readConfig is defined in Foswiki::Configure::Load to allow overriding it
+    Foswiki::Configure::Load::readConfig();
+
+    if ( $Foswiki::cfg{WarningsAreErrors} ) {
 
         # Note: Warnings are always errors if ASSERTs are enabled
@@ -302 +309 @@
     }
 
-    if ( $TWiki::cfg{UseLocale} ) {
+    if ( $Foswiki::cfg{UseLocale} ) {
         require locale;
         import locale();
@@ -309 +316 @@
     # Constant tags dependent on the config
     $functionTags{ALLOWLOGINNAME} =
-      sub { $TWiki::cfg{Register}{AllowLoginName} || 0 };
-    $functionTags{AUTHREALM}      = sub { $TWiki::cfg{AuthRealm} };
-    $functionTags{DEFAULTURLHOST} = sub { $TWiki::cfg{DefaultUrlHost} };
-    $functionTags{HOMETOPIC}      = sub { $TWiki::cfg{HomeTopicName} };
-    $functionTags{LOCALSITEPREFS} = sub { $TWiki::cfg{LocalSitePreferences} };
+      sub { $Foswiki::cfg{Register}{AllowLoginName} || 0 };
+    $functionTags{AUTHREALM}      = sub { $Foswiki::cfg{AuthRealm} };
+    $functionTags{DEFAULTURLHOST} = sub { $Foswiki::cfg{DefaultUrlHost} };
+    $functionTags{HOMETOPIC}      = sub { $Foswiki::cfg{HomeTopicName} };
+    $functionTags{LOCALSITEPREFS} = sub { $Foswiki::cfg{LocalSitePreferences} };
     $functionTags{NOFOLLOW} =
-      sub { $TWiki::cfg{NoFollow} ? 'rel=' . $TWiki::cfg{NoFollow} : '' };
-    $functionTags{NOTIFYTOPIC}       = sub { $TWiki::cfg{NotifyTopicName} };
-    $functionTags{SCRIPTSUFFIX}      = sub { $TWiki::cfg{ScriptSuffix} };
-    $functionTags{STATISTICSTOPIC}   = sub { $TWiki::cfg{Stats}{TopicName} };
-    $functionTags{SYSTEMWEB}         = sub { $TWiki::cfg{SystemWebName} };
-    $functionTags{TRASHWEB}          = sub { $TWiki::cfg{TrashWebName} };
-    $functionTags{WIKIADMINLOGIN}   = sub { $TWiki::cfg{AdminUserLogin} };
-    $functionTags{USERSWEB}          = sub { $TWiki::cfg{UsersWebName} };
-    $functionTags{WEBPREFSTOPIC}     = sub { $TWiki::cfg{WebPrefsTopicName} };
-    $functionTags{WIKIPREFSTOPIC}    = sub { $TWiki::cfg{SitePrefsTopicName} };
-    $functionTags{WIKIUSERSTOPIC}    = sub { $TWiki::cfg{UsersTopicName} };
-    $functionTags{WIKIWEBMASTER}     = sub { $TWiki::cfg{WebMasterEmail} };
-    $functionTags{WIKIWEBMASTERNAME} = sub { $TWiki::cfg{WebMasterName} };
+      sub { $Foswiki::cfg{NoFollow} ? 'rel=' . $Foswiki::cfg{NoFollow} : '' };
+    $functionTags{NOTIFYTOPIC}       = sub { $Foswiki::cfg{NotifyTopicName} };
+    $functionTags{SCRIPTSUFFIX}      = sub { $Foswiki::cfg{ScriptSuffix} };
+    $functionTags{STATISTICSTOPIC}   = sub { $Foswiki::cfg{Stats}{TopicName} };
+    $functionTags{SYSTEMWEB}         = sub { $Foswiki::cfg{SystemWebName} };
+    $functionTags{TRASHWEB}          = sub { $Foswiki::cfg{TrashWebName} };
+    $functionTags{WIKIADMINLOGIN}   = sub { $Foswiki::cfg{AdminUserLogin} };
+    $functionTags{USERSWEB}          = sub { $Foswiki::cfg{UsersWebName} };
+    $functionTags{WEBPREFSTOPIC}     = sub { $Foswiki::cfg{WebPrefsTopicName} };
+    $functionTags{WIKIPREFSTOPIC}    = sub { $Foswiki::cfg{SitePrefsTopicName} };
+    $functionTags{WIKIUSERSTOPIC}    = sub { $Foswiki::cfg{UsersTopicName} };
+    $functionTags{WIKIWEBMASTER}     = sub { $Foswiki::cfg{WebMasterEmail} };
+    $functionTags{WIKIWEBMASTERNAME} = sub { $Foswiki::cfg{WebMasterName} };
 
     # Compatibility synonyms, deprecated in 4.2 but still used throughout
@@ -341 +348 @@
     # this in 'non-locale regexes' mode.
 
-    if ( $TWiki::cfg{UseLocale} ) {
+    if ( $Foswiki::cfg{UseLocale} ) {
 
         # Set environment variables for grep
-        $ENV{LC_CTYPE} = $TWiki::cfg{Site}{Locale};
+        $ENV{LC_CTYPE} = $Foswiki::cfg{Site}{Locale};
 
         # Load POSIX for I18N support.
@@ -353 +360 @@
         # won't this play with the Apache process's locale settings too?
         # What effects would this have?
-        setlocale( &LC_CTYPE,   $TWiki::cfg{Site}{Locale} );
-        setlocale( &LC_COLLATE, $TWiki::cfg{Site}{Locale} );
+        setlocale( &LC_CTYPE,   $Foswiki::cfg{Site}{Locale} );
+        setlocale( &LC_COLLATE, $Foswiki::cfg{Site}{Locale} );
     }
 
     $functionTags{CHARSET} = sub {
-        $TWiki::cfg{Site}{CharSet}
+        $Foswiki::cfg{Site}{CharSet}
           || 'iso-8859-1';
     };
 
     $functionTags{LANG} = sub {
-        $TWiki::cfg{Site}{Locale} =~ m/^([a-z]+_[a-z]+)/i ? $1 : 'en_US';
+        $Foswiki::cfg{Site}{Locale} =~ m/^([a-z]+_[a-z]+)/i ? $1 : 'en_US';
     };
 
@@ -376 +383 @@
     # Depends on locale mode and Perl version, and finally on
     # whether locale-based regexes are turned off.
-    if (   not $TWiki::cfg{UseLocale}
+    if (   not $Foswiki::cfg{UseLocale}
         or $] < 5.006
-        or not $TWiki::cfg{Site}{LocaleRegexes} )
+        or not $Foswiki::cfg{Site}{LocaleRegexes} )
     {
 
         # No locales needed/working, or Perl 5.005, so just use
         # any additional national characters defined in TWiki.cfg
-        $regex{upperAlpha} = 'A-Z' . $TWiki::cfg{UpperNational};
-        $regex{lowerAlpha} = 'a-z' . $TWiki::cfg{LowerNational};
+        $regex{upperAlpha} = 'A-Z' . $Foswiki::cfg{UpperNational};
+        $regex{lowerAlpha} = 'a-z' . $Foswiki::cfg{LowerNational};
         $regex{numeric}    = '\d';
         $regex{mixedAlpha} = $regex{upperAlpha} . $regex{lowerAlpha};
@@ -404 +411 @@
     # book at http://regex.info/.
 
-    $regex{linkProtocolPattern} = $TWiki::cfg{LinkProtocolPattern};
+    $regex{linkProtocolPattern} = $Foswiki::cfg{LinkProtocolPattern};
 
     # Header patterns based on '+++'. The '###' are reserved for numbered
@@ -422 +429 @@
     $regex{webNameBaseRegex} =
       qr/[$regex{upperAlpha}]+[$regex{mixedAlphaNum}_]*/o;
-    if ( $TWiki::cfg{EnableHierarchicalWebs} ) {
+    if ( $Foswiki::cfg{EnableHierarchicalWebs} ) {
         $regex{webNameRegex} =
           qr/$regex{webNameBaseRegex}(?:(?:[\.\/]$regex{webNameBaseRegex})+)*/o;
@@ -501 +508 @@
     # Check for unsafe search regex mode (affects filtering in) - default
     # to safe mode
-    $TWiki::cfg{ForceUnsafeRegexes} = 0
-      unless defined $TWiki::cfg{ForceUnsafeRegexes};
+    $Foswiki::cfg{ForceUnsafeRegexes} = 0
+      unless defined $Foswiki::cfg{ForceUnsafeRegexes};
 
     # initialize lib directory early because of later 'cd's
@@ -508 +515 @@
 
     # initialize the runtime engine
-    if ( !defined $TWiki::cfg{Engine} ) {
+    if ( !defined $Foswiki::cfg{Engine} ) {
 
         # Caller did not define an engine; try and work it out (mainly for
         # the benefit of pre-5.0 CGI scripts)
         if ( defined $ENV{GATEWAY_INTERFACE} ) {
-            $TWiki::cfg{Engine} = 'TWiki::Engine::CGI';
+            $Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
             use CGI::Carp qw(fatalsToBrowser);
             $SIG{__DIE__} = \&CGI::Carp::confess;
         }
         else {
-            $TWiki::cfg{Engine} = 'TWiki::Engine::CLI';
+            $Foswiki::cfg{Engine} = 'Foswiki::Engine::CLI';
             require Carp;
             $SIG{__DIE__} = \&Carp::confess;
         }
     }
-    $engine = eval qq(use $TWiki::cfg{Engine}; $TWiki::cfg{Engine}->new);
+    $engine = eval qq(use $Foswiki::cfg{Engine}; $Foswiki::cfg{Engine}->new);
     die $@ if $@;
 
@@ -541 +548 @@
     my ( $this, $text ) = @_;
 
-    return $text unless ( defined $TWiki::cfg{Site}{CharSet} );
+    return $text unless ( defined $Foswiki::cfg{Site}{CharSet} );
 
     # Detect character encoding of the full topic name from URL
@@ -550 +557 @@
 
     # If site charset is already UTF-8, there is no need to convert anything:
-    if ( $TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/i ) {
+    if ( $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8$/i ) {
 
         # warn if using Perl older than 5.8
@@ -567 +574 @@
     # Convert into ISO-8859-1 if it is the site charset.  This conversion
     # is *not valid for ISO-8859-15*.
-    if ( $TWiki::cfg{Site}{CharSet} =~ /^iso-?8859-?1$/i ) {
+    if ( $Foswiki::cfg{Site}{CharSet} =~ /^iso-?8859-?1$/i ) {
 
         # ISO-8859-1 maps onto first 256 codepoints of Unicode
@@ -582 +589 @@
             import Encode qw(:fallbacks);
 
-            # Map $TWiki::cfg{Site}{CharSet} into real encoding name
+            # Map $Foswiki::cfg{Site}{CharSet} into real encoding name
             my $charEncoding =
-              Encode::resolve_alias( $TWiki::cfg{Site}{CharSet} );
+              Encode::resolve_alias( $Foswiki::cfg{Site}{CharSet} );
             if ( not $charEncoding ) {
                 $this->writeWarning( 'Conversion to "'
-                      . $TWiki::cfg{Site}{CharSet}
+                      . $Foswiki::cfg{Site}{CharSet}
                       . '" not supported, or name not recognised - check '
                       . '"perldoc Encode::Supported"' );
@@ -605 +612 @@
         else {
             require Unicode::MapUTF8;    # Pre-5.8 Perl versions
-            my $charEncoding = $TWiki::cfg{Site}{CharSet};
+            my $charEncoding = $Foswiki::cfg{Site}{CharSet};
             if ( not Unicode::MapUTF8::utf8_supported_charset($charEncoding) ) {
                 $this->writeWarning( 'Conversion to "'
-                      . $TWiki::cfg{Site}{CharSet}
+                      . $Foswiki::cfg{Site}{CharSet}
                       . '" not supported, or name not recognised - check '
                       . '"perldoc Unicode::MapUTF8"' );
@@ -710 +717 @@
 
         # Get time now in HTTP header format
-        require TWiki::Time;
+        require Foswiki::Time;
         my $lastModifiedString =
-          TWiki::Time::formatTime( time, '$http', 'gmtime' );
+          Foswiki::Time::formatTime( time, '$http', 'gmtime' );
 
         # Expiry time is set high to avoid any data loss.  Each instance of
@@ -743 +750 @@
 
     $contentType = 'text/html' unless $contentType;
-    if ( defined( $TWiki::cfg{Site}{CharSet} ) ) {
-        $contentType .= '; charset=' . $TWiki::cfg{Site}{CharSet};
+    if ( defined( $Foswiki::cfg{Site}{CharSet} ) ) {
+        $contentType .= '; charset=' . $Foswiki::cfg{Site}{CharSet};
     }
 
@@ -772 +779 @@
 
     #TODO: this should really use URI
-    if (   ( !$TWiki::cfg{AllowRedirectUrl} )
+    if (   ( !$Foswiki::cfg{AllowRedirectUrl} )
         && ( $redirect =~ m!^([^:]*://[^/]*)/*(.*)?$! ) )
     {
@@ -778 +785 @@
 
         #remove trailing /'s to match
-        $TWiki::cfg{DefaultUrlHost} =~ m!^([^:]*://[^/]*)/*(.*)?$!;
+        $Foswiki::cfg{DefaultUrlHost} =~ m!^([^:]*://[^/]*)/*(.*)?$!;
         my $expected = $1;
 
-        if ( defined( $TWiki::cfg{PermittedRedirectHostUrls} )
-            && $TWiki::cfg{PermittedRedirectHostUrls} ne '' )
+        if ( defined( $Foswiki::cfg{PermittedRedirectHostUrls} )
+            && $Foswiki::cfg{PermittedRedirectHostUrls} ne '' )
         {
             my @permitted =
               map { s!^([^:]*://[^/]*)/*(.*)?$!$1!; $1 }
-              split( /,\s*/, $TWiki::cfg{PermittedRedirectHostUrls} );
+              split( /,\s*/, $Foswiki::cfg{PermittedRedirectHostUrls} );
             return 1 if ( grep ( { uc($host) eq uc($_) } @permitted ) );
         }
@@ -913 +920 @@
         $url = $this->getScriptUrl(
             1, 'oops',
-            $this->{web}   || $TWiki::cfg{UsersWebName},
-            $this->{topic} || $TWiki::cfg{HomeTopicName},
+            $this->{web}   || $Foswiki::cfg{UsersWebName},
+            $this->{topic} || $Foswiki::cfg{HomeTopicName},
             template => 'oopsaccessdenied',
             def      => 'topic_access',
@@ -921 +928 @@
               . $url
               . ': host does not match {DefaultUrlHost} , and is not in {PermittedRedirectHostUrls}"'
-              . $TWiki::cfg{DefaultUrlHost} . '"'
+              . $Foswiki::cfg{DefaultUrlHost} . '"'
         );
     }
@@ -961 +968 @@
     $md5->add( $$, time(), rand(time) );
     my $uid              = $md5->hexdigest();
-    my $passthruFilename = "$TWiki::cfg{WorkingDir}/tmp/passthru_$uid";
+    my $passthruFilename = "$Foswiki::cfg{WorkingDir}/tmp/passthru_$uid";
 
     use Fcntl;
@@ -968 +975 @@
     sysopen( F, "$passthruFilename", O_RDWR | O_EXCL | O_CREAT, 0600 )
       || die
-"Unable to open $TWiki::cfg{WorkingDir}/tmp for write; check the setting of {WorkingDir} in configure, and check file permissions: $!";
+"Unable to open $Foswiki::cfg{WorkingDir}/tmp for write; check the setting of {WorkingDir} in configure, and check file permissions: $!";
     $query->save( \*F );
     close(F);
@@ -1022 +1029 @@
 otherwise only user web names are valid
 
-If $TWiki::cfg{EnableHierarchicalWebs} is off, it will also return false
+If $Foswiki::cfg{EnableHierarchicalWebs} is off, it will also return false
 when a nested web name is passed to it.
 
@@ -1049 +1056 @@
 
     my @mirrorInfo = ( '', '', '', '' );
-    if ( $TWiki::cfg{SiteWebTopicName} ) {
+    if ( $Foswiki::cfg{SiteWebTopicName} ) {
         my $mirrorSiteName =
           $this->{prefs}->getWebPreferencesValue( 'MIRRORSITENAME', $theWeb );
         if (   $mirrorSiteName
-            && $mirrorSiteName ne $TWiki::cfg{SiteWebTopicName} )
+            && $mirrorSiteName ne $Foswiki::cfg{SiteWebTopicName} )
         {
             my $mirrorViewURL =
@@ -1067 +1074 @@
             $mirrorNote =
               $this->renderer->getRenderedVersion( $mirrorNote, $theWeb,
-                $TWiki::cfg{HomeTopic} );
+                $Foswiki::cfg{HomeTopic} );
             $mirrorNote =~ s/\s*$//g;
             @mirrorInfo =
@@ -1141 +1148 @@
 
     my $url;
-    if ( defined $TWiki::cfg{ScriptUrlPaths} && $script ) {
-        $url = $TWiki::cfg{ScriptUrlPaths}{$script};
+    if ( defined $Foswiki::cfg{ScriptUrlPaths} && $script ) {
+        $url = $Foswiki::cfg{ScriptUrlPaths}{$script};
     }
     unless ( defined($url) ) {
-        $url = $TWiki::cfg{ScriptUrlPath};
+        $url = $Foswiki::cfg{ScriptUrlPath};
         if ($script) {
             $url .= '/' unless $url =~ /\/$/;
             $url .= $script;
             if (
-                rindex( $url, $TWiki::cfg{ScriptSuffix} ) !=
-                ( length($url) - length( $TWiki::cfg{ScriptSuffix} ) ) )
+                rindex( $url, $Foswiki::cfg{ScriptSuffix} ) !=
+                ( length($url) - length( $Foswiki::cfg{ScriptSuffix} ) ) )
             {
-                $url .= $TWiki::cfg{ScriptSuffix} if $script;
+                $url .= $Foswiki::cfg{ScriptSuffix} if $script;
             }
         }
@@ -1221 +1228 @@
 
     my $url = '';
-    $url .= $TWiki::cfg{PubUrlPath};
+    $url .= $Foswiki::cfg{PubUrlPath};
     if ( $absolute && $url !~ /^[a-z]+:/ ) {
 
@@ -1319 +1326 @@
 
 *WARNING* if there is no web specification (in the web or topic parameters)
-the web defaults to $TWiki::cfg{UsersWebName}. If there is no topic
+the web defaults to $Foswiki::cfg{UsersWebName}. If there is no topic
 specification, or the topic is '0', the topic defaults to the web home topic
 name.
@@ -1354 +1361 @@
      want to be logged-in if none is available from a session or browser.
      Used mainly for side scripts and debugging.
-   * =$query= the TWiki::Request query (may be undef, in which case an empty query
+   * =$query= the Foswiki::Request query (may be undef, in which case an empty query
      is used)
    * =\%initialContext= - reference to a hash containing context
@@ -1363 +1370 @@
 sub new {
     my ( $class, $login, $query, $initialContext ) = @_;
-    ASSERT( !$query || UNIVERSAL::isa( $query, 'TWiki::Request' ) );
+    ASSERT( !$query || UNIVERSAL::isa( $query, 'Foswiki::Request' ) );
     Monitor::MARK("Static compilation complete");
 
     # Compatibility; not used except maybe in plugins
-    $TWiki::cfg{TempfileDir} = "$TWiki::cfg{WorkingDir}/tmp"
-      unless defined( $TWiki::cfg{TempfileDir} );
+    $Foswiki::cfg{TempfileDir} = "$Foswiki::cfg{WorkingDir}/tmp"
+      unless defined( $Foswiki::cfg{TempfileDir} );
 
     # Set command_line context if there is no query
     $initialContext ||= defined($query) ? {} : { command_line => 1 };
 
-    $query ||= new TWiki::Request();
+    $query ||= new Foswiki::Request();
     my $this = bless( {}, $class );
     $this->{request}  = $query;
-    $this->{response} = new TWiki::Response();
-
-    # Tell TWiki::Response which charset we are using if not default
-    if ( defined $TWiki::cfg{Site}{CharSet}
-        && $TWiki::cfg{Site}{CharSet} !~ /^iso-?8859-?1$/io )
+    $this->{response} = new Foswiki::Response();
+
+    # Tell Foswiki::Response which charset we are using if not default
+    if ( defined $Foswiki::cfg{Site}{CharSet}
+        && $Foswiki::cfg{Site}{CharSet} !~ /^iso-?8859-?1$/io )
     {
-        $this->{response}->charset( $TWiki::cfg{Site}{CharSet} );
+        $this->{response}->charset( $Foswiki::cfg{Site}{CharSet} );
     }
 
@@ -1393 +1400 @@
         # "shared" between mod_perl instances
         $sandbox =
-          new TWiki::Sandbox( $TWiki::cfg{OS}, $TWiki::cfg{DetailedOS} );
-    }
-    require TWiki::Plugins;
-    $this->{plugins} = new TWiki::Plugins($this);
-    require TWiki::Store;
-    $this->{store} = new TWiki::Store($this);
+          new Foswiki::Sandbox( $Foswiki::cfg{OS}, $Foswiki::cfg{DetailedOS} );
+    }
+    require Foswiki::Plugins;
+    $this->{plugins} = new Foswiki::Plugins($this);
+    require Foswiki::Store;
+    $this->{store} = new Foswiki::Store($this);
 
     $this->{remoteUser} =
       $login;    #use login as a default (set when running from cmd line)
-    require TWiki::Users;
-    $this->{users}      = new TWiki::Users($this);
+    require Foswiki::Users;
+    $this->{users}      = new Foswiki::Users($this);
     $this->{remoteUser} = $this->{users}->{remoteUser};
 
@@ -1412 +1419 @@
     # with use strict and calling external programs that writes on the disk
     # will fail unless Perl seens it as set to safe value.
-    if ( $TWiki::cfg{SafeEnvPath} ) {
-        $ENV{PATH} = $TWiki::cfg{SafeEnvPath};
+    if ( $Foswiki::cfg{SafeEnvPath} ) {
+        $ENV{PATH} = $Foswiki::cfg{SafeEnvPath};
     }
     else {
-        $ENV{PATH} = TWiki::Sandbox::untaintUnchecked( $ENV{PATH} );
+        $ENV{PATH} = Foswiki::Sandbox::untaintUnchecked( $ENV{PATH} );
     }
     delete @ENV{qw( IFS CDPATH ENV BASH_ENV )};
@@ -1429 +1436 @@
         # when there is nothing better available.
         if ( $this->{urlHost} eq 'http://localhost' ) {
-            $this->{urlHost} = $TWiki::cfg{DefaultUrlHost};
-        }
-        elsif ( $TWiki::cfg{RemovePortNumber} ) {
+            $this->{urlHost} = $Foswiki::cfg{DefaultUrlHost};
+        }
+        elsif ( $Foswiki::cfg{RemovePortNumber} ) {
             $this->{urlHost} =~ s/\:[0-9]+$//;
         }
     }
     else {
-        $this->{urlHost} = $TWiki::cfg{DefaultUrlHost};
-    }
-    if (   $TWiki::cfg{GetScriptUrlFromCgi}
+        $this->{urlHost} = $Foswiki::cfg{DefaultUrlHost};
+    }
+    if (   $Foswiki::cfg{GetScriptUrlFromCgi}
         && $url
         && $url =~ m{^[^:]*://[^/]*(.*)/.*$}
@@ -1471 +1478 @@
 
             # jump to WebHome if 'bin/script?topic=Webname.'
-            $topic = $TWiki::cfg{HomeTopicName} if ( $web && !$topic );
+            $topic = $Foswiki::cfg{HomeTopicName} if ( $web && !$topic );
         }
 
@@ -1496 +1503 @@
                         my $topictmp    = $2;
                         my $filetmp     = $3;
-                        if (-f $TWiki::cfg{PubDir}."/$webtmp$topictmp/$filetmp") {
+                        if (-f $Foswiki::cfg{PubDir}."/$webtmp$topictmp/$filetmp") {
                                 $web    = $webtmp;
                                 $topic  = $topictmp;
@@ -1510 +1517 @@
 
     # All roads lead to WebHome
-    $topic = $TWiki::cfg{HomeTopicName} if ( $topic =~ /\.\./ );
-    $topic =~ s/$TWiki::cfg{NameFilter}//go;
-    $topic = $TWiki::cfg{HomeTopicName} unless $topic;
-    $this->{topicName} = TWiki::Sandbox::untaintUnchecked($topic);
-
-    $web =~ s/$TWiki::cfg{NameFilter}//go;
+    $topic = $Foswiki::cfg{HomeTopicName} if ( $topic =~ /\.\./ );
+    $topic =~ s/$Foswiki::cfg{NameFilter}//go;
+    $topic = $Foswiki::cfg{HomeTopicName} unless $topic;
+    $this->{topicName} = Foswiki::Sandbox::untaintUnchecked($topic);
+
+    $web =~ s/$Foswiki::cfg{NameFilter}//go;
     $this->{requestedWebName} =
-      TWiki::Sandbox::untaintUnchecked($web);    #can be an empty string
-    $web = $TWiki::cfg{UsersWebName} unless $web;
-    $this->{webName} = TWiki::Sandbox::untaintUnchecked($web);
+      Foswiki::Sandbox::untaintUnchecked($web);    #can be an empty string
+    $web = $Foswiki::cfg{UsersWebName} unless $web;
+    $this->{webName} = Foswiki::Sandbox::untaintUnchecked($web);
 
 # Convert UTF-8 web and topic name from URL into site charset if necessary
@@ -1538 +1545 @@
     # SMELL: This untaint unchecked is duplicate of one just above
     $this->{topicName} =
-      TWiki::Sandbox::untaintUnchecked( ucfirst $this->{topicName} );
-
-    $this->{scriptUrlPath} = $TWiki::cfg{ScriptUrlPath};
-
-    require TWiki::Prefs;
-    my $prefs = new TWiki::Prefs($this);
+      Foswiki::Sandbox::untaintUnchecked( ucfirst $this->{topicName} );
+
+    $this->{scriptUrlPath} = $Foswiki::cfg{ScriptUrlPath};
+
+    require Foswiki::Prefs;
+    my $prefs = new Foswiki::Prefs($this);
     $this->{prefs} = $prefs;
 
@@ -1552 +1559 @@
     $prefs->pushGlobalPreferences();
 
-    # SMELL: what happens if we move this into the TWiki::User::new?
+    # SMELL: what happens if we move this into the Foswiki::User::new?
     $this->{user} = $this->{users}->initialiseUser( $this->{remoteUser} );
 
@@ -1576 +1583 @@
     my $wn = $this->{users}->getWikiName( $this->{user} );
     if ($wn) {
-        $prefs->pushPreferences( $TWiki::cfg{UsersWebName}, $wn,
+        $prefs->pushPreferences( $Foswiki::cfg{UsersWebName}, $wn,
             'USER ' . $wn );
     }
@@ -1591 +1598 @@
 
  # SMELL: Every place should localize it before use, so it's not necessary here.
-    $TWiki::Plugins::SESSION = $this;
+    $Foswiki::Plugins::SESSION = $this;
 
     Monitor::MARK("TWiki session created");
@@ -1610 +1617 @@
 
     unless ( $this->{renderer} ) {
-        require TWiki::Render;
+        require Foswiki::Render;
 
         # requires preferences (such as LINKTOOLTIPINFO)
-        $this->{renderer} = new TWiki::Render($this);
+        $this->{renderer} = new Foswiki::Render($this);
     }
     return $this->{renderer};
@@ -1630 +1637 @@
 
     unless ( $this->{attach} ) {
-        require TWiki::Attach;
-        $this->{attach} = new TWiki::Attach($this);
+        require Foswiki::Attach;
+        $this->{attach} = new Foswiki::Attach($this);
     }
     return $this->{attach};
@@ -1648 +1655 @@
 
     unless ( $this->{templates} ) {
-        require TWiki::Templates;
-        $this->{templates} = new TWiki::Templates($this);
+        require Foswiki::Templates;
+        $this->{templates} = new Foswiki::Templates($this);
     }
     return $this->{templates};
@@ -1666 +1673 @@
 
     unless ( $this->{i18n} ) {
-        require TWiki::I18N;
+        require Foswiki::I18N;
 
         # language information; must be loaded after
         # *all possible preferences sources* are available
-        $this->{i18n} = new TWiki::I18N($this);
+        $this->{i18n} = new Foswiki::I18N($this);
     }
     return $this->{i18n};
@@ -1687 +1694 @@
 
     unless ( $this->{search} ) {
-        require TWiki::Search;
-        $this->{search} = new TWiki::Search($this);
+        require Foswiki::Search;
+        $this->{search} = new Foswiki::Search($this);
     }
     return $this->{search};
@@ -1705 +1712 @@
 
     unless ( $this->{security} ) {
-        require TWiki::Access;
-        $this->{security} = new TWiki::Access($this);
+        require Foswiki::Access;
+        $this->{security} = new Foswiki::Access($this);
     }
     return $this->{security};
@@ -1723 +1730 @@
 
     unless ( $this->{net} ) {
-        require TWiki::Net;
-        $this->{net} = new TWiki::Net($this);
+        require Foswiki::Net;
+        $this->{net} = new Foswiki::Net($this);
     }
     return $this->{net};
@@ -1812 +1819 @@
     my $text = "$user | $action | $webTopic | $extra | $remoteAddr |";
 
-    _writeReport( $this, $TWiki::cfg{LogFileName}, $text );
+    _writeReport( $this, $Foswiki::cfg{LogFileName}, $text );
 }
 
@@ -1819 +1826 @@
 ---++ ObjectMethod writeWarning( $text )
 
-Prints date, time, and contents $text to $TWiki::cfg{WarningFileName}, typically
+Prints date, time, and contents $text to $Foswiki::cfg{WarningFileName}, typically
 'warnings.txt'. Use for warnings and errors that may require admin
 intervention. Use this for defensive programming warnings (e.g. assertions).
@@ -1827 +1834 @@
 sub writeWarning {
     my $this = shift;
-    _writeReport( $this, $TWiki::cfg{WarningFileName}, @_ );
+    _writeReport( $this, $Foswiki::cfg{WarningFileName}, @_ );
 }
 
@@ -1834 +1841 @@
 ---++ ObjectMethod writeDebug( $text )
 
-Prints date, time, and contents of $text to $TWiki::cfg{DebugFileName}, typically
+Prints date, time, and contents of $text to $Foswiki::cfg{DebugFileName}, typically
 'debug.txt'.  Use for debugging messages.
 
@@ -1841 +1848 @@
 sub writeDebug {
     my $this = shift;
-    _writeReport( $this, $TWiki::cfg{DebugFileName}, @_ );
+    _writeReport( $this, $Foswiki::cfg{DebugFileName}, @_ );
 }
 
@@ -1853 +1860 @@
 
     if ($log) {
-        require TWiki::Time;
-        my $time = TWiki::Time::formatTime( time(), '$year$mo', 'servertime' );
+        require Foswiki::Time;
+        my $time = Foswiki::Time::formatTime( time(), '$year$mo', 'servertime' );
         $log =~ s/%DATE%/$time/go;
-        $time = TWiki::Time::formatTime( time(), undef, 'servertime' );
+        $time = Foswiki::Time::formatTime( time(), undef, 'servertime' );
 
         if ( open( FILE, ">>$log" ) ) {
@@ -1994 +2001 @@
     $thePattern =~
       s/([^\\])([\$\@\%\&\#\'\`\/])/$1\\$2/g;    # escape some special chars
-    $thePattern = TWiki::Sandbox::untaintUnchecked($thePattern);
+    $thePattern = Foswiki::Sandbox::untaintUnchecked($thePattern);
     $theText = '' unless ( $theText =~ s/$thePattern/$1/is );
     return $theText;
@@ -2006 +2013 @@
     # For speed, read file directly if URL matches an attachment directory
     if ( $url =~
-/^$this->{urlHost}$TWiki::cfg{PubUrlPath}\/($regex{webNameRegex})\/([^\/\.]+)\/([^\/]+)$/
+/^$this->{urlHost}$Foswiki::cfg{PubUrlPath}\/($regex{webNameRegex})\/([^\/\.]+)\/([^\/]+)$/
       )
     {
@@ -2040 +2047 @@
             $text =
               _cleanupIncludedHTML( $text, $this->{urlHost},
-                $TWiki::cfg{PubUrlPath}, $options )
+                $Foswiki::cfg{PubUrlPath}, $options )
               unless $raw;
             $text = applyPatternToIncludedText( $text, $pattern )
@@ -2053 +2060 @@
 
     return _includeWarning( $this, $warn, 'urls_not_allowed' )
-      unless $TWiki::cfg{INCLUDE}{AllowURLs};
+      unless $Foswiki::cfg{INCLUDE}{AllowURLs};
 
     # SMELL: should use the URI module from CPAN to parse the URL
@@ -2116 +2123 @@
     my ( $this, $text, $defaultTopic, $defaultWeb, $args ) = @_;
 
-    require TWiki::Attrs;
-
-    my $params = new TWiki::Attrs($args);
+    require Foswiki::Attrs;
+
+    my $params = new Foswiki::Attrs($args);
 
     # get the topic name attribute
@@ -2345 +2352 @@
 and the array of sections.
 
-Each section is a =TWiki::Attrs= object, which contains the attributes
+Each section is a =Foswiki::Attrs= object, which contains the attributes
 {type, name, start, end}
 where start and end are character offsets in the
@@ -2368 +2375 @@
     foreach my $bit ( split( /(%(?:START|END)SECTION(?:{.*?})?%)/, $_[0] ) ) {
         if ( $bit =~ /^%STARTSECTION(?:{(.*)})?%$/ ) {
-            require TWiki::Attrs;
-            my $attrs = new TWiki::Attrs($1);
+            require Foswiki::Attrs;
+            my $attrs = new Foswiki::Attrs($1);
             $attrs->{type} ||= 'section';
             $attrs->{name} =
@@ -2398 +2405 @@
         }
         elsif ( $bit =~ /^%ENDSECTION(?:{(.*)})?%$/ ) {
-            require TWiki::Attrs;
-            my $attrs = new TWiki::Attrs($1);
+            require Foswiki::Attrs;
+            my $attrs = new Foswiki::Attrs($1);
             $attrs->{type} ||= 'section';
             $attrs->{name} = $attrs->{_DEFAULT} || $attrs->{name} || '';
@@ -2491 +2498 @@
 
     # Make sure func works, for registered tag handlers
-    $TWiki::Plugins::SESSION = $this;
+    $Foswiki::Plugins::SESSION = $this;
 
     # Note: it may look dangerous to override the user this way, but
@@ -2634 +2641 @@
     if (
         (
-            defined( $TWiki::cfg{Site}{CharSet} )
-            and $TWiki::cfg{Site}{CharSet} =~ /^utf-?8$/i
+            defined( $Foswiki::cfg{Site}{CharSet} )
+            and $Foswiki::cfg{Site}{CharSet} =~ /^utf-?8$/i
         )
         or $usingEBCDIC
@@ -2784 +2791 @@
 
     # Make sure func works, for registered tag handlers
-    $TWiki::Plugins::SESSION = $this;
+    $Foswiki::Plugins::SESSION = $this;
 
     # NOTE TO DEBUGGERS
@@ -2965 +2972 @@
 
     # my( $topic, $web, $meta ) = @_;
-    require TWiki::Attrs;
+    require Foswiki::Attrs;
 
     my $e = $this->{prefs}->getPreferencesValue($tag);
@@ -2972 +2979 @@
         if ( !defined($e) && defined( $functionTags{$tag} ) ) {
             $e = &{ $functionTags{$tag} }(
-                $this, new TWiki::Attrs( $args, $contextFreeSyntax{$tag} ), @_
+                $this, new Foswiki::Attrs( $args, $contextFreeSyntax{$tag} ), @_
             );
         }
@@ -3104 +3111 @@
    * =$verb= - The invoked verb (may be ignored)
 
-*Since:* TWiki::Plugins::VERSION 1.1
+*Since:* Foswiki::Plugins::VERSION 1.1
 
 =cut=
@@ -3323 +3330 @@
 ---++ StaticMethod initialize( $pathInfo, $remoteUser, $topic, $url, $query ) -> ($topicName, $webName, $scriptUrlPath, $userName, $dataDir)
 
-Return value: ( $topicName, $webName, $TWiki::cfg{ScriptUrlPath}, $userName, $TWiki::cfg{DataDir} )
+Return value: ( $topicName, $webName, $Foswiki::cfg{ScriptUrlPath}, $userName, $Foswiki::cfg{DataDir} )
 
 Static method to construct a new singleton session instance.
 It creates a new TWiki and sets the Plugins $SESSION variable to
-point to it, so that TWiki::Func methods will work.
+point to it, so that Foswiki::Func methods will work.
 
 This method is *DEPRECATED* but is maintained for script compatibility.
@@ -3339 +3346 @@
 
     if ( !$query ) {
-        $query = new TWiki::Request( {} );
+        $query = new Foswiki::Request( {} );
     }
     if ( $query->path_info() ne $pathInfo ) {
@@ -3353 +3360 @@
     if ( $theUrl && $theUrl ne $query->url() ) {
         die
-'Sorry, this version of TWiki does not support the url parameter to TWiki::initialize being different to the url in the query';
-    }
-    my $twiki = new TWiki( $theRemoteUser, $query );
+'Sorry, this version of TWiki does not support the url parameter to Foswiki::initialize being different to the url in the query';
+    }
+    my $twiki = new Foswiki( $theRemoteUser, $query );
 
     # Force the new session into the plugins context.
-    $TWiki::Plugins::SESSION = $twiki;
+    $Foswiki::Plugins::SESSION = $twiki;
 
     return (
         $twiki->{topicName}, $twiki->{webName}, $twiki->{scriptUrlPath},
-        $twiki->{userName},  $TWiki::cfg{DataDir}
+        $twiki->{userName},  $Foswiki::cfg{DataDir}
     );
 }
@@ -3482 +3489 @@
 
     unless ($ifParser) {
-        require TWiki::If::Parser;
-        $ifParser = new TWiki::If::Parser();
+        require Foswiki::If::Parser;
+        $ifParser = new Foswiki::If::Parser();
     }
 
@@ -3505 +3512 @@
         $expr = $ifParser->parse($texpr);
         unless ($meta) {
-            require TWiki::Meta;
-            $meta = new TWiki::Meta( $this, $web, $topic );
+            require Foswiki::Meta;
+            $meta = new Foswiki::Meta( $this, $web, $topic );
         }
         if ( $expr->evaluate( tom => $meta, data => $meta ) ) {
@@ -3517 +3524 @@
         }
     }
-    catch TWiki::Infix::Error with {
+    catch Foswiki::Infix::Error with {
         my $e = shift;
         $result =
@@ -3558 +3565 @@
     }
 
-    $path =~ s/$TWiki::cfg{NameFilter}//go;    # zap anything suspicious
-    if ( $TWiki::cfg{DenyDotDotInclude} ) {
+    $path =~ s/$Foswiki::cfg{NameFilter}//go;    # zap anything suspicious
+    if ( $Foswiki::cfg{DenyDotDotInclude} ) {
 
         # Filter out '..' from filename, this is to
@@ -3783 +3790 @@
 sub DATE {
     my $this = shift;
-    return TWiki::Time::formatTime(
+    return Foswiki::Time::formatTime(
         time(),
-        $TWiki::cfg{DefaultDateFormat},
-        $TWiki::cfg{DisplayTimeValues}
+        $Foswiki::cfg{DefaultDateFormat},
+        $Foswiki::cfg{DisplayTimeValues}
     );
 }
@@ -3792 +3799 @@
 sub GMTIME {
     my ( $this, $params ) = @_;
-    return TWiki::Time::formatTime( time(), $params->{_DEFAULT} || '',
+    return Foswiki::Time::formatTime( time(), $params->{_DEFAULT} || '',
         'gmtime' );
 }
@@ -3798 +3805 @@
 sub SERVERTIME {
     my ( $this, $params ) = @_;
-    return TWiki::Time::formatTime( time(), $params->{_DEFAULT} || '',
+    return Foswiki::Time::formatTime( time(), $params->{_DEFAULT} || '',
         'servertime' );
 }
@@ -3804 +3811 @@
 sub DISPLAYTIME {
     my ( $this, $params ) = @_;
-    return TWiki::Time::formatTime(
+    return Foswiki::Time::formatTime(
         time(),
         $params->{_DEFAULT} || '',
-        $TWiki::cfg{DisplayTimeValues}
+        $Foswiki::cfg{DisplayTimeValues}
     );
 }
@@ -3884 +3891 @@
     return ''
       unless $key
-          && defined $TWiki::cfg{AccessibleENV}
-          && $key =~ /$TWiki::cfg{AccessibleENV}/o;
+          && defined $Foswiki::cfg{AccessibleENV}
+          && $key =~ /$Foswiki::cfg{AccessibleENV}/o;
     my $val;
     if ( $key =~ /^HTTPS?_(.*)/ ) {
@@ -3901 +3908 @@
     else {
 
-        # TSA SMELL: TWiki::Request doesn't support
+        # TSA SMELL: Foswiki::Request doesn't support
         # SERVER_\w+, REMOTE_HOST and REMOTE_IDENT.
         # Use %ENV as fallback, but for ones above
@@ -4061 +4068 @@
     my $value;
     if ( $this->{request} ) {
-        if ( TWiki::isTrue($multiple) ) {
+        if ( Foswiki::isTrue($multiple) ) {
             my @valueArray = $this->{request}->param($param);
             if (@valueArray) {
@@ -4421 +4428 @@
         return '' unless $user;
         return ''
-          if ( $TWiki::cfg{AntiSpam}{HideUserDetails}
+          if ( $Foswiki::cfg{AntiSpam}{HideUserDetails}
             && !$this->{users}->isAdmin( $this->{user} )
             && $user ne $this->{user} );
@@ -4442 +4449 @@
     if ( $info =~ /\$wikiusername/ ) {
         my $wikiusername = $this->{users}->webDotWikiName($user);
-        $wikiusername = "$TWiki::cfg{UsersWebName}.UnknownUser"
+        $wikiusername = "$Foswiki::cfg{UsersWebName}.UnknownUser"
           unless defined $wikiusername;
         $info =~ s/\$wikiusername/$wikiusername/g;
@@ -4482 +4489 @@
         # Nop it to prevent wikiname expansion unless the topic exists.
         my $groupLink = "<nop>$group";
-        $groupLink = '[[' . $TWiki::cfg{UsersWebName} . ".$group][$group]]"
+        $groupLink = '[[' . $Foswiki::cfg{UsersWebName} . ".$group][$group]]"
           if (
-            $this->{store}->topicExists( $TWiki::cfg{UsersWebName}, $group ) );
+            $this->{store}->topicExists( $Foswiki::cfg{UsersWebName}, $group ) );
         my $descr        = "| $groupLink |";
         my $it           = $this->{users}->eachGroupMember($group);
@@ -4510 +4517 @@
 #
 # Copyright (C) 1999-2007 Peter Thoeny, peter@thoeny.org
-# and TWiki Contributors. All Rights Reserved. TWiki Contributors
+# and Foswiki Contributors. All Rights Reserved. Foswiki Contributors
 # are listed in the AUTHORS file in the root of this distribution.
 # NOTE: Please extend that file, not this notice.