diff --git a/www/assets/js/test.js b/www/assets/js/test.js index 3f08d48ba3..c8e4c5cadf 100644 --- a/www/assets/js/test.js +++ b/www/assets/js/test.js @@ -16,8 +16,7 @@ function ValidateInput(form, remainingRuns) { if ( (form.url.value == "" || form.url.value == "Enter a Website URL") && form.script.value == "" && - (form["bulkurls"] == undefined || form.bulkurls.value == "") && - (form["bulkfile"] == undefined || form.bulkfile.value == "") + (form["bulkurls"] == undefined || form.bulkurls.value == "") ) { alert("Please enter an URL to test."); form.url.focus(); diff --git a/www/home.php b/www/home.php index 57a2d99833..bed40d8bf3 100644 --- a/www/home.php +++ b/www/home.php @@ -982,10 +982,15 @@ function enableDisableLHSimple(){ + + Type in or read + + +


- or
- upload list of URLs (one per line): @@ -1131,6 +1136,7 @@ function LoadLocations() // Determine if bulk testing should be shown function ShowBulk() { + return true; global $admin; global $USER_EMAIL; global $request_context; diff --git a/www/runtest.php b/www/runtest.php index 693527a967..f20a6348e5 100644 --- a/www/runtest.php +++ b/www/runtest.php @@ -613,8 +613,7 @@ // see if it is a batch test $test['batch'] = 0; if ( - (isset($req_bulkurls) && strlen($req_bulkurls)) || - (isset($_FILES['bulkfile']) && isset($_FILES['bulkfile']['tmp_name']) && strlen($_FILES['bulkfile']['tmp_name'])) + isset($req_bulkurls) && strlen($req_bulkurls) ) { $test['batch'] = 1; $is_bulk_test = true; @@ -1158,9 +1157,6 @@ function buildSelfHost($hosts) if (isset($req_bulkurls) && strlen($req_bulkurls)) { $bulkUrls = $req_bulkurls . "\n"; } - if (isset($_FILES['bulkfile']) && isset($_FILES['bulkfile']['tmp_name']) && strlen($_FILES['bulkfile']['tmp_name'])) { - $bulkUrls .= file_get_contents($_FILES['bulkfile']['tmp_name']); - } $current_mode = 'urls'; if (strlen($bulkUrls)) {