Your Joomla site has been restored and configured.
@@ -1484,7 +1782,9 @@ function goStep(n) {
else if (sn < n) s.classList.add('done');
});
- if (n === 5) loadAdmins();
+ if (n === 3) scanTables();
+ if (n === 6) loadAdmins();
+ if (n === 7) checkSanitizedPasswords();
}
function setStatus(id, msg, type) {
@@ -1621,7 +1921,111 @@ async function runExtract() {
}
}
-// Step 3
+// Step 3: Table Conflict Resolution
+let tableList = [];
+
+async function scanTables() {
+ const container = document.getElementById('tableResolutionList');
+
+ // Only scan once
+ if (tableList.length > 0) return;
+
+ log('Scanning database.sql for table names...');
+ const r = await post('scanTables');
+
+ if (!r.success || !r.tables || r.tables.length === 0) {
+ container.innerHTML = '
No tables found in database.sql (or file not present). You can skip this step.
';
+ setStatus('tableScanStatus', r.tables ? 'No tables found' : (r.message || 'Scan failed'), r.success ? '' : 'error');
+ log(r.message || 'No tables found');
+ return;
+ }
+
+ tableList = r.tables;
+ log('Found ' + r.count + ' tables');
+ setStatus('tableScanStatus', 'Found ' + r.count + ' tables', 'success');
+
+ renderTableList();
+}
+
+function renderTableList() {
+ const container = document.getElementById('tableResolutionList');
+ container.innerHTML = '';
+
+ var resolutions = {};
+
+ tableList.forEach(function(name) {
+ var row = document.createElement('div');
+ row.style.cssText = 'display:flex;align-items:center;justify-content:space-between;padding:0.5rem 0.75rem;border-bottom:1px solid #f1f5f9;font-size:0.85rem;';
+
+ var label = document.createElement('span');
+ label.style.cssText = 'font-family:monospace;color:#334155;word-break:break-all;flex:1;margin-right:0.75rem;';
+ label.textContent = name;
+
+ var sel = document.createElement('select');
+ sel.dataset.table = name;
+ sel.className = 'table-mode-select';
+ sel.style.cssText = 'padding:0.3rem 0.5rem;border:1px solid #d1d5db;border-radius:4px;font-size:0.8rem;min-width:120px;background:#fff;';
+
+ var modes = [
+ ['replace', 'Replace'],
+ ['skip', 'Skip'],
+ ['merge', 'Merge'],
+ ['dataonly', 'Data Only']
+ ];
+
+ modes.forEach(function(m) {
+ var opt = document.createElement('option');
+ opt.value = m[0];
+ opt.textContent = m[1];
+ sel.appendChild(opt);
+ });
+
+ sel.addEventListener('change', updateTableResolutions);
+
+ row.appendChild(label);
+ row.appendChild(sel);
+ container.appendChild(row);
+
+ resolutions[name] = 'replace';
+ });
+
+ document.getElementById('tableResolutions').value = JSON.stringify(resolutions);
+}
+
+function updateTableResolutions() {
+ var resolutions = {};
+ document.querySelectorAll('.table-mode-select').forEach(function(sel) {
+ resolutions[sel.dataset.table] = sel.value;
+ });
+ document.getElementById('tableResolutions').value = JSON.stringify(resolutions);
+}
+
+function setAllTableMode(mode) {
+ document.querySelectorAll('.table-mode-select').forEach(function(sel) {
+ sel.value = mode;
+ });
+ updateTableResolutions();
+ log('Set all tables to: ' + mode);
+}
+
+function presetExceptUsers() {
+ var userTables = ['#__users', '#__user_usergroup_map', '#__user_profiles'];
+
+ document.querySelectorAll('.table-mode-select').forEach(function(sel) {
+ var tableName = sel.dataset.table;
+
+ if (userTables.indexOf(tableName) !== -1) {
+ sel.value = 'skip';
+ } else {
+ sel.value = 'replace';
+ }
+ });
+
+ updateTableResolutions();
+ log('Preset: Replace all except user tables (skipped)');
+}
+
+// Step 4
function getDbParams() {
return {
db_host: document.getElementById('dbHost').value,
@@ -1647,7 +2051,12 @@ async function runDatabase() {
log('Importing database...');
dbConfig = getDbParams();
- const r = await post('database', dbConfig);
+ // Include table conflict resolution selections
+ var tableRes = document.getElementById('tableResolutions');
+ var dbParams = Object.assign({}, dbConfig, {
+ table_resolutions: tableRes ? tableRes.value : '{}'
+ });
+ const r = await post('database', dbParams);
document.getElementById('dbProgress').style.width = '100%';
setBtnLoading(btn, false);
@@ -1655,17 +2064,20 @@ async function runDatabase() {
if (r.success) {
setStatus('dbStatus', r.message, 'success');
log(r.message);
+ if (r.skipped && r.skipped > 0) {
+ log(' Skipped ' + r.skipped + ' statements due to conflict resolution');
+ }
if (r.errorList && r.errorList.length > 0) {
r.errorList.forEach(function(e) { log(' Warning: ' + e); });
}
- setTimeout(function() { goStep(4); }, 500);
+ setTimeout(function() { goStep(5); }, 500);
} else {
setStatus('dbStatus', r.message, 'error');
log('FAILED: ' + r.message);
}
}
-// Step 4
+// Step 5
async function runConfig() {
const btn = document.getElementById('btnConfig');
setBtnLoading(btn, true);
@@ -1686,14 +2098,14 @@ async function runConfig() {
if (r.success) {
setStatus('configStatus', r.message, 'success');
log(r.message);
- setTimeout(function() { goStep(5); }, 500);
+ setTimeout(function() { goStep(6); }, 500);
} else {
setStatus('configStatus', r.message, 'error');
log('FAILED: ' + r.message);
}
}
-// Step 5
+// Step 6
async function loadAdmins() {
const sel = document.getElementById('adminSelect');
while (sel.firstChild) sel.removeChild(sel.firstChild);
@@ -1738,20 +2150,65 @@ async function runResetAdmin() {
if (r.success) {
setStatus('adminStatus', r.message, 'success');
log(r.message);
- setTimeout(function() { goStep(6); }, 500);
+ setTimeout(function() { goStep(7); }, 500);
} else {
setStatus('adminStatus', r.message, 'error');
log('FAILED: ' + r.message);
}
}
-// Step 6
+// Step 7: Post-Restore
+async function checkSanitizedPasswords() {
+ log('Checking for sanitized password hashes...');
+
+ try {
+ const r = await post('detectSanitized', dbConfig);
+
+ if (r.success && r.detected) {
+ document.getElementById('postRestoreSanitizedWarn').style.display = '';
+ document.getElementById('prResetPasswords').checked = true;
+ log('WARNING: ' + r.count + ' user(s) have sanitized placeholder passwords');
+ } else {
+ document.getElementById('postRestoreSanitizedWarn').style.display = 'none';
+ log('No sanitized passwords detected');
+ }
+ } catch (e) {
+ log('Could not check for sanitized passwords: ' + e.message);
+ }
+}
+
+async function runPostRestore() {
+ const btn = document.getElementById('btnPostRestore');
+ const tasks = [];
+ document.querySelectorAll('.post-restore-task:checked').forEach(function(cb) { tasks.push(cb.value); });
+
+ if (tasks.length === 0) { goStep(8); return; }
+
+ setBtnLoading(btn, true);
+ log('Running ' + tasks.length + ' post-restore task(s)...');
+
+ const params = Object.assign({}, dbConfig, { tasks: JSON.stringify(tasks) });
+ const r = await post('postRestore', params);
+
+ setBtnLoading(btn, false);
+
+ if (r.success) {
+ setStatus('postRestoreStatus', r.message, 'success');
+ r.results.forEach(function(msg) { log(' ' + msg); });
+ setTimeout(function() { goStep(8); }, 500);
+ } else {
+ setStatus('postRestoreStatus', r.message, 'error');
+ log('FAILED: ' + r.message);
+ }
+}
+
+// Step 8
async function runProvision() {
const btn = document.getElementById('btnProvision');
const tasks = [];
document.querySelectorAll('.prov-task:checked').forEach(function(cb) { tasks.push(cb.value); });
- if (tasks.length === 0) { goStep(7); return; }
+ if (tasks.length === 0) { goStep(9); return; }
setBtnLoading(btn, true);
log('Running ' + tasks.length + ' provisioning tasks...');
@@ -1764,14 +2221,14 @@ async function runProvision() {
if (r.success) {
setStatus('provisionStatus', r.message, 'success');
r.results.forEach(function(msg) { log(' ' + msg); });
- setTimeout(function() { goStep(7); }, 500);
+ setTimeout(function() { goStep(9); }, 500);
} else {
setStatus('provisionStatus', r.message, 'error');
log('FAILED: ' + r.message);
}
}
-// Step 7
+// Step 9
async function runCleanup() {
log('Cleaning up restore files...');
const r = await post('cleanup');