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

Fix deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-30 12:35:05 +01:00
parent 4f2259ea38
commit bd5dc6399b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -1456,6 +1456,7 @@ class Form
$langs->load('companies'); $langs->load('companies');
if (empty($htmlid)) $htmlid = $htmlname; if (empty($htmlid)) $htmlid = $htmlname;
$num = 0;
if ($selected === '') $selected = array(); if ($selected === '') $selected = array();
elseif (!is_array($selected)) $selected = array($selected); elseif (!is_array($selected)) $selected = array($selected);
@ -4999,7 +5000,8 @@ class Form
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">'; print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td>'; print '<tr><td>';
$num = $this->select_contacts($societe->id, $selected, $htmlname); print $this->selectcontacts($societe->id, $selected, $htmlname);
$num = $this->num;
if ($num == 0) if ($num == 0)
{ {
$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress")); $addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

2
htdocs/core/class/html.formticket.class.php
View File

@ -385,7 +385,7 @@ class FormTicket
// If no socid, set to -1 to avoid full contacts list // If no socid, set to -1 to avoid full contacts list
$selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1; $selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
print img_picto('', 'contact', 'class="paddingright"'); print img_picto('', 'contact', 'class="paddingright"');
$nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200'); print $form->selectcontacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
print ' '; print ' ';
$formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly'); $formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
print '</td></tr>'; print '</td></tr>';

5
htdocs/projet/tasks/contact.php
View File

@ -84,7 +84,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
{ {
header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : '')); header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
exit; exit;
} else { } else {$nbofcontacts
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
$langs->load("errors"); $langs->load("errors");
@ -423,7 +423,8 @@ if ($id > 0 || !empty($ref))
print '<td>'; print '<td>';
$contactofproject = $projectstatic->getListContactId('external'); $contactofproject = $projectstatic->getListContactId('external');
$nbofcontacts = $form->select_contacts($selectedCompany, '', 'contactid', 0, '', $contactofproject); print $form->selectcontacts($selectedCompany, '', 'contactid', 0, '', $contactofproject);
$nbofcontacts = $form->num;
print '</td>'; print '</td>';
print '<td>'; print '<td>';
$formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid'); $formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid');