rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove array_map with inline functions for PHP 5.2 compatability

Browse Source 
thanks to Adam for pointing this out!
This commit is contained in:
Sergey Tsalkov
2011-03-02 12:46:07 -05:00
parent 78c8192fdd
commit 620c607f61
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
db.class.php
View File

@@ -89,6 +89,20 @@ class DB
return call_user_func_array($function, $args); return call_user_func_array($function, $args);
} }
private static function wrapStr($strOrArray, $wrapChar, $escape = false) {
if (! is_array($strOrArray)) {
if ($escape) return $wrapChar . DB::escape($strOrArray) . $wrapChar;
else return $wrapChar . $strOrArray . $wrapChar;
} else {
$R = array();
foreach ($strOrArray as $element) {
$R[] = DB::wrapStr($element, $wrapChar, $escape);
}
return $R;
}
}
public static function freeResult($result) { public static function freeResult($result) {
if (! ($result instanceof MySQLi_Result)) return; if (! ($result instanceof MySQLi_Result)) return;
return $result->free(); return $result->free();
@@ -112,7 +126,7 @@ class DB
public static function insertOrReplace($which, $table, $data) { public static function insertOrReplace($which, $table, $data) {
$data = unserialize(serialize($data)); // break references within array $data = unserialize(serialize($data)); // break references within array
$keys_str = implode(', ', array_map(function($x) { return "`" . $x . "`"; }, array_keys($data))); $keys_str = implode(', ', DB::wrapStr(array_keys($data), '`'));
foreach ($data as &$datum) { foreach ($data as &$datum) {
if (is_array($datum)) $datum = serialize($datum); if (is_array($datum)) $datum = serialize($datum);
@@ -219,7 +233,7 @@ class DB
if (! is_array($arg)) die("Badly formatted SQL query: $sql -- expecting array, but didn't get one!"); if (! is_array($arg)) die("Badly formatted SQL query: $sql -- expecting array, but didn't get one!");
} }
if ($type == '%ls') $result = array_map(function($x) { return "'" . DB::escape($x) . "'"; }, $arg); if ($type == '%ls') $result = DB::wrapStr($arg, "'", true);
else if ($type == '%li') $result = array_map('intval', $arg); else if ($type == '%li') $result = array_map('intval', $arg);
else if ($type == '%ld') $result = array_map('floatval', $arg); else if ($type == '%ld') $result = array_map('floatval', $arg);
else if ($type == '%lb') $result = array_map('DB::formatTableName', $arg); else if ($type == '%lb') $result = array_map('DB::formatTableName', $arg);