FIX avoid pgsql error

hregis · Oct 11, 2024 · 12d929b · 12d929b
1 parent aa849f5
commit 12d929b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
@@ -1566,7 +1566,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 
 				// Delete
 				if ($user->hasRight('societe', 'contact', 'delete')) {
-					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($backtopage).'">';
+					print '<a class="marginleftonly right" href="'.DOL_URL_ROOT.'/societe/contact.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&socid='.urlencode($obj->fk_soc).'">';
 					print img_delete();
 					print '</a>';
 				}

diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
@@ -138,23 +138,19 @@
 if ($action == 'confirm_delete' && $user->hasRight('societe', 'contact', 'delete')) {
 	$id = GETPOST('id', 'int');
 	if (!empty($id) && $socid > 0) {
-		$db->begin();
-
-		$sql = "DELETE t, et FROM ".MAIN_DB_PREFIX."socpeople AS t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields AS et ON t.rowid = et.fk_object";
-		$sql .= " WHERE t.fk_soc = ".((int) $socid);
-		$sql .= " AND t.rowid = ".((int) $id);
-		$sql .= " AND ((t.fk_user_creat = ".((int) $user->id)." AND t.priv = 1) OR t.priv = 0)";
-
-		$result = $db->query($sql);
-		if (!$result) {
-			setEventMessages($db->lasterror(), null, 'errors');
-			$db->rollback();
-		} else {
-			$db->commit();
+		$contact = new Contact($db);
+
+		$result = $contact->fetch($id);
+		$contact->oldcopy = clone $contact;
+
+		$result = $contact->delete($user);
+
+		if ($result > 0) {
 			setEventMessages('ContactDeleted', null, 'mesgs');
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$socid);
+			header("Location: ".$_SERVER['PHP_SELF']."?socid=".$socid);
 			exit();
+		} else {
+			setEventMessages($contact->error, $contact->errors, 'errors');
 		}
 	}
 }