MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

This is better

Browse source
This commit is contained in:
Michael 2017-05-01 06:35:41 +00:00
parent 0d7996d852
commit e6cbe3be11
2 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/dba.php
View file

@ -812,21 +812,15 @@ class dba {
// Is there a relation entry for the table? // Is there a relation entry for the table?
if (isset(self::$relation[$table])) { if (isset(self::$relation[$table])) {
foreach (self::$relation[$table] AS $field => $rel_def) { foreach (self::$relation[$table] AS $field => $rel_def) {
// Currently we only support relations with a single variable
if (count($rel_def) > 1) {
return false;
}
$rel_field = array_values($rel_def)[0];
$rel_table = array_keys($rel_def)[0];
// When the search field is the relation field, we don't need to fetch the rows // When the search field is the relation field, we don't need to fetch the rows
// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
if ((count($param) == 1) AND ($field == array_keys($param)[0])) { if ((count($param) == 1) AND ($field == array_keys($param)[0])) {
foreach ($rel_def AS $rel_table => $rel_field) {
$retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack); $retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack);
if (!$retval) { if (!$retval) {
return false; return false;
} }
}
} else { } else {
// Fetch all rows that are to be deleted // Fetch all rows that are to be deleted
$sql = "SELECT ".self::$dbo->escape($field)." FROM `".$table."` WHERE `". $sql = "SELECT ".self::$dbo->escape($field)." FROM `".$table."` WHERE `".
@ -834,12 +828,14 @@ class dba {
$retval = false; $retval = false;
$data = self::p($sql, $param); $data = self::p($sql, $param);
while ($row = self::fetch($data)) { while ($row = self::fetch($data)) {
foreach ($rel_def AS $rel_table => $rel_field) {
// We have to do a separate delete process per row // We have to do a separate delete process per row
$retval = self::delete($rel_table, array($rel_field => $row[$field]), true, $callstack); $retval = self::delete($rel_table, array($rel_field => $row[$field]), true, $callstack);
if (!$retval) { if (!$retval) {
return false; return false;
} }
} }
}
if (!$retval) { if (!$retval) {
return true; return true;
} }

11
include/remove_contact.php
View file

@ -19,14 +19,7 @@ function remove_contact_run($argv, $argc) {
return; return;
} }
q("DELETE FROM `item` WHERE `contact-id` = %d", intval($id)); // Now we delete all the depending table entries
dba::delete('contact', array('id' => $id));
q("DELETE FROM `photo` WHERE `contact-id` = %d", intval($id));
q("DELETE FROM `mail` WHERE `contact-id` = %d", intval($id));
q("DELETE FROM `event` WHERE `cid` = %d", intval($id));
q("DELETE FROM `queue` WHERE `cid` = %d", intval($id));
} }
?> ?>