Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX avoid pgsql error #31360

Closed
wants to merge 3 commits into from
Closed

FIX avoid pgsql error #31360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12d929b
FIX avoid pgsql error
hregis Oct 11, 2024
5613b9b
FIX remove phan error
hregis Oct 11, 2024
766afe5
FIX syntax error
hregis Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion htdocs/core/lib/company.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
}
Expand Down
26 changes: 11 additions & 15 deletions htdocs/societe/contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

@eldy eldy Oct 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the fetch then delete will break the control on owner of contact.
Why not just removing the left join on the delete ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eldy i use the "delete" function of contact class, same code inside the contact card for delete action. Maybe add this verification in "delete" function of contact class no ?

$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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no more error checking on the fetch() operation. Should it be checked also?

$contact->oldcopy = clone $contact;

Check warning on line 144 in htdocs/societe/contact.php

View workflow job for this annotation

GitHub Actions / phan / Run phan 

contact.php: PhanTypeMismatchProperty: Assigning (clone($contact)) of type \Contact to property but \Contact-&gt;oldcopy is static
Copy link
Contributor

@mdeweerd mdeweerd Oct 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have to ignore this one.

// @phan-suppress-current-line PhanTypeMismatchProperty

I opened a phan issue for this yesterday: phan/phan#4883 .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mdeweerd thank you


$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');
}
}
}
Expand Down
Loading