# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1558033052 -10800
# Node ID c7093ad1785807a4fbdd9704bf24a31cf0104fbb
# Parent  0a2117349f463522c39360c8e2e4ec87fb2de2a2
Cleanups.

diff -r 0a2117349f46 -r c7093ad17858 msitegen.inc.php
--- a/msitegen.inc.php	Tue May 14 14:45:36 2019 +0300
+++ b/msitegen.inc.php	Thu May 16 21:57:32 2019 +0300
@@ -546,6 +546,23 @@
 }
 
 
+function stConnectSQLDB()
+{
+  global $db;
+  try {
+    $db = new PDO(stGetSetting("sqlDB"),
+      stGetSetting("sqlUsername", NULL),
+      stGetSetting("sqlPassword", NULL),
+      stGetSetting("sqlOptions", array()));
+  }
+  catch (PDOException $e) {
+    stLogError("Could not connect to SQL database: ".$e->getMessage().".");
+    return FALSE;
+  }
+  return ($db !== FALSE);
+}
+
+
 function stDBGetSQLParam($dbh, $type, $value)
 {
   switch ($type)
@@ -561,30 +578,13 @@
 }
 
 
-function stConnectSQLDB()
+function stDBPrepareSQLUpdate($dbh, $table, $cond, $pairs, $values = NULL)
 {
-  global $db;
-  try {
-    $db = new PDO(stGetSetting("sqlDB"),
-      stGetSetting("sqlUsername", NULL),
-      stGetSetting("sqlPassword", NULL),
-      stGetSetting("sqlOptions", array()));
-  }
-  catch (PDOException $e) {
-    stLogError("Could not connect to SQL database: ".$e->getMessage().".");
-    return FALSE;
-  }
-  $db = stConnectSQLDBSpec(stGetSetting("sqlDB"));
-  return ($db !== FALSE);
-}
-
-
-function stDBPrepareSQLUpdate($dbh, $table, $cond, $pairs)
-{
-  $sql = array();
+  $sql = [];
   foreach ($pairs as $name => $attr)
   {
-    $sql[] = $name."=".stDBGetSQLParam($dbh, $attr, $name);
+    $sql[] = $name."=".stDBGetSQLParam($dbh,
+      $attr, $values !== NULL ? $values[$name] : $name);
   }
   return
     "UPDATE ".$table." SET ".implode(",", $sql).