diff options
author | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
---|---|---|
committer | CiaranG <ciaran@ciarang.com> | 2009-03-05 16:18:59 +0000 |
commit | 3c53e821cc545d14807c9197d07e8686028a846d (patch) | |
tree | e51f35dc8783ea2ba3c9443d28a55a707330909a /install.php | |
parent | e5345d8d7a5b519cfb24c9e2a971b485b3c1c872 (diff) | |
parent | ea0c5f565c9ca4b34c1071a51333f0f842a954b9 (diff) |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'install.php')
-rw-r--r-- | install.php | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/install.php b/install.php index 18fc362b6..0240349bb 100644 --- a/install.php +++ b/install.php @@ -130,6 +130,36 @@ function handlePost() $password = $_POST['password']; $sitename = $_POST['sitename']; + if (empty($host)) { + updateStatus("No hostname specified.", true); + showForm(); + return; + } + + if (empty($database)) { + updateStatus("No database specified.", true); + showForm(); + return; + } + + if (empty($username)) { + updateStatus("No username specified.", true); + showForm(); + return; + } + + if (empty($password)) { + updateStatus("No password specified.", true); + showForm(); + return; + } + + if (empty($sitename)) { + updateStatus("No sitename specified.", true); + showForm(); + return; + } + updateStatus("Starting installation..."); updateStatus("Checking database..."); $conn = mysql_connect($host, $username, $password); @@ -152,6 +182,18 @@ function handlePost() 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"; $res = writeConf($sitename, $sqlUrl); |