--- a/msitegen.inc.php	Sat Dec 07 17:51:35 2013 +0200
+++ b/msitegen.inc.php	Sat Dec 07 17:52:40 2013 +0200
@@ -736,48 +736,22 @@
 }
 
 
-function stCSQLError($sql)
-{
-  global $db;
-  die("Error executing SQL query: ".implode("; ", $db->errorInfo())." in statement \"".$sql."\"\n");
-  exit;
-}
-
-
-function stCLIConnectSQLDB($dbspec)
+function stGetDBMeta($dbh, $name)
 {
-  global $db;
-  try {
-    $db = new PDO($dbspec);
-  }
-  catch (PDOException $e) {
-    error_log("Could not connect to SQL database '".$dbspec."': ".$e->getMessage().".");
-    return FALSE;
-  }
-  return TRUE;
-}
-
-
-function stGetDBMeta($name)
-{
-  global $db;
-
-  if (($item = stFetchSQL("SELECT * FROM dbmeta WHERE key=".$db->quote($name))) === FALSE)
+  if (($item = stDBFetchSQL($dbh, "SELECT * FROM dbmeta WHERE key=".$dbh->quote($name))) === FALSE)
     return FALSE;
   
   return stGetSQLSettingData($item);
 }
 
 
-function stSetDBMeta($name, $value)
+function stSetDBMeta($dbh, $name, $value)
 {
-  global $db;
-
-  if (($item = stFetchSQL("SELECT * FROM dbmeta WHERE key=".$db->quote($name))) === FALSE)
+  if (($item = stDBFetchSQL($dbh, "SELECT * FROM dbmeta WHERE key=".$dbh->quote($name))) === FALSE)
     return FALSE;
 
-  $sql = "UPDATE dbmeta SET ".stGetSettingSQL($item, $value)." WHERE key=".$db->quote($name);
-  return stExecSQL($sql);
+  $sql = "UPDATE dbmeta SET ".stGetSettingSQL($item, $value)." WHERE key=".$dbh->quote($name);
+  return stDBExecSQL($dbh, $sql);
 }