lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix result is a resource

Browse Source
This commit is contained in:
Frédéric FRANCE 2020-10-31 09:50:50 +01:00 committed by GitHub
parent f7172a9a3c
commit 25741a618e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/societe/class/api_thirdparties.class.php
View File

@ -1374,7 +1374,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
throw new RestException(404, 'Bank account not found'); throw new RestException(404, 'Bank account not found');
} }
@ -1443,7 +1443,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.'); throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
} }
@ -1514,7 +1514,7 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."'"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."'";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
$account = new SocieteAccount($this->db); $account = new SocieteAccount($this->db);
if (!isset($request_data['login'])) { if (!isset($request_data['login'])) {
$account->login = ""; $account->login = "";
@ -1570,7 +1570,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql); $result = $this->db->query($sql);
// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one. // We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
if (!isset($request_data['key_account'])) { if (!isset($request_data['key_account'])) {
throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !'); throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
} }
@ -1595,7 +1595,7 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."' "; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows !== 0) { if ($result && $this->db->num_rows !== 0) {
throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key."); throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
} }
} }
@ -1652,7 +1652,7 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' "; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist."); throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
} else { } else {
// If the user tries to edit the site member, we check first if // If the user tries to edit the site member, we check first if
@ -1660,7 +1660,7 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."' "; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows !== 0) if ($result && $this->db->num_rows !== 0)
throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key."); throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
} }
@ -1705,7 +1705,7 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '".$this->db->escape($site)."'"; $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '".$this->db->escape($site)."'";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
throw new RestException(404); throw new RestException(404);
} else { } else {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
@ -1724,9 +1724,9 @@ class Thirdparties extends DolibarrApi
* @param int $id ID of thirdparty * @param int $id ID of thirdparty
* *
* @return void * @return void
* @throws RestException(401) Unauthorized: User does not have permission to delete thirdparties gateways * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
* @throws RestException(404) Not Found: Specified thirdparty ID does not belongs to an existing thirdparty * @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
* @throws RestException(500) Internal Server Error: Error deleting SocieteAccount entity * @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
* *
* @url DELETE {id}/gateways * @url DELETE {id}/gateways
*/ */
@ -1747,7 +1747,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result->num_rows == 0) { if ($result && $this->db->num_rows == 0) {
throw new RestException(404, 'This third party does not have any gateway attached or does not exist.'); throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
} else { } else {
$i = 0; $i = 0;