--- loncom/interface/londocs.pm	2013/09/01 03:01:13	1.563
+++ loncom/interface/londocs.pm	2013/09/23 17:35:07	1.565
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.563 2013/09/01 03:01:13 raeburn Exp $
+# $Id: londocs.pm,v 1.565 2013/09/23 17:35:07 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -712,7 +712,7 @@ sub update_paste_buffer {
              my $url = $env{'docs.markedcopy_url_'.$suffix};
              if (($cid =~ /^$match_domain(?:_)$match_courseid$/) &&
                  ($url ne '')) {
-                 $pasteurls{$cid.'_'.$url};
+                 $pasteurls{$cid.'_'.$url} = 1;
              }
         }
     }
@@ -1109,8 +1109,7 @@ sub do_paste_from_buffer {
     }
 
     my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate,
-        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult,
-        %msgs);
+        %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult);
 
     foreach my $suffix (@topaste) {
         my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix});
@@ -1311,7 +1310,7 @@ sub do_paste_from_buffer {
                     if ($prefix eq 'smppg') {
                         $msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext;
                     } elsif ($prefix eq 'bulletinboard') {
-                        $msg = &mt('Paste failed: An error occurred when copying the bulletin board.').' '.$errtext;
+                        $msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext;
                     }
                     $results{$suffix} = $result;
                     $msgerrs{$suffix} = $msg;
@@ -1561,7 +1560,7 @@ sub get_newmap_url {
 sub dbcopy {
     my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_;
     my ($url,$result,$errtext);
-    my $url = $dbref->{'src'};
+    $url = $dbref->{'src'};
     if (ref($dbref) eq 'HASH') {
         if ($url =~ m{/(smppg|bulletinboard)$}) {
             my $prefix = $1;
@@ -1586,7 +1585,7 @@ sub dbcopy {
                     if ($prefix eq 'smppg') {
                         $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url);
                     } else {
-                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a bulletin board [_1].',$url);
+                        $errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url);
                     }
                     if ($error) {
                         $errtext .= '<br />'.$error;
@@ -1629,7 +1628,7 @@ sub dbcopy {
                         $lockerrorsref->{$prefix} .=
                             ' '.&mt('This will prevent creation of additional simple pages in this course.');
                     } else {
-                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional bulletin boards in this course.');
+                        $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
                     }
                     $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
                                                      '<a href="/adm/helpdesk" target="_helpdesk">','</a>').
@@ -3294,7 +3293,7 @@ $form_common."\n".
                     push(@{$filtersref->{'randomorder'}},$orderidx);
                 }
             }
-            my $formname = 'edit_rorder_'.$orderidx;
+            $formname = 'edit_rorder_'.$orderidx;
 	    $rand_order_text = 
 '<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n".
 $form_param."\n".
@@ -3497,7 +3496,7 @@ sub new_timebased_suffix {
         } elsif ($type eq 'smppg') {
             $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.');
         } else {
-            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new bulletin board.');
+            $errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.');
         }
         if ($error) {
             $errtext .= '<br />'.$error;
@@ -3516,7 +3515,7 @@ sub new_timebased_suffix {
                 &mt('This will prevent creation of additional simple pages in this course.');
         } else {
             $locknotfreed .=
-                &mt('This will prevent creation of additional bulletin boards in this course.');
+                &mt('This will prevent creation of additional discussion boards in this course.');
         }
         unless ($type eq 'paste') {
             $locknotfreed .=