Mercurial > hg > fapweb
changeset 1109:ac3bd4e94555
Merge.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 16 May 2019 21:59:44 +0300 |
parents | c7093ad17858 (current diff) acb65ff40ce1 (diff) |
children | a5f52e54c9da |
files | msitegen.inc.php |
diffstat | 1 files changed, 12 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/msitegen.inc.php Thu May 16 21:57:32 2019 +0300 +++ b/msitegen.inc.php Thu May 16 21:59:44 2019 +0300 @@ -592,15 +592,13 @@ } -function stDBPrepareSQL($dbh) +function stDBPrepareSQL_V($dbh, $fmt, $argv) { - $argc = func_num_args(); - $argv = func_get_args(); - - $fmt = $argv[1]; $len = strlen($fmt); $sql = ""; - $argn = 2; + $argn = 0; + $argc = count($argv); + for ($pos = 0; $pos < $len; $pos++) { if ($fmt[$pos] == "%") @@ -622,34 +620,18 @@ } +function stDBPrepareSQL($dbh) +{ + $argv = func_get_args(); + return stDBPrepareSQL_V($dbh, $argv[1], array_splice($argv, 2)); +} + + function stPrepareSQL() { global $db; - $argc = func_num_args(); $argv = func_get_args(); - - $fmt = $argv[0]; - $len = strlen($fmt); - $sql = ""; - $argn = 1; - for ($pos = 0; $pos < $len; $pos++) - { - if ($fmt[$pos] == "%") - { - if ($argn < $argc) - $sql .= stDBGetSQLParam($db, $fmt[++$pos], $argv[$argn++]); - else - { - stLogError("Invalid SQL statement format string '".$fmt. - "', not enough parameters specified (".$argn." of ".$argc.")"); - return FALSE; - } - } - else - $sql .= $fmt[$pos]; - } - - return $sql; + return stDBPrepareSQL_V($db, $argv[0], array_splice($argv, 1)); }