From e7620812b01f3eda31ccf21f9dc5b1f17ba6ce57 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 12 Apr 2015 09:24:25 +0200
Subject: Installer: Remove system() function use (#1490139)

Move some functionality of scripts from bin/ into rcmail_utils class
---
 bin/initdb.sh | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

(limited to 'bin/initdb.sh')

diff --git a/bin/initdb.sh b/bin/initdb.sh
index bf3244876..fd22007d2 100755
--- a/bin/initdb.sh
+++ b/bin/initdb.sh
@@ -37,39 +37,6 @@ if (!file_exists($opts['dir'])) {
     rcube::raise_error("Specified database schema directory doesn't exist.", false, true);
 }
 
-$RC = rcube::get_instance();
-$DB = rcube_db::factory($RC->config->get('db_dsnw'));
-
-$DB->set_debug((bool)$RC->config->get('sql_debug'));
-
-// Connect to database
-$DB->db_connect('w');
-if (!$DB->is_connected()) {
-    rcube::raise_error("Error connecting to database: " . $DB->is_error(), false, true);
-}
-
-$file = $opts['dir'] . '/' . $DB->db_provider . '.initial.sql';
-if (!file_exists($file)) {
-    rcube::raise_error("DDL file $file not found", false, true);
-}
-
-echo "Creating database schema... ";
-
-if ($sql = file_get_contents($file)) {
-    if (!$DB->exec_script($sql)) {
-        $error = $DB->is_error();
-    }
-}
-else {
-    $error = "Unable to read file $file or it is empty";
-}
-
-if ($error) {
-    echo "[FAILED]\n";
-    rcube::raise_error($error, false, true);
-}
-else {
-    echo "[OK]\n";
-}
+rcmail_utils::db_init($opts['dir']);
 
 ?>
-- 
cgit v1.2.3