FIX php8
This commit is contained in:
parent
c759b56622
commit
2e42f45c99
@ -90,7 +90,7 @@ class InterfaceNotification extends DolibarrTriggers
|
|||||||
*/
|
*/
|
||||||
public function getListOfManagedEvents()
|
public function getListOfManagedEvents()
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf, $action;
|
||||||
global $hookmanager;
|
global $hookmanager;
|
||||||
|
|
||||||
|
|
||||||
@ -100,6 +100,8 @@ class InterfaceNotification extends DolibarrTriggers
|
|||||||
}
|
}
|
||||||
$hookmanager->initHooks(array('notification'));
|
$hookmanager->initHooks(array('notification'));
|
||||||
|
|
||||||
|
$parameters = array();
|
||||||
|
$object = new stdClass();
|
||||||
$reshook = $hookmanager->executeHooks('notifsupported', $parameters, $object, $action);
|
$reshook = $hookmanager->executeHooks('notifsupported', $parameters, $object, $action);
|
||||||
if (empty($reshook)) {
|
if (empty($reshook)) {
|
||||||
if (!empty($hookmanager->resArray['arrayofnotifsupported'])) {
|
if (!empty($hookmanager->resArray['arrayofnotifsupported'])) {
|
||||||
|
|||||||
@ -417,17 +417,19 @@ class ActionsDatapolicy
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (GETPOST('socid')) {
|
if (GETPOST('socid')) {
|
||||||
|
/* Removed due to awful harcoded values
|
||||||
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
|
||||||
$societe = new Societe($this->db);
|
$societe = new Societe($this->db);
|
||||||
$societe->fetch(GETPOST('socid'));
|
$societe->fetch(GETPOST('socid'));
|
||||||
|
|
||||||
if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
|
if (!empty($object->forme_juridique_code) && !in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
|
||||||
$jsscript .= '<script>';
|
$jsscript .= '<script>';
|
||||||
$jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
|
$jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
|
||||||
$jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
|
$jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
|
||||||
$jsscript .= '</script>';
|
$jsscript .= '</script>';
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
} elseif ($parameters['currentcontext'] == 'contactcard') {
|
} elseif ($parameters['currentcontext'] == 'contactcard') {
|
||||||
if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
|
if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
|
||||||
|
|||||||
@ -682,6 +682,7 @@ $title = $langs->trans("ThirdParty");
|
|||||||
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
|
||||||
$title = $object->name." - ".$langs->trans('PaymentInformation');
|
$title = $object->name." - ".$langs->trans('PaymentInformation');
|
||||||
}
|
}
|
||||||
|
$help_url = '';
|
||||||
|
|
||||||
llxHeader('', $title, $help_url);
|
llxHeader('', $title, $help_url);
|
||||||
|
|
||||||
|
|||||||
@ -128,17 +128,10 @@ $contactstatic = new Contact($db);
|
|||||||
$userstatic = new User($db);
|
$userstatic = new User($db);
|
||||||
|
|
||||||
|
|
||||||
/* *************************************************************************** */
|
// View and edit
|
||||||
/* */
|
|
||||||
/* Mode vue et edition */
|
|
||||||
/* */
|
|
||||||
/* *************************************************************************** */
|
|
||||||
|
|
||||||
if ($id > 0 || !empty($ref)) {
|
if ($id > 0 || !empty($ref)) {
|
||||||
if ($object->fetch($id, $ref) > 0) {
|
if ($object->fetch($id, $ref) > 0) {
|
||||||
$soc = new Societe($db);
|
|
||||||
$soc->fetch($object->socid);
|
|
||||||
|
|
||||||
$head = societe_prepare_head($object);
|
$head = societe_prepare_head($object);
|
||||||
print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
|
print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
|
||||||
|
|
||||||
|
|||||||
@ -115,7 +115,7 @@ class Stripe extends CommonObject
|
|||||||
$tokenstring = $obj->tokenstring;
|
$tokenstring = $obj->tokenstring;
|
||||||
|
|
||||||
$tmparray = json_decode($tokenstring);
|
$tmparray = json_decode($tokenstring);
|
||||||
$key = $tmparray->stripe_user_id;
|
$key = empty($tmparray->stripe_user_id) ? '' : $tmparray->stripe_user_id;
|
||||||
} else {
|
} else {
|
||||||
$tokenstring = '';
|
$tokenstring = '';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user