Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 00:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace "q" calls

Browse source
This commit is contained in:
Philipp Holzer 2019-03-01 12:35:59 +01:00 • committed by Hypolite Petovan
parent be6057b056
commit b2edb85588
5 changed files with 46 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Core/UserImport.php
View file

@ -6,6 +6,7 @@ namespace Friendica\Core;
use Friendica\App;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Model\Photo;
use Friendica\Object\Image;
use Friendica\Util\Strings;
@ -35,9 +36,8 @@ class UserImport
*/
private static function checkCols($table, &$arr)
{
$query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
Logger::log("uimport: $query", Logger::DEBUG);
$r = q($query);
$r = DBStructure::getColumns($table);
$tcols = [];
// get a plain array of column names
foreach ($r as $tcol) {
@ -66,16 +66,12 @@ class UserImport
}
self::checkCols($table, $arr);
$cols = implode("`,`", array_map(['Friendica\Database\DBA', 'escape'], array_keys($arr)));
$vals = implode("','", array_map(['Friendica\Database\DBA', 'escape'], array_values($arr)));
$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
Logger::log("uimport: $query", Logger::TRACE);
if (self::IMPORT_DEBUG) {
return true;
}
return q($query);
return DBA::insert($table, $arr);
}
/**