--- loncom/interface/londocs.pm	2013/03/31 22:36:01	1.538
+++ loncom/interface/londocs.pm	2013/04/02 00:07:08	1.541
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.538 2013/03/31 22:36:01 raeburn Exp $
+# $Id: londocs.pm,v 1.541 2013/04/02 00:07:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -834,7 +834,7 @@ sub print_paste_buffer {
                         $othercourse = 1;
                         if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
                             if ($canpaste) {
-                                $othercrs = '<br />'.&mt('(from another course).');
+                                $othercrs = '<br />'.&mt('(from another course)');
                             }
                         } else {
                             $canpaste = 0;
@@ -902,7 +902,7 @@ sub print_paste_buffer {
     my ($pasteform,$form_start,$buttons,$form_end);
     if ($pasteitems) {
         $pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>';
-        $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post">';
+        $form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">';
         if (@pasteable) {
             $buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.('&nbsp;'x2);
         }
@@ -1009,6 +1009,7 @@ sub paste_popup_js {
     my %lt = &Apache::lonlocal::texthash(
                                           show => 'Show Options',
                                           hide => 'Hide Options',
+                                          none => 'No items selected from clipboard.',
                                         );
     return <<"END";
 
@@ -1038,6 +1039,29 @@ function showOptions(caller,suffix) {
     return;
 }
 
+function validateClipboard() {
+    var numchk = 0;
+    if (document.pasteform.pasting.length > 1) {
+        for (var i=0; i<document.pasteform.pasting.length; i++) {
+            if (document.pasteform.pasting[i].checked) {
+                numchk ++;
+            }
+        }
+    } else {
+        if (document.pasteform.pasting.type == 'checkbox') {
+            if (document.pasteform.pasting.checked) {
+                numchk ++; 
+            } 
+        }
+    }
+    if (numchk > 0) { 
+        return true;
+    } else {
+        alert("$lt{'none'}");
+        return false;
+    }
+}
+
 END
 
 }
@@ -2170,7 +2194,9 @@ sub update_parameter {
                     }
                 }
             } else {
-                map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which});
+                if ($env{'form.all'.$which}) {
+                    map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which});
+                }
             }
         }
         my $haschanges = 0;
@@ -2349,24 +2375,30 @@ sub editor {
             my ($paste_res,$save_error,$pastemsgarray,$lockerror) =
                 &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
                                       \%paste_errors);
-                if (ref($pastemsgarray) eq 'ARRAY') {
-                    if (@{$pastemsgarray} > 0) {
-                          
-                        $r->print('<p class="LC_info">'.
-                                  join('<br />',@{$pastemsgarray}).
-                                  '</p>');
-                    }
-                }
-                if ($lockerror) {
-                    $r->print('<p class="LC_error">'.
-                              $lockerror.
+            if (ref($pastemsgarray) eq 'ARRAY') {
+                if (@{$pastemsgarray} > 0) {
+                    $r->print('<p class="LC_info">'.
+                              join('<br />',@{$pastemsgarray}).
                               '</p>');
                 }
-                if ($save_error ne '') {
-                    return $save_error; 
+            }
+            if ($lockerror) {
+                $r->print('<p class="LC_error">'.
+                          $lockerror.
+                          '</p>');
+            }
+            if ($save_error ne '') {
+                return $save_error; 
+            }
+            if ($paste_res) {
+                my %errortext = &Apache::lonlocal::texthash (
+                                    fail      => 'Storage of folder contents failed',
+                                    failread  => 'Reading folder contents failed',
+                                    failstore => 'Storage of folder contents failed',
+                                );
+                if ($errortext{$paste_res}) {
+                    $r->print('<p class="LC_error">'.$errortext{$paste_res}.'</p>');
                 }
-            if ($paste_res ne 'ok') {
-                $r->print('<p class="LC_error">'.$paste_res.'</p>');
             }
             if (keys(%paste_errors) > 0) {
                 $r->print('<p class="LC_warning">'."\n".
@@ -3034,7 +3066,7 @@ ENDCOPY
 	    $copylink=(<<ENDCOPY);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden"><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
+<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a>
 $form_end
 ENDCOPY
             if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) {
@@ -3051,7 +3083,7 @@ ENDCUT
 	    $cutlink=(<<ENDCUT);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden"><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
+<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a>
 $form_end
 ENDCUT
             if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) {
@@ -3068,7 +3100,7 @@ ENDREM
             $removelink=(<<ENDREM);
 <form name="$formname" method="post" action="/adm/coursedocs">
 $form_common
-<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden"><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
+<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
 $form_end
 ENDREM
             if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) {
@@ -3100,11 +3132,10 @@ ENDREN
    $selectbox
    $form_end
 </td>
-<td class="LC_docs_entry_commands"><span class="LC_nobreak">
+<td class="LC_docs_entry_commands LC_nobreak">
 $removelink
 $cutlink
 $copylink
-</span>
 </td>
 END
     }
@@ -5643,69 +5674,78 @@ function propagateState(form,param) {
 }
 
 function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {
+    var dosettings;
+    var doaction;
     var control = document.togglemultsettings;
     if (context == 'actions') {
         control = document.togglemultactions;
+        doaction = 1; 
+    } else {
+        dosettings = 1;
     }
-    if (control.showmultpick.length) {
-        for (var i=0; i<control.showmultpick.length; i++) {
-            if (control.showmultpick[i].checked) {
-                if (control.showmultpick[i].value == 0) {
-                    if (context == 'settings') {
-                        targetform.changeparms.value=param;
-                        targetform.submit();
-                    } else {
-                        targetform.cmd.value=param+'_'+index;
-                        targetform.folderpath.value=folderpath;
-                        targetform.markcopy.value=idx+':'+param;
-                        targetform.copyfolder.value=folder+'.'+container;
-                        if (param == 'remove') {
-                            if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
-                                targetform.markcopy.value='';
-                                targetform.copyfolder.value='';
-                                targetform.submit();
-                            }
-                        }
-                        if (param == 'cut') {
-                            if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
-                                targetform.submit();
-                            }
-                        }
-                        if (param == 'copy') {
-                            targetform.submit();
-                        }
-                        targetform.markcopy.value='';
-                        targetform.copyfolder.value='';
-                        targetform.cmd.value='';
-                        targetform.folderpath.value='';
-                    }
-                } else {
-                    if (context == 'actions') {
-                        if (document.getElementById(param+'_'+idx)) {
-                            item = document.getElementById(param+'_'+idx);
-                            if (item.type == 'checkbox') {
-                                if (item.checked) {
-                                    item.checked = false;
-                                } else {
-                                    item.checked = true;
-                                }
-                            }
+    if (control) {
+        if (control.showmultpick.length) {
+            for (var i=0; i<control.showmultpick.length; i++) {
+                if (control.showmultpick[i].checked) {
+                    if (control.showmultpick[i].value == 1) {
+                        if (context == 'settings') {
+                            dosettings = 0;
+                        } else {
+                            doaction = 0;
                         }
                     }
                 }
-            } else {
-                if (document.getElementById(param+'_'+idx)) {
-                    checkbox = document.getElementById(param+'_'+idx);
-                    singleCheck(checkbox,idx,param);
-                }
             }
         }
-    } else {
-        if (context == 'settings') {
+    }
+    if (context == 'settings') {
+        if (dosettings == 1) {
             targetform.changeparms.value=param;
             targetform.submit();
         }
     }
+    if (context == 'actions') {
+        if (doaction == 1) {
+            targetform.cmd.value=param+'_'+index;
+            targetform.folderpath.value=folderpath;
+            targetform.markcopy.value=idx+':'+param;
+            targetform.copyfolder.value=folder+'.'+container;
+            if (param == 'remove') {
+                if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
+                    targetform.markcopy.value='';
+                    targetform.copyfolder.value='';
+                    targetform.submit();
+                }
+            }
+            if (param == 'cut') {
+                if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
+                    targetform.submit();
+                    return;
+                }
+            }
+            if (param == 'copy') {
+                targetform.submit();
+                return;
+            }
+            targetform.markcopy.value='';
+            targetform.copyfolder.value='';
+            targetform.cmd.value='';
+            targetform.folderpath.value='';
+            return;
+        } else {
+            if (document.getElementById(param+'_'+idx)) {
+                item = document.getElementById(param+'_'+idx);
+                if (item.type == 'checkbox') {
+                    if (item.checked) {
+                        item.checked = false;
+                    } else {
+                        item.checked = true;
+                        singleCheck(item,idx,param);
+                    }
+                }
+            }
+        }
+    }
     return;
 }
 
@@ -5955,7 +5995,7 @@ function checkSubmits() {
     if (dosettings == 1) {
         form.allencrypturl.value = '';
         form.allhiddenresource.value = '';
-        form.changeparams.value = 'all'; 
+        form.changeparms.value = 'all'; 
         var allidxlist = document.cumulativesettings.allidx.value;
         if ((allidxlist != '') && (allidxlist != null)) {
             var allidxs = allidxlist.split(',');