--- loncom/interface/londocs.pm	2025/03/15 01:03:33	1.727
+++ loncom/interface/londocs.pm	2025/06/14 02:50:25	1.728
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.727 2025/03/15 01:03:33 raeburn Exp $
+# $Id: londocs.pm,v 1.728 2025/06/14 02:50:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1704,7 +1704,7 @@ sub group_import {
                 my $marker = $2;
                 my $info = $3;
                 my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings);
-                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend','returnurl','backtourl');
+                my @extras = ('linktext','explanation','crslabel','crstitle','crsappend','returnurl','backtourl','desturl','delay');
                 my @toolinfo = split(/:/,$info);
                 if ($residx) {
                     %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum);
@@ -1722,10 +1722,16 @@ sub group_import {
                 ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'},
                  $toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'},
                  $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'},
-                 $toolhash{'returnurl'},$toolhash{'backtourl'}) = @toolinfo;
+                 $toolhash{'returnurl'},$toolhash{'backtourl'},$toolhash{'desturl'},
+                 $toolhash{'delay'}) = @toolinfo;
                 foreach my $item (@extras) {
                     $toolhash{$item} = &unescape($toolhash{$item});
                 }
+                foreach my $item ('crsappend','gradable','returnurl',
+                                  'backtourl','desturl','delay') {
+                    $toolhash{$item} =~ s/^\s+//;
+                    $toolhash{$item} =~ s/\s+$//;
+                }
                 if ($folder =~ /^supplemental/) {
                     delete($toolhash{'gradable'});
                 } else {
@@ -1786,6 +1792,7 @@ sub group_import {
                                     }
                                 }
                             }
+                            my $nocrsdest = 1;
                             if (ref($tools{'crsconf'}) eq 'HASH') {
                                 foreach my $item ('label','title','linktext','explanation') {
                                     my $crsitem;
@@ -1817,6 +1824,17 @@ sub group_import {
                                     delete($toolhash{'returnurl'});
                                     delete($toolhash{'backtourl'});
                                 }
+                                if ($tools{'crsconf'}{'desturl'}) {
+                                    if ($toolhash{'desturl'} =~ m{^(https?\://|/)}) {
+                                        undef($nocrsdest);
+                                    } else {
+                                        delete($toolhash{'desturl'});
+                                        delete($toolhash{'delay'});
+                                    }
+                                } else {
+                                    delete($toolhash{'desturl'});
+                                    delete($toolhash{'delay'});
+                                }
                             }
                             if ($toolhash{'passback'}) {
                                 my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4);
@@ -1828,6 +1846,17 @@ sub group_import {
                                 $toolhash{'rostersecret'} = $rostersecret;
                                 $toolhash{'rostersecretdate'} = time;
                             }
+                            if ($nocrsdest) {
+                                foreach my $item ('desturl','delay') {
+                                    if (exists($toolhash{$item})) {
+                                        delete($toolhash{$item});
+                                    }
+                                }
+                            } elsif (exists($toolhash{'delay'})) {
+                                unless ($toolhash{'delay'} =~ /^(\d+\.?\d*)$/) {
+                                    delete($toolhash{'delay'});
+                                }
+                            }
                             my $changegradable;
                             if (($residx) && ($folder =~ /^default/)) {
                                 if ($toolsettings{'gradable'}) {
@@ -1852,6 +1881,12 @@ sub group_import {
                                 if (($toolsettings{'returnurl'} ne '') && (!exists($toolhash{'returnurl'}))) {
                                     push(@deleted,'returnurl');
                                 }
+                                if (($toolsettings{'desturl'} ne '') && (!exists($toolhash{'desturl'}))) {
+                                    push(@deleted,'desturl');
+                                }
+                                if (($toolsettings{'delay'} ne '') && (!exists($toolhash{'delay'}))) {
+                                    push(@deleted,'delay');
+                                }
                             }
                             my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum);
                             if ($putres eq 'ok') {