Changeset 1054

Timestamp:

11/28/08 21:18:36 (3 years ago)

Author:

CrawfordCurrie

Message:

Item295: another detox step, plus eliminate a warning in ACTIVATED_PLUGINS

Location:

trunk/core

Files:

• bin/setlib.cfg (modified) (4 diffs)
• lib/Foswiki.pm (modified) (10 diffs)
• lib/Foswiki/Plugins.pm (modified) (1 diff)
• lib/Foswiki/UI.pm (modified) (2 diffs)

trunk/core/bin/setlib.cfg

@@ -12 +12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# setlib.cfg: determines the defaults for TWiki and Perl library paths
+# setlib.cfg: determines the defaults for Foswiki and Perl library paths
 #
 
@@ -22 +22 @@
 
 # for development, you can enable ASSERTS by adding
-# $ENV{TWIKI_ASSERTS} = 1;
+# $ENV{FOSWIKI_ASSERTS} = 1;
 # to your bin/LocalLib.cfg
 
-use vars qw( $twikiLibPath @localPerlLibPath );
+use vars qw( $foswikiLibPath @localPerlLibPath );
 
 eval 'require "LocalLib.cfg"';
+# if foswikiLibPath isn't defined, then see if $twikiLibPath is
+# for compatibility
+$foswikiLibPath = $twikiLibPath unless defined( $foswikiLibPath );
 
-unless (( defined ($twikiLibPath) ) and (-e $twikiLibPath)) {
+unless (( defined ($foswikiLibPath) ) and (-e $foswikiLibPath)) {
         use Cwd qw( abs_path );
-        ( $twikiLibPath ) = ($twikiLibPath = Cwd::abs_path( "../lib" )) =~ /(.*)/;
+        ( $foswikiLibPath ) = ($foswikiLibPath = Cwd::abs_path( "../lib" )) =~ /(.*)/;
 }
-if ($twikiLibPath eq "") {
-    $twikiLibPath = "../lib";
+if ($foswikiLibPath eq "") {
+    $foswikiLibPath = "../lib";
     warn "using relative path for libs - some plugins may break";
 }
@@ -40 +43 @@
 #    Path to local Perl modules
 my $defaultingCPANBASE = !defined($CPANBASE);
-$CPANBASE = "$twikiLibPath/CPAN/lib/" unless $CPANBASE;
+$CPANBASE = "$foswikiLibPath/CPAN/lib/" unless $CPANBASE;
 if ( -e $CPANBASE ) {
         require Config;
@@ -49 +52 @@
 
 # Prepend to @INC, the Perl search path for modules
-unshift @INC, $twikiLibPath;
+unshift @INC, $foswikiLibPath;
 if ($defaultingCPANBASE) {
         push @INC, @localPerlLibPath if @localPerlLibPath;

trunk/core/lib/Foswiki.pm

@@ -66 +66 @@
 
 # Other computed constants
-our $twikiLibDir;
+our $foswikiLibDir;
 our %regex;
 our %functionTags;
@@ -91 +91 @@
 our $TranslationToken = "\0";
 
-=begin TML
-
----++ StaticMethod getLibDir() -> $path
-
-Returns the full path of the directory containing Foswiki.pm
-
-=cut
-
-sub getLibDir {
-    if ($twikiLibDir) {
-        return $twikiLibDir;
-    }
-
-    # FIXME: Should just use $INC{"Foswiki.pm"} to get path used to load this
-    # module.
-    my $dir = '';
-    foreach $dir (@INC) {
-        if ( $dir && -e "$dir/Foswiki.pm" ) {
-            $twikiLibDir = $dir;
-            last;
-        }
-    }
+# Returns the full path of the directory containing Foswiki.pm
+sub _getLibDir {
+    return $foswikiLibDir if $foswikiLibDir;
+
+    $foswikiLibDir = $INC{'Foswiki.pm'};
 
     # fix path relative to location of called script
-    if ( $twikiLibDir =~ /^\./ ) {
+    if ( $foswikiLibDir =~ /^\./ ) {
         print STDERR
-"WARNING: Foswiki lib path $twikiLibDir is relative; you should make it absolute, otherwise some scripts may not run from the command line.";
+"WARNING: Foswiki lib path $foswikiLibDir is relative; you should make it absolute, otherwise some scripts may not run from the command line.";
         my $bin;
 
@@ -140 +123 @@
             $bin = cwd();
         }
-        $twikiLibDir = "$bin/$twikiLibDir/";
+        $foswikiLibDir = "$bin/$foswikiLibDir/";
 
         # normalize "/../" and "/./"
-        while ( $twikiLibDir =~ s|([\\/])[^\\/]+[\\/]\.\.[\\/]|$1| ) {
-        }
-        $twikiLibDir =~ s|([\\/])\.[\\/]|$1|g;
-    }
-    $twikiLibDir =~ s|([\\/])[\\/]*|$1|g;    # reduce "//" to "/"
-    $twikiLibDir =~ s|[\\/]$||;              # cut trailing "/"
-
-    return $twikiLibDir;
+        while ( $foswikiLibDir =~ s|([\\/])[^\\/]+[\\/]\.\.[\\/]|$1| ) {
+        }
+        $foswikiLibDir =~ s|([\\/])\.[\\/]|$1|g;
+    }
+    $foswikiLibDir =~ s|([\\/])[\\/]*|$1|g;    # reduce "//" to "/"
+    $foswikiLibDir =~ s|[\\/]$||;              # cut trailing "/"
+
+    return $foswikiLibDir;
 }
 
@@ -497 +480 @@
 
     # initialize lib directory early because of later 'cd's
-    getLibDir();
+    _getLibDir();
 
     # initialize the runtime engine
@@ -812 +795 @@
 ---++ ObjectMethod redirect( $url, $passthrough, $action_redirectto )
 
-   * $url - url or twikitopic to redirect to
+   * $url - url or topic to redirect to
    * $passthrough - (optional) parameter to **FILLMEIN**
    * $action_redirectto - (optional) redirect to where ?redirectto=
@@ -939 +922 @@
 
     # Don't double-cache
-    return '' if ( $query->param('twiki_redirect_cache') );
+    return '' if ( $query->param('foswiki_redirect_cache') );
 
     require Digest::MD5;
@@ -955 +938 @@
     $query->save( \*F );
     close(F);
-    return 'twiki_redirect_cache=' . $uid;
+    return 'foswiki_redirect_cache=' . $uid;
 }
 
@@ -1095 +1078 @@
 Returns the URL to a Foswiki script, providing the web and topic as
 "path info" parameters.  The result looks something like this:
-"http://host/twiki/bin/$script/$web/$topic".
+"http://host/foswiki/bin/$script/$web/$topic".
    * =...= - an arbitrary number of name,value parameter pairs that will be url-encoded and added to the url. The special parameter name '#' is reserved for specifying an anchor. e.g. <tt>getScriptUrl('x','y','view','#'=>'XXX',a=>1,b=>2)</tt> will give <tt>.../view/x/y?a=1&b=2#XXX</tt>
 
@@ -3169 +3152 @@
 'Sorry, this version of Foswiki does not support the url parameter to Foswiki::initialize being different to the url in the query';
     }
-    my $twiki = new Foswiki( $theRemoteUser, $query );
+    my $session = new Foswiki( $theRemoteUser, $query );
 
     # Force the new session into the plugins context.
-    $Foswiki::Plugins::SESSION = $twiki;
+    $Foswiki::Plugins::SESSION = $session;
 
     return (
-        $twiki->{topicName}, $twiki->{webName}, $twiki->{scriptUrlPath},
-        $twiki->{userName},  $Foswiki::cfg{DataDir}
+        $session->{topicName}, $session->{webName}, $session->{scriptUrlPath},
+        $session->{userName},  $Foswiki::cfg{DataDir}
     );
 }
@@ -3631 +3614 @@
 #| $web | web and  |
 #| $topic | topic to display the name for |
-#| $formatString | twiki format string (like in search) |
+#| $formatString | format string (like in search) |
 sub REVINFO {
     my ( $this, $params, $theTopic, $theWeb ) = @_;

trunk/core/lib/Foswiki/Plugins.pm

@@ -453 +453 @@
     foreach my $plugin ( @{ $this->{plugins} } ) {
         unless ( $plugin->{disabled} ) {
-            $text .= "$plugin->{installWeb}.$plugin->{name}, ";
+            my $web = $plugin->topicWeb();
+            $text .= ($web ? "$web." : '!')."$plugin->{name}, ";
         }
     }

trunk/core/lib/Foswiki/UI.pm

@@ -134 +134 @@
     my ( $req, $sub, %initialContext ) = @_;
 
-    my $cache = $req->param('twiki_redirect_cache');
+    my $cache = $req->param('foswiki_redirect_cache');
 
 # Never trust input data from a query. We will only accept an MD5 32 character string
@@ -155 +155 @@
             close(F);
             unlink($passthruFilename);
-            $req->delete('twiki_redirect_cache');
+            $req->delete('foswiki_redirect_cache');
             print STDERR "Passthru: Loaded and unlinked $passthruFilename\n"
               if TRACE_PASSTHRU;