Use return link everywhere

diff --git a/cpan/download.cgi b/cpan/download.cgi
index 433184e..3d7cdb8 100755 (executable)
--- a/cpan/download.cgi
+++ b/cpan/download.cgi
@@ -88,7 +88,8 @@ elsif ($in{'source'} == 3) {
                        print "</ul>\n";
                        $i++;
                        }
-               &ui_print_footer("", $text{'index_return'});
+               &ui_print_footer($in{'return'},
+                                $in{'returndesc'} || $text{'index_return'});
                exit;
                }
 
@@ -357,12 +358,14 @@ print &ui_form_end([ [ undef, $text{'download_cont'} ],
                        ( [ "need", $text{'download_need'} ] ) : ( )
                   ]);
 
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($in{'return'},
+                $in{'returndesc'} || $text{'index_return'});
 
 sub install_error
 {
 print "<br><b>$main::whatfailed : $_[0]</b> <p>\n";
-&ui_print_footer("", $text{'index_return'});
+&ui_print_footer($in{'return'},
+                $in{'returndesc'} || $text{'index_return'});
 exit;
 }
 

diff --git a/cpan/install.cgi b/cpan/install.cgi
index ee5b80b..362352a 100755 (executable)
--- a/cpan/install.cgi
+++ b/cpan/install.cgi
@@ -88,12 +88,7 @@ sub clean_up
 {
 system("rm -rf $mod_dir") if ($mod_dir && -d $mod_dir);
 unlink(@pfile) if ($in{'need_unlink'} && (!$config{'save_partial'} || $_[0]));
-if ($in{'return'}) {
-       &ui_print_footer($in{'return'}, $in{'returndesc'});
-       }
-else {
-       &ui_print_footer("", $text{'index_return'});
-       }
+&ui_print_footer($in{'return'}, $in{'returndesc'} || $text{'index_return'});
 }
 
 # show_output(desc, dir, command)