--- loncom/interface/loncourserespicker.pm	2016/10/16 21:49:51	1.14
+++ loncom/interface/loncourserespicker.pm	2018/01/12 13:33:38	1.15
@@ -1,6 +1,6 @@
 # The LearningOnline Network
 #
-# $Id: loncourserespicker.pm,v 1.14 2016/10/16 21:49:51 raeburn Exp $
+# $Id: loncourserespicker.pm,v 1.15 2018/01/12 13:33:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ resources are to be either:
 (a) exported to an IMS Content Package
 (b) subject to access blocking for the duriation of an exam/quiz.
 (c) dumped to an Authoring Space
+(d) receive shortened URLs to be used when deep-linking into a course
 
 =head1 DESCRIPTION
 
@@ -80,7 +81,8 @@ Inputs: 11.
                 (encapsulates information about resources in the course). 
 
    - $context -- Context in which course resource selection is being made.
-                 Currently imsexport and examblock are supported.
+                 Currently imsexport, examblock, dumpdocs, and shorturls
+                 are supported.
 
    - $formname  -- Name of the form in the window from which the pop-up
                    used to select course items was launched. 
@@ -106,10 +108,13 @@ Inputs: 11.
 
    - $uploadedfiles -- Reference to hash: keys are paths to files in
                        /home/httpd/lonUsers/$cdom/$1/$2/$3/$cnum/userfiles.
-   
+
+   - $tiny -- Reference to hash: keys are symbs of course items for which
+              shortened URLs have already been created.
+
    - $readonly -- if true, no "check all" or "uncheck all" buttons will
                   be displayed, and checkboxes will be disabled, if this 
-                  is for an exam block.
+                  is for an exam block or for shortened URL creation.
 
 
 Output: $output is the HTML mark-up for display/selection of content
@@ -211,9 +216,14 @@ use LONCAPA qw(:DEFAULT :match);
 
 sub create_picker {
     my ($navmap,$context,$formname,$crstype,$blockedmaps,$blockedresources,$block,$preamble,
-        $numhome,$uploadedfiles,$readonly) = @_;
+        $numhome,$uploadedfiles,$tiny,$readonly) = @_;
     return unless (ref($navmap));
-    my ($it,$output,$numdisc,%maps,%resources,%discussiontime,%currmaps,%currresources,%files);
+    my ($it,$output,$numdisc,%maps,%resources,%discussiontime,%currmaps,%currresources,%files,
+        %shorturls,$chkname);
+    $chkname = 'archive';
+    if ($context eq 'shorturls') {
+        $chkname = 'addtiny';
+    }
     $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
     if (ref($blockedmaps) eq 'HASH') {
         %currmaps = %{$blockedmaps};
@@ -222,6 +232,8 @@ sub create_picker {
         %currresources = %{$blockedresources};
     } elsif (ref($uploadedfiles) eq 'HASH') {
         %files = %{$uploadedfiles};
+    } elsif (ref($tiny) eq 'HASH') {
+        %shorturls = %{$tiny}; 
     }
     my @checked_maps;
     my $curRes;
@@ -256,7 +268,11 @@ sub create_picker {
                 &mt('Choose the uploaded course items and templated pages/problems to be copied to Authoring Space.').
                 '</span><br /><br />';
         $startcount = 3 + $numhome;
-        $onsubmit = ' onsubmit="return checkUnique(document.'.$formname.',document.'.$formname.'.archive);"';
+        $onsubmit = ' onsubmit="return checkUnique(document.'.$formname.',document.'.$formname.'.'.$chkname.');"';
+    } elsif ($context eq 'shorturls') {
+        $info = '<span class="LC_fontsize_medium">'.
+                &mt('Choose the resource(s) and/or folder(s) from Main Content for which shortened URL(s) are needed.').
+                '</span><br /><br />';
     } elsif ($context eq 'imsexport') {
         $info = &mt('Choose which items you wish to export from your '.$crstype.'.');
         $startcount = 5;
@@ -265,9 +281,9 @@ sub create_picker {
         $togglebuttons = '<br />';
     } else {
         $togglebuttons = '<input type="button" value="'.&mt('check all').'" '.
-                         'onclick="javascript:checkAll(document.'.$formname.'.archive)" />'.
+                         'onclick="javascript:checkAll(document.'.$formname.'.'.$chkname.')" />'.
                          '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                         ' onclick="javascript:uncheckAll(document.'.$formname.'.archive)" />';
+                         ' onclick="javascript:uncheckAll(document.'.$formname.'.'.$chkname.')" />';
     }
     $display = '<form name="'.$formname.'" action="" method="post"'.$onsubmit.'>'."\n";
     if ($context eq 'imsexport') {
@@ -290,7 +306,7 @@ sub create_picker {
                 '</fieldset>';
         }
         $display .= '</div>';
-    } elsif ($context eq 'examblock') {
+    } elsif (($context eq 'examblock') || ($context eq 'shorturls')) {
         $display .= $info.$togglebuttons;
     } elsif ($context eq 'dumpdocs') {
         $display .= $preamble.
@@ -311,9 +327,12 @@ sub create_picker {
         $display .= '<th>'.&mt('Access blocked?').'</th>';
     } elsif ($context eq 'dumpdocs') {
         $display .= '<th>'.&mt('Copy?').'</th>'.
-                    '<th>'.&mt("Title in $crstype").
+                    '<th>'.&mt("Title in $crstype").'</th>'.
                     '<th>'.&mt('Internal Identifier').'</th>'.
                     '<th>'.&mt('Save as ...').'</th>';
+    } elsif ($context eq 'shorturls') {
+        $display .= '<th colspan="2">'.&mt('Tiny URL').'</th>'.
+                    '<th>'.&mt("Title in $crstype").'</th>';
     }
     $display .= &Apache::loncommon::end_data_table_header_row();
     while ($curRes = $it->next()) {
@@ -339,35 +358,49 @@ sub create_picker {
                 }
             }
             $count ++;
-            my $currelem;
+            my ($currelem,$mapurl,$is_map);
             if ($context eq 'imsexport') {
                 $currelem = $count+$boards+$startcount;
             } else {
                 $currelem = $count+$startcount;
             }
-            $display .= &Apache::loncommon::start_data_table_row().
-                       '<td>'."\n".
-                       '<input type="checkbox" name="archive" value="'.$count.'" ';
+            $display .= &Apache::loncommon::start_data_table_row()."\n";
             if (($curRes->is_sequence()) || ($curRes->is_page())) {
                 $lastcontainer = $currelem;
-                $display .= 'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" ';
-                my $mapurl = (&Apache::lonnet::decode_symb($symb))[2];
-                if ($currmaps{$mapurl}) {
-                    $display .= 'checked="checked"';
-                    push(@checked_maps,$currelem);
+                $mapurl = (&Apache::lonnet::decode_symb($symb))[2];
+                $is_map = 1;
+            }
+            if ($context eq 'shorturls') {
+                if ($shorturls{$symb}) {
+                    $display .= '<td>&nbsp;</td><td align="right"><b>'."/tiny/$cdom/$shorturls{$symb}".'</b></td>'."\n";
+                } else {
+                    $display .= '<td align="left"><label><input type="checkbox" name="'.$chkname.'" '.
+                                'value="'.$count.'"'.$disabled.' />'.&mt('Add').'</label></td>'.
+                                '<td>&nbsp;</td>'."\n";
                 }
             } else {
-                if ($curRes->is_problem()) {
-                    $numprobs ++;
-                }
-                $display .= 'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" ';
-                if ($currresources{$symb}) {
-                    $display .= 'checked="checked"';
+                $display .= '<td><input type="checkbox" name="'.$chkname.'" value="'.$count.'" ';
+                if ($is_map) {
+                    $display .= 'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" ';
+                    if ($currmaps{$mapurl}) {
+                        $display .= 'checked="checked"';
+                        push(@checked_maps,$currelem);
+                    }
+                } else {
+                    if ($curRes->is_problem()) {
+                       $numprobs ++;
+                    }
+                    $display .= 'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" ';
+                    if ($currresources{$symb}) {
+                        $display .= 'checked="checked"';
+                    }
                 }
+                $display .= $disabled.' />'."\n";
             }
-            $display .= $disabled.' />'."\n";
             if ($context eq 'dumpdocs') {
                 $display .= '</td><td valign="top">';
+            } elsif ($context eq 'shorturls') {
+                $display .= '<td valign="top">';
             }
             for (my $i=0; $i<$depth; $i++) {
                 $display .= "$whitespace\n";
@@ -476,12 +509,19 @@ sub create_picker {
                     '<input type="submit" name="dumpcourse" value="'.&mt("Copy $crstype Content").'" />'.
                     '</div>';
         $numcount = $count + $startcount;
+    } elsif ($context eq 'shorturls') {
+        unless ($readonly) {
+            $display .=
+                '<p>'.
+                '<input type="submit" name="shorturls" value="'.
+                &mt('Create Tiny URL(s)').'" /></p>';
+        }
     }
     $display .= '</form>';
     my $scripttag = 
         &respicker_javascript($startcount,$numcount,$context,$formname,\%children,
-                              \%hierarchy,\@checked_maps,$numhome);
-    if ($context eq 'dumpdocs') {
+                              \%hierarchy,\@checked_maps,$numhome,$chkname);
+    if (($context eq 'dumpdocs') || ($context eq 'shorturls')) {
         return $scripttag.$display; 
     }
     my ($title,$crumbs,$args);
@@ -498,8 +538,8 @@ sub create_picker {
         $output .= &Apache::lonhtmlcommon::breadcrumbs('IMS Export').
                    &Apache::londocs::startContentScreen('tools');
     } elsif ($context eq 'dumpdocs') {
-         $output .= &Apache::lonhtmlcommon::breadcrumbs('Copying to Authoring Space').
-                    &Apache::londocs::startContentScreen('tools');
+        $output .= &Apache::lonhtmlcommon::breadcrumbs('Copying to Authoring Space').
+                   &Apache::londocs::startContentScreen('tools');
     }
     $output .= $display;
     if ($context eq 'examblock') {
@@ -512,21 +552,8 @@ sub create_picker {
 
 sub respicker_javascript {
     my ($startcount,$numitems,$context,$formname,$children,$hierarchy,
-        $checked_maps,$numhome) = @_;
-    return unless ((ref($children) eq 'HASH') && (ref($hierarchy) eq 'HASH')
-                   && (ref($checked_maps) eq 'ARRAY'));
-    my ($elem,$nested,$nameforelem);
-    if ($context eq 'dumpdocs') {
-        $elem='((parseInt(item)-'.$startcount.')*2)+'.$startcount;
-        $nested='((parseInt(nesting[item][i])-'.$startcount.')*2)+'.$startcount;
-        $nameforelem=$elem+1;
-    } else {
-        $elem='parseInt(item)';
-        $nested='parseInt(nesting[item][i])';
-    }
-    my $scripttag = <<"START";
-<script type="text/javascript">
-// <![CDATA[
+        $checked_maps,$numhome,$chkname) = @_;
+    my $check_uncheck = <<"FIRST";
 function checkAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
@@ -546,6 +573,31 @@ function uncheckAll(field) {
         field.checked = false;
     }
 }
+FIRST
+    if ($context eq 'shorturls') {
+        return <<"END";
+<script type="text/javascript">
+// <![CDATA[
+$check_uncheck
+// ]]>
+</script>
+END
+    }
+    return unless ((ref($children) eq 'HASH') && (ref($hierarchy) eq 'HASH')
+                   && (ref($checked_maps) eq 'ARRAY'));
+    my ($elem,$nested,$nameforelem);
+    if ($context eq 'dumpdocs') {
+        $elem='((parseInt(item)-'.$startcount.')*2)+'.$startcount;
+        $nested='((parseInt(nesting[item][i])-'.$startcount.')*2)+'.$startcount;
+        $nameforelem=$elem+1;
+    } else {
+        $elem='parseInt(item)';
+        $nested='parseInt(nesting[item][i])';
+    }
+    my $scripttag = <<"START";
+<script type="text/javascript">
+// <![CDATA[
+$check_uncheck
 
 function checkFolder(form,item) {
     var elem = $elem;
@@ -699,8 +751,8 @@ END
 function writeToOpener(maps,resources) {
     var checkedmaps = '';
     var checkedresources = '';
-    for (var i=0; i<document.$formname.archive.length; i++) {
-        if (document.$formname.archive[i].checked) {
+    for (var i=0; i<document.$formname.${chkname}.length; i++) {
+        if (document.$formname.${chkname}[i].checked) {
             var isResource = 1;
             var include = 1;
             var elemnum = i+1+$startcount;
@@ -721,9 +773,9 @@ function writeToOpener(maps,resources) {
             }
             if (include == 1) {
                 if (isResource == 1) {
-                    checkedresources += document.$formname.archive[i].value+',';
+                    checkedresources += document.$formname.${chkname}[i].value+',';
                 } else {
-                    checkedmaps += document.$formname.archive[i].value+',';
+                    checkedmaps += document.$formname.${chkname}[i].value+',';
                 }
             }
         }
@@ -757,7 +809,9 @@ sub get_navmap_object {
                                                        undef,{'only_body' => 1,}).
                       '<h2>'.&mt('Resource Display Failed').'</h2>';  
         } elsif ($context eq 'dumpdocs') {
-            $outcome = '<h2>'.&mt('Copying to Authoring Space unavailable');
+            $outcome = '<h2>'.&mt('Copying to Authoring Space unavailable').'</h2>';
+        } elsif ($context eq 'shorturls') {
+            $outcome = '<h2>'.&mt('Display/Setting of shortened URLs unavailable').'</h2>';
         }
         $outcome .= '<div class="LC_error">';
         if ($crstype eq 'Community') {
@@ -766,7 +820,7 @@ sub get_navmap_object {
             $outcome .= &mt('Unable to retrieve information about course contents');
         }
         $outcome .= '</div>';
-        if (($context eq 'imsexport') || ($context eq 'dumpdocs')) {
+        if (($context eq 'imsexport') || ($context eq 'dumpdocs') || ($context eq 'shorturls') ) {
             $outcome .= '<a href="/adm/coursedocs">';
             if ($crstype eq 'Community') {
                 $outcome .= &mt('Return to Community Editor');
@@ -816,10 +870,14 @@ sub enumerate_course_contents {
                     }
                 }
                 $count ++;
-                if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    $map_url->{$count} = (&Apache::lonnet::decode_symb($symb))[2];
-                } else {
+                if ($context eq 'shorturls') {
                     $resource_symb->{$count} = $ressymb;
+                } else {
+                    if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                        $map_url->{$count} = (&Apache::lonnet::decode_symb($symb))[2];
+                    } else {
+                        $resource_symb->{$count} = $ressymb;
+                    }
                 }
                 $titleref->{$count} = $curRes->title();
             }