@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | } |
708 | 708 | |
709 | 709 | // Other attributes |
710 | - $parameters['tpl_context'] = 'public'; // define template context to public |
|
710 | + $parameters['tpl_context'] = 'public'; // define template context to public |
|
711 | 711 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
712 | 712 | |
713 | 713 | // Comments |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | |
770 | 770 | // Set amount for the subscription: |
771 | 771 | // - First check the amount of the member type. |
772 | - $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
772 | + $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
773 | 773 | $amount = empty($amountbytype[$typeid]) ? (isset($amount) ? $amount : 0) : $amountbytype[$typeid]; |
774 | 774 | // - If not found, take the default amount only of the user is authorized to edit it |
775 | 775 | if ($caneditamount && empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) { |
@@ -167,7 +167,7 @@ |
||
167 | 167 | if (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
168 | 168 | print '<div class="clearboth"></div><strong>' . (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') : $langs->trans("BookCalSystem")) . '</strong>'; |
169 | 169 | } |
170 | - if (empty($urllogo) && ! getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
|
170 | + if (empty($urllogo) && !getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
|
171 | 171 | print $mysoc->name; |
172 | 172 | } |
173 | 173 | print '</div>'; |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | // Action called when page is submitted |
239 | -if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) { |
|
239 | +if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) { |
|
240 | 240 | $error = 0; |
241 | 241 | |
242 | 242 | $urlback = ''; |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | |
352 | 352 | $resultfetchthirdparty = 0; |
353 | 353 | |
354 | - $genericcompanyname = $langs->trans('EventParticipant') . ' ' . ($emailcompany ? $emailcompany : $email); // Keep this label simple so we can retrieve same thirdparty for another event |
|
354 | + $genericcompanyname = $langs->trans('EventParticipant') . ' ' . ($emailcompany ? $emailcompany : $email); // Keep this label simple so we can retrieve same thirdparty for another event |
|
355 | 355 | |
356 | 356 | // Getting the thirdparty or creating it |
357 | 357 | $thirdparty = new Societe($db); |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | print ' - '; |
758 | 758 | print dol_print_date($project->date_end); |
759 | 759 | }*/ |
760 | - $maxattendees = $project->max_attendees; // Max attendeed for the project/event |
|
760 | + $maxattendees = $project->max_attendees; // Max attendeed for the project/event |
|
761 | 761 | } |
762 | 762 | |
763 | 763 | if ($maxattendees && $currentnbofattendees >= $maxattendees) { |
@@ -398,7 +398,7 @@ |
||
398 | 398 | $baseurl = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', constant('BASE_URL') . '/public/ticket/'); |
399 | 399 | |
400 | 400 | $formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1', |
401 | - 'returnurl' => $baseurl . 'view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '')); |
|
401 | + 'returnurl' => $baseurl . 'view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '')); |
|
402 | 402 | |
403 | 403 | $formticket->withfile = 2; |
404 | 404 | $formticket->withcancel = 1; |
@@ -384,9 +384,9 @@ discard block |
||
384 | 384 | $sql .= " AND ((tc.source = 'external'"; |
385 | 385 | $sql .= " AND tc.element='" . $db->escape($object->element) . "'"; |
386 | 386 | $sql .= " AND tc.active=1"; |
387 | - $sql .= " AND sp.email='" . $db->escape($_SESSION['email_customer']) . "')"; // email found into an external contact |
|
388 | - $sql .= " OR s.email='" . $db->escape($_SESSION['email_customer']) . "'"; // or email of the linked company |
|
389 | - $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "')"; // or email of the requester |
|
387 | + $sql .= " AND sp.email='" . $db->escape($_SESSION['email_customer']) . "')"; // email found into an external contact |
|
388 | + $sql .= " OR s.email='" . $db->escape($_SESSION['email_customer']) . "'"; // or email of the linked company |
|
389 | + $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "')"; // or email of the requester |
|
390 | 390 | // Manage filter |
391 | 391 | if (!empty($filter)) { |
392 | 392 | foreach ($filter as $key => $value) { |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | |
435 | 435 | // allow to display information before list |
436 | 436 | $parameters = array('arrayfields' => $arrayfields); |
437 | - $reshook = $hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
437 | + $reshook = $hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
438 | 438 | print $hookmanager->resPrint; |
439 | 439 | |
440 | 440 | print '<div class="div-table-responsive">'; |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | if (!defined('NOLOGIN')) { |
31 | - define('NOLOGIN', '1'); // If this page is public (can be called outside logged session) |
|
31 | + define('NOLOGIN', '1'); // If this page is public (can be called outside logged session) |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | if (!defined('NOIPCHECK')) { |
35 | - define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip |
|
35 | + define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | if (!defined('NOBROWSERNOTIF')) { |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | print '<a href="list.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '') . '" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>' . dol_escape_htmltag($langs->trans("ViewMyTicketList")) . '</div></a>'; |
97 | 97 | print '<a href="view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '') . '" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">' . img_picto('', 'ticket', 'class="fa-15"') . '<br>' . dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")) . '</div></a>'; |
98 | 98 | print '<div class="clearboth"></div>'; |
99 | -print '</div>'; // ends '<div class="ticketform">'; |
|
100 | -print '</div>'; // ends '<div class="ticketpublicarea ticketlargemargin centpercent">'; |
|
99 | +print '</div>'; // ends '<div class="ticketform">'; |
|
100 | +print '</div>'; // ends '<div class="ticketpublicarea ticketlargemargin centpercent">'; |
|
101 | 101 | |
102 | 102 | if (getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER')) { |
103 | 103 | // End of page |
@@ -325,15 +325,15 @@ discard block |
||
325 | 325 | global $stripearrayofkeysbyenv; |
326 | 326 | $error = 0; |
327 | 327 | $object = $event->data->object; |
328 | - $TRANSACTIONID = $object->id; // Example pi_123456789... |
|
328 | + $TRANSACTIONID = $object->id; // Example pi_123456789... |
|
329 | 329 | $ipaddress = $object->metadata->ipaddress; |
330 | 330 | $now = dol_now(); |
331 | 331 | $currencyCodeType = strtoupper($object->currency); |
332 | 332 | $paymentmethodstripeid = $object->payment_method; |
333 | 333 | $customer_id = $object->customer; |
334 | 334 | $invoice_id = ""; |
335 | - $paymentTypeCode = ""; // payment type according to Stripe |
|
336 | - $paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr |
|
335 | + $paymentTypeCode = ""; // payment type according to Stripe |
|
336 | + $paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr |
|
337 | 337 | $payment_amount = 0; |
338 | 338 | $payment_amountInDolibarr = 0; |
339 | 339 | |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | $s = new \Stripe\StripeClient($stripeacc); |
399 | 399 | |
400 | 400 | $paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid); |
401 | - $paymentTypeCode = $paymentmethodstripe->type; |
|
401 | + $paymentTypeCode = $paymentmethodstripe->type; |
|
402 | 402 | if ($paymentTypeCode == "ban" || $paymentTypeCode == "sepa_debit") { |
403 | 403 | $paymentTypeCode = "PRE"; |
404 | 404 | } elseif ($paymentTypeCode == "card") { |
@@ -424,9 +424,9 @@ discard block |
||
424 | 424 | $paiement->datepaye = $now; |
425 | 425 | $paiement->date = $now; |
426 | 426 | if ($currencyCodeType == $conf->currency) { |
427 | - $paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id |
|
427 | + $paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id |
|
428 | 428 | } else { |
429 | - $paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching |
|
429 | + $paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching |
|
430 | 430 | |
431 | 431 | $postactionmessages[] = 'Payment was done in a currency (' . $currencyCodeType . ') other than the expected currency of company (' . $conf->currency . ')'; |
432 | 432 | $ispostactionok = -1; |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $paiement->num_payment = ''; |
451 | 451 | $paiement->note_public = ''; |
452 | 452 | $paiement->note_private = 'StripeSepa payment received by IPN webhook - ' . dol_print_date($now, 'standard') . ' using servicestatus=' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID; |
453 | - $paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
453 | + $paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
454 | 454 | $paiement->ext_payment_site = $service; |
455 | 455 | |
456 | 456 | $ispaymentdone = 0; |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | $error++; |
683 | 683 | } |
684 | 684 | |
685 | - if (! $error) { |
|
685 | + if (!$error) { |
|
686 | 686 | $db->commit(); |
687 | 687 | } else { |
688 | 688 | $db->rollback(); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } else { |
224 | 224 | // Create the prospect |
225 | 225 | if (GETPOST('societe')) { |
226 | - $thirdparty->name = GETPOST('societe'); |
|
226 | + $thirdparty->name = GETPOST('societe'); |
|
227 | 227 | $thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname')); |
228 | 228 | } else { |
229 | 229 | $thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname')); |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $proj->title = $langs->trans("LeadFromPublicForm"); |
309 | 309 | $proj->description = GETPOST("description", "alphanohtml"); |
310 | 310 | $proj->opp_status = $defaultoppstatus; |
311 | - $proj->fk_opp_status = $defaultoppstatus; |
|
311 | + $proj->fk_opp_status = $defaultoppstatus; |
|
312 | 312 | |
313 | 313 | $proj->ip = getUserRemoteIP(); |
314 | 314 | $nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200); |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | } |
552 | 552 | |
553 | 553 | // Other attributes |
554 | -$parameters['tpl_context'] = 'public'; // define template context to public |
|
554 | +$parameters['tpl_context'] = 'public'; // define template context to public |
|
555 | 555 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
556 | 556 | // Comments |
557 | 557 | print '<tr>'; |
@@ -312,7 +312,7 @@ |
||
312 | 312 | print '<input type="submit" value="' . $langs->trans("ViewAndVote") . '" id="viewandvote" name="viewandvote" class="button minwidth250">'; |
313 | 313 | } |
314 | 314 | |
315 | -if (! $foundaction) { |
|
315 | +if (!$foundaction) { |
|
316 | 316 | print '<span class="opacitymedium">' . $langs->trans("NoPublicActionsAllowedForThisEvent") . '</span>'; |
317 | 317 | } |
318 | 318 |