badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[setup] make niceurl testing more accurate, see #1024

Browse source
This commit is contained in:
Shish 2024-02-07 20:44:39 +00:00
parent e9c8e852a5
commit 9f9ee49e02
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/setup/main.php
View file

@ -355,30 +355,6 @@ class Setup extends Extension
$themes[$human] = $name;
}
$test_url = str_replace("/index.php", "/nicetest", $_SERVER["SCRIPT_NAME"]);
$nicescript = "<script type='text/javascript'>
checkbox = document.getElementById('nice_urls');
out_span = document.getElementById('nicetest');
checkbox.disabled = true;
out_span.innerHTML = '(testing...)';
document.addEventListener('DOMContentLoaded', () => {
var http_request = new XMLHttpRequest();
http_request.open('GET', '$test_url', false);
http_request.send(null);
if(http_request.status === 200 && http_request.responseText === 'ok') {
checkbox.disabled = false;
out_span.innerHTML = '(tested ok)';
}
else {
checkbox.disabled = true;
out_span.innerHTML = '(test failed)';
}
});
</script>";
$sb = $event->panel->create_new_block("General");
$sb->position = 0;
$sb->add_text_option(SetupConfig::TITLE, "Site title: ");
@ -388,7 +364,7 @@ class Setup extends Extension
$sb->add_choice_option(SetupConfig::THEME, $themes, "<br>Theme: ");
//$sb->add_multichoice_option("testarray", array("a" => "b", "c" => "d"), "<br>Test Array: ");
$sb->add_bool_option("nice_urls", "<br>Nice URLs: ");
$sb->add_label("<span title='$test_url' id='nicetest'>(Javascript inactive, can't test!)</span>$nicescript");
$sb->add_label("<span id='nicetest'>(Javascript inactive, can't test!)</span>");
$sb = $event->panel->create_new_block("Remote API Integration");
$sb->add_label("<a href='https://akismet.com/'>Akismet</a>");

23
ext/setup/script.js Normal file
View file

@ -0,0 +1,23 @@
document.addEventListener('DOMContentLoaded', () => {
const checkbox = document.getElementById('nice_urls');
const out_span = document.getElementById('nicetest');
if(checkbox !== null && out_span !== null) {
checkbox.disabled = true;
out_span.innerHTML = '(testing...)';
fetch(document.body.getAttribute('data-base-href') + "/nicetest").then(response => {
if(response.ok) {
checkbox.disabled = false;
out_span.innerHTML = '(test passed)';
}
else {
checkbox.disabled = true;
out_span.innerHTML = '(test failed)';
}
}).catch(() => {
checkbox.disabled = true;
out_span.innerHTML = '(request failed)';
});
}
});