We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit aa1bc621 authored by Evan Prodromou's avatar Evan Prodromou

Make a loop instead of repeating almost identical text in install

parent 8d05768e
......@@ -182,26 +182,17 @@ function handlePost()
showForm();
return;
}
updateStatus("Adding SMS carrier data to database...");
$res = runDbScript(INSTALLDIR.'/db/sms_carrier.sql', $conn);
if ($res === false) {
updateStatus("Can't run SMS carrier script.", true);
showForm();
return;
}
updateStatus("Adding notice source data to database...");
$res = runDbScript(INSTALLDIR.'/db/notice_source.sql', $conn);
if ($res === false) {
updateStatus("Can't run notice source script.", true);
showForm();
return;
}
updateStatus("Adding foreign service data to database...");
$res = runDbScript(INSTALLDIR.'/db/foreign_services.sql', $conn);
if ($res === false) {
updateStatus("Can't run foreign service script.", true);
showForm();
return;
foreach (array('sms_carrier' => 'SMS carrier',
'notice_source' => 'notice source',
'foreign_services' => 'foreign service')
as $scr => $name) {
updateStatus(sprintf("Adding %s data to database...", $name));
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
if ($res === false) {
updateStatus(sprintf("Can't run %d script.", $name), true);
showForm();
return;
}
}
updateStatus("Writing config file...");
$sqlUrl = "mysqli://$username:$password@$host/$database";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment