diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php index 897d69c40b5..cbc1b849115 100644 --- a/htdocs/public/partnership/new.php +++ b/htdocs/public/partnership/new.php @@ -278,7 +278,7 @@ if (empty($reshook) && $action == 'add') { */ // Send email to the foundation to say a new member subscribed with autosubscribe form - if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) && + if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) { // Define link to login card $appli = constant('DOL_APPLICATION_TITLE'); @@ -295,13 +295,13 @@ if (empty($reshook) && $action == 'add') { $appli .= " ".DOL_VERSION; } - $to = $partnership->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL); - $from = $conf->global->PARTNERSHIP_MAIL_FROM; + $to = $partnership->makeSubstitution(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')); + $from = getDolGlobalString('PARTNERSHIP_MAIL_FROM'); $mailfile = new CMailFile( - '['.$appli.'] '.$conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT, + '['.$appli.'] '.getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT', 'Partnership request'), $to, $from, - $partnership->makeSubstitution($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL), + $partnership->makeSubstitution(getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL')), array(), array(), array(), @@ -523,7 +523,7 @@ if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) { } // Company -print ''.$langs->trans("Company").''; +print ''.$langs->trans("Company").' *'; print img_picto('', 'company', 'class="pictofixedwidth"'); print ''."\n"; // Lastname @@ -531,7 +531,7 @@ print ''.$langs->trans("Lastname").' *'.$langs->trans("Firstname").' *'."\n"; // EMail -print ''.$langs->trans("Email").($conf->global->PARTNERSHIP_MAIL_REQUIRED ? ' *' : '').''; +print ''.$langs->trans("Email").' *'; //print img_picto('', 'email', 'class="pictofixedwidth"'); print ''."\n"; // Address