Changeset 811 for trunk/CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/Comment.pm

Timestamp:

11/19/08 15:00:00 (4 years ago)

Author:

CrawfordCurrie

Message:

Item175: port a subset of the standard extensions over to the new namespace to make a working system with mixed TWiki and Foswiki plugins

Location:

trunk/CommentPlugin/lib/Foswiki

Files:

• . (moved) (moved from trunk/CommentPlugin/lib/TWiki)
• Plugins/CommentPlugin/Comment.pm (modified) (10 diffs)

trunk/CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/Comment.pm

@@ -2 +2 @@
 #
 # Copyright (C) 2004 Crawford Currie
-# Copyright (C) 2001-2006 TWiki Contributors.
-# All Rights Reserved. TWiki Contributors
+# Copyright (C) 2001-2006 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.
@@ -23 +23 @@
 # and again by Crawford Currie
 #
-# This version is specific to TWiki::Plugins::VERSION > 1.026
+# This version is specific to Foswiki::Plugins::VERSION > 1.026
 
 use strict;
 
-use TWiki;
-use TWiki::Plugins;
-use TWiki::Store;
-use TWiki::Attrs;
+use Foswiki;
+use Foswiki::Plugins;
+use Foswiki::Store;
+use Foswiki::Attrs;
 use CGI qw( -any );
 
-package TWiki::Plugins::CommentPlugin::Comment;
+package Foswiki::Plugins::CommentPlugin::Comment;
 
 # PUBLIC save the given comment.
@@ -39 +39 @@
     #my ( $text, $topic, $web ) = @_;
 
-    my $wikiName = TWiki::Func::getWikiName();
-    if( ! TWiki::Func::checkAccessPermission( 'change', $wikiName, '',
+    my $wikiName = Foswiki::Func::getWikiName();
+    if( ! Foswiki::Func::checkAccessPermission( 'change', $wikiName, '',
                                                                                           $_[1], $_[2] ) ) {
         # user has no permission to change the topic
-        throw TWiki::OopsException( 'accessdenied',
+        throw Foswiki::OopsException( 'accessdenied',
                                     def => 'topic_access',
                                     web => $_[2],
@@ -56 +56 @@
     #my ( $previewing, $text, $web, $topic ) = @_;
 
-    my $defaultType = TWiki::Func::getPreferencesValue('COMMENTPLUGIN_DEFAULT_TYPE') || 'above';
+    my $defaultType = Foswiki::Func::getPreferencesValue('COMMENTPLUGIN_DEFAULT_TYPE') || 'above';
 
     my $message = '';
@@ -84 +84 @@
     if ( $attrtemplatetopic ) {
         my ($templocweb, $temploctopic ) =
-          TWiki::Func::normalizeWebTopicName($templateweb, $attrtemplatetopic);
+          Foswiki::Func::normalizeWebTopicName($templateweb, $attrtemplatetopic);
         $templatetopic = "$templocweb.$temploctopic";
     }
@@ -97 +97 @@
     $attributes =~ s/^{(.*)}$/$1/ if ( $attributes );
 
-    my $attrs = new TWiki::Attrs( $attributes, 1 );
+    my $attrs = new Foswiki::Attrs( $attributes, 1 );
     my $type =
       $attrs->remove( 'type' ) || $attrs->remove( 'mode' ) || $defaultType;
@@ -143 +143 @@
     my $url = '';
     if ( $disable eq '' ) {
-        $url = TWiki::Func::getScriptUrl( $web, $topic, 'save' );
+        $url = Foswiki::Func::getScriptUrl( $web, $topic, 'save' );
     }
 
@@ -213 +213 @@
     # Get the templates.
     my $templateFile = $templatetopic
-        || TWiki::Func::getPreferencesValue('COMMENTPLUGIN_TEMPLATES')
+        || Foswiki::Func::getPreferencesValue('COMMENTPLUGIN_TEMPLATES')
         || 'comments';
 
     my $templates =
-      TWiki::Func::loadTemplate( $templateFile );
+      Foswiki::Func::loadTemplate( $templateFile );
     if (! $templates ) {
-        TWiki::Func::writeWarning("Could not read template file '$templateFile'");
+        Foswiki::Func::writeWarning("Could not read template file '$templateFile'");
         return;
     }
 
-    my $t = TWiki::Func::expandTemplate( $name );
+    my $t = Foswiki::Func::expandTemplate( $name );
     return "%RED%No such template def TMPL:DEF{$name}%ENDCOLOR%"
       unless ( defined($t) && $t ne '' ) || $warn eq 'off';
@@ -244 +244 @@
     my ( $topic, $web ) = ( $_[1], $_[2] );
 
-    my $query = TWiki::Func::getCgiQuery();
+    my $query = Foswiki::Func::getCgiQuery();
     return unless $query;
 
     my $type = $query->param( 'comment_type' ) ||
-      TWiki::Func::getPreferencesValue('COMMENTPLUGIN_DEFAULT_TYPE') ||
+      Foswiki::Func::getPreferencesValue('COMMENTPLUGIN_DEFAULT_TYPE') ||
           'below';
     my $index = $query->param( 'comment_index' ) || 0;
@@ -270 +270 @@
     # Expand common variables in the template, but don't expand other
     # tags.
-    $output = TWiki::Func::expandVariablesOnTopicCreation($output);
+    $output = Foswiki::Func::expandVariablesOnTopicCreation($output);
 
     $output = '' unless defined($output);