Changeset 875 for trunk/core/lib/Foswiki/UI/Manage.pm

Timestamp:

11/23/08 11:02:43 (4 years ago)

Author:

ArthurClemens

Message:

Item244: generalized the copy subroutine for topic creation

File:

• trunk/core/lib/Foswiki/UI/Manage.pm (modified) (9 diffs)

trunk/core/lib/Foswiki/UI/Manage.pm

@@ -62 +62 @@
         _restoreRevision($session);
     }
-    elsif ( $action eq 'copy' ) {
-        _copyTopic($session);
+    elsif ( $action eq 'create' ) {
+        _createTopic($session);
     }
     elsif ($action) {
@@ -300 +300 @@
     my $breakLock   = $query->param('breaklock');
 
-    my $confirm          = $query->param('confirm');
-    my $store            = $session->{store};
-
-    $newTopic =~ s/\s//go;
-    $newTopic =~ s/$Foswiki::cfg{NameFilter}//go;
-    $newTopic = ucfirst $newTopic;    # Item3270
+    my $confirm = $query->param('confirm');
+    my $store   = $session->{store};
 
     $attachment ||= '';
@@ -327 +323 @@
 
     if ($newTopic) {
+        $newTopic = _safeTopicName($newTopic);
         if ( !_isValidTopicName( $newTopic, $query->param('nonwikiword') ) ) {
             throw Foswiki::OopsException(
@@ -336 +333 @@
             );
         }
-        $newTopic = _safeTopicName($newTopic);
     }
 
@@ -405 +401 @@
         Foswiki::UI::checkAccess( $session, $oldWeb, $oldTopic, 'VIEW',
             $session->{user} );
-        _newTopicScreen( $session, $oldWeb, $oldTopic, $newWeb, $newTopic,
-            $attachment, $confirm );
+        _newTopicScreen(
+            $session,  $oldWeb,     $oldTopic, $newWeb,
+            $newTopic, $attachment, $confirm
+        );
         return;
     }
@@ -513 +511 @@
 =pod
 
----++ StaticMethod _copyTopic()
-
-Copies a topic to new topic with name passed in query param 'newtopic'.
-Redirects to edit screen.
+---++ StaticMethod _createTopic()
+
+Creates a topic to new topic with name passed in query param 'topic'.
+Creates an exception when the topic name is not valid; the topic name does not have to be a WikiWord if parameter 'nonwikiword' is set to 'on'.
+Redirects to the edit screen.
+
+Copy an existing topic using:
+        <form action="%SCRIPTURL{manage}%/%WEB%/">
+        <input type="text" name="topic" class="twikiInputField" value="%TOPIC%Copy" size="30">
+        <input type="hidden" name="action" value="create" />
+        <input type="hidden" name="templatetopic" value="%TOPIC%" />
+        ...
+        </form>
 
 =cut
 
-
-sub _copyTopic {
+sub _createTopic {
     my ($session) = @_;
 
     my $query = $session->{request};
-    my $newTopic = $query->param('newtopic') || '';
+    my $newTopic = $query->param('topic') || '';
 
     # topic must not be empty
@@ -538 +544 @@
     }
 
-    my $oldWeb           = $session->{webName};
-    my $oldTopic         = $session->{topicName};
-
-    if ($newTopic) {
-        # topic must be valid
-        if ( !_isValidTopicName( $newTopic, $query->param('nonwikiword') ) ) {
-            throw Foswiki::OopsException(
-                'attention',
-                web    => $oldWeb,
-                topic  => $oldTopic,
-                def    => 'not_wikiword',
-                params => [$newTopic]
-            );
-        }
-        $newTopic = _safeTopicName($newTopic);
-    }
-    
+    my $oldWeb   = $session->{webName};
+    my $oldTopic = $session->{topicName};
+
+    Foswiki::UI::checkAccess( $session, $oldWeb, $newTopic, 'CHANGE',
+        $session->{user} );
+
+    # topic must be valid
+    if ( !_isValidTopicName( $newTopic, $query->param('nonwikiword') ) ) {
+        throw Foswiki::OopsException(
+            'attention',
+            web    => $oldWeb,
+            topic  => $oldTopic,
+            def    => 'not_wikiword',
+            params => [$newTopic]
+        );
+    }
+    $newTopic = _safeTopicName($newTopic);
+
     # untaint new topic name
     use Foswiki::Sandbox;
@@ -624 +631 @@
 
     my $newTopic;
-    my $lockFailure        = '';
-    my $breakLock          = $query->param('breaklock');
-    my $confirm            = $query->param('confirm') || '';
-    my $store              = $session->{store};
+    my $lockFailure = '';
+    my $breakLock   = $query->param('breaklock');
+    my $confirm     = $query->param('confirm') || '';
+    my $store       = $session->{store};
 
     Foswiki::UI::checkWebExists( $session, $oldWeb,
@@ -1008 +1015 @@
 # Display screen so user can decide on new web and topic.
 sub _newTopicScreen {
-    my ( $session, $oldWeb, $oldTopic, $newWeb, $newTopic, $attachment,
-        $confirm )
-      = @_;
+    my (
+        $session,  $oldWeb,     $oldTopic, $newWeb,
+        $newTopic, $attachment, $confirm
+    ) = @_;
 
     my $query          = $session->{request};