Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions Themes/default/Admin.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -729,21 +729,7 @@ function template_not_done()
</form>
</div><!-- .windowbg -->
<script>
var countdown = ', Utils::$context['continue_countdown'], ';
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.autoSubmit.submit();
else if (countdown == -1)
return;

document.forms.autoSubmit.cont.value = "', Lang::getTxt('not_done_continue', file: 'Admin'), ' (" + countdown + ")";
countdown--;

setTimeout(doAutoSubmit, 1000);
}
doAutoSubmit(', Utils::$context['continue_countdown'], ', "', Lang::getTxt('not_done_continue', file: 'Admin'), '");
</script>';
}

Expand Down Expand Up @@ -1560,21 +1546,7 @@ function template_repair_boards()
{
echo '
<script>
var countdown = 5;
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.recount_form.submit();
else if (countdown == -1)
return;

document.forms.recount_form.recount_now.value = "', Lang::getTxt('errors_recount_now', file: 'Admin'), ' (" + countdown + ")";
countdown--;

setTimeout(doAutoSubmit, 1000);
}
doAutoSubmit(5, "', Lang::getTxt('errors_recount_now', file: 'Admin'), '", "recount_form", "recount_now");
</script>';
}
}
Expand Down
16 changes: 1 addition & 15 deletions Themes/default/ManageNews.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -407,21 +407,7 @@ function template_email_members_send()
</form>

<script>
var countdown = 2;
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.autoSubmit.submit();
else if (countdown == -1)
return;

document.forms.autoSubmit.b.value = "', Lang::getTxt('email_continue', file: 'Admin'), ' (" + countdown + ")";
countdown--;

setTimeout("doAutoSubmit();", 1000);
}
doAutoSubmit(2, "', Lang::getTxt('email_continue', file: 'Admin'), '");
</script>';
}

Expand Down
16 changes: 1 addition & 15 deletions Themes/default/ManageSearch.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -330,21 +330,7 @@ function template_create_index_progress()
<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">
</form>
<script>
var countdown = 10;
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.autoSubmit.submit();
else if (countdown == -1)
return;

document.forms.autoSubmit.b.value = "', Lang::getTxt('search_create_index_continue', file: 'Search'), ' (" + countdown + ")";
countdown--;

setTimeout(doAutoSubmit, 1000);
}
doAutoSubmit(10, "', Lang::getTxt('search_create_index_continue', file: 'Search'), '");
</script>';

}
Expand Down
16 changes: 1 addition & 15 deletions Themes/default/Packages.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -1856,20 +1856,6 @@ function template_action_permissions()
// Just the countdown stuff
echo '
<script>
var countdown = ', $countDown, ';
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.perm_submit.submit();
else if (countdown == -1)
return;

document.getElementById(\'cont\').value = "', Lang::getTxt('not_done_continue', file: 'Admin'), ' (" + countdown + ")";
countdown--;

setTimeout(doAutoSubmit, 1000);
}
doAutoSubmit(', $countDown, ', "', Lang::getTxt('not_done_continue', file: 'Admin'), '", "perm_submit", "go");
</script>';
}
16 changes: 1 addition & 15 deletions Themes/default/Post.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -854,21 +854,7 @@ function template_announcement_send()
</div><!-- #announcement -->
<br>
<script>
var countdown = 2;
doAutoSubmit();

function doAutoSubmit()
{
if (countdown == 0)
document.forms.autoSubmit.submit();
else if (countdown == -1)
return;

document.forms.autoSubmit.b.value = "', Lang::getTxt('announce_continue', file: 'Post'), ' (" + countdown + ")";
countdown--;

setTimeout(doAutoSubmit, 1000);
}
doAutoSubmit(2, "', Lang::getTxt('announce_continue', file: 'Post'), '");
</script>';
}

Expand Down
18 changes: 2 additions & 16 deletions Themes/default/UpgradeTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,25 +93,11 @@ public static function lower(): void

echo '
<script>
let countdown = ' . (Maintenance::$tool->isDebug() ? '-1' : '3') . ';
let dontSubmit = false;

function doAutoSubmit()
{
if (countdown == 0 && !dontSubmit) {
document.getElementById("upform").submit();
} else if (countdown == -1) {
return;
}

document.getElementById("contbutt").value = "', Lang::getTxt('action_continue', file: 'Maintenance'), ' (" + countdown + ")";
countdown--;

setTimeout("doAutoSubmit();", 1000);
}
setTimeout(\'doAutoSubmit(' . (Maintenance::$tool->isDebug() ? '-1' : '3') . ', "', Lang::getTxt('action_continue', file: 'Maintenance'), '", "upform", "contbutt");\', 1000);
</script>';

// Are we on a pause?
// !!! TODO: Why?
if (!empty(Maintenance::$context['pause'])) {
echo '
<script defer>
Expand Down
29 changes: 29 additions & 0 deletions Themes/default/scripts/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -1764,3 +1764,32 @@ smc_preview_post.prototype.onDocSent = function (XMLDoc)

location.hash = '#' + this.opts.sPreviewSectionContainerID;
}

function doAutoSubmit(countdown, txtMessage, formName = 'autoSubmit', fieldName = 'cont') {
const form = document.forms[formName];

// Ensure the form exists
if (!form) {
console.error('Form with name "' + formName + '" not found.');
return;
}

// Handle the countdown completion
if (countdown <= 0) {
form.submit();
return;
}

// Update the field if it exists
const contField = form.elements[fieldName];
if (contField) {
contField.value = txtMessage + ' (' + countdown + ')';
} else {
console.warn('Field "' + fieldName + '" not found in form "' + formName + '".');
}

// Schedule the next countdown tick
setTimeout(() => {
doAutoSubmit(countdown - 1, txtMessage, formName, fieldName);
}, 1000);
}