Quote strings in JS
authorJamie Cameron <jcameron@webmin.com>
Sat, 5 Feb 2011 18:36:47 +0000 (10:36 -0800)
committerJamie Cameron <jcameron@webmin.com>
Sat, 5 Feb 2011 18:36:47 +0000 (10:36 -0800)
file/file-lib.pl

index c15e691..d41fd21 100755 (executable)
@@ -388,17 +388,19 @@ if ($zip) {
        $err = &extract_archive(&unmake_chroot($path), $zip-1);
        if (!$err) {
                # Refresh whole dir
-               $refresh = $in{'dir'};
+               $refresh = $dir;
                }
        }
 $info = &file_info_line(&unmake_chroot($refresh), $refresh);
 print "<script>\n";
 print "opener.document.FileManager.",
-      "upload_notify(\"$refresh\", \"$info\");\n";
+      "upload_notify(\"".&quote_escape($refresh)."\", ",
+      "\"".&quote_escape($info)."\");\n";
 if ($err) {
        $err =~ s/\r//g;
        $err =~ s/\n/\\n/g;
-       print "opener.document.FileManager.","upload_error(\"",&text('zip_err', $err),"\");\n";
+       print "opener.document.FileManager.",
+             "upload_error(\"",&quote_escape(&text('zip_err', $err)),"\");\n";
        }
 print "close();\n";
 print "</script>\n";