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

wip

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-27 17:06:25 +02:00
parent 5203a417fe
commit 54b5a43006
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/eventorganization.lang
View File

@ -108,6 +108,7 @@ EvntOrgWelcomeMessage = This form allows you to register as a new participant to
EvntOrgDuration = This conference starts on %s and ends on %s. EvntOrgDuration = This conference starts on %s and ends on %s.
ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s. ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
EventType = Event type
# #
# SubscriptionOk page # SubscriptionOk page
# #

15
htdocs/public/project/index.php
View File

@ -295,7 +295,6 @@ if (empty($reshook) && $action == 'add') {
} }
} }
// From there we have a thirdparty, now looking for the contact // From there we have a thirdparty, now looking for the contact
if (!$error) { if (!$error) {
$contact = new Contact($db); $contact = new Contact($db);
$resultcontact = $contact->fetch('', '', '', $email); $resultcontact = $contact->fetch('', '', '', $email);
@ -447,9 +446,8 @@ if (empty($reshook) && $action == 'add') {
} }
} else { } else {
// If no price has been set for the booth or this is a conference, we confirm it as suggested and we update // If no price has been set for the booth or this is a conference, we confirm it as suggested and we update
$conforbooth->setStatut(CONFERENCEORBOOTH::STATUS_SUGGESTED); $conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
$conforbooth->update($user); $conforbooth->update($user);
// Sending mail // Sending mail
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@ -492,18 +490,17 @@ if (empty($reshook) && $action == 'add') {
} else { } else {
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
} }
$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
Header("Location: ".$redirection);
exit;
} }
} }
} }
} }
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
Header("Location: ".$redirection);
exit;
} else { } else {
$db->rollback(); $db->rollback();
} }