@@ -113,7 +113,7 @@ |
||
113 | 113 | 'maxTopMenu' => & $maxTopMenu |
114 | 114 | ); |
115 | 115 | |
116 | -$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
116 | +$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
117 | 117 | if ($reshook < 0) { |
118 | 118 | $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
119 | 119 | } |
@@ -49,7 +49,9 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | // Not sure this is required |
52 | -if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
52 | +if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) { |
|
53 | + unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
54 | +} |
|
53 | 55 | |
54 | 56 | if (GETPOST('noredirect')) { |
55 | 57 | return; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | //permissions |
86 | 86 | |
87 | -$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
87 | +$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
88 | 88 | |
89 | 89 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
90 | 90 | $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); |
@@ -218,19 +218,19 @@ discard block |
||
218 | 218 | |
219 | 219 | $societe->client = GETPOSTINT('client') ? GETPOSTINT('client') : $societe->client; |
220 | 220 | |
221 | - $societe->address = GETPOST('address', 'alphanohtml'); |
|
221 | + $societe->address = GETPOST('address', 'alphanohtml'); |
|
222 | 222 | |
223 | - $societe->country_id = GETPOSTINT('country_id'); |
|
223 | + $societe->country_id = GETPOSTINT('country_id'); |
|
224 | 224 | |
225 | - $societe->phone = GETPOST('phone', 'alpha'); |
|
225 | + $societe->phone = GETPOST('phone', 'alpha'); |
|
226 | 226 | |
227 | - $societe->fax = GETPOST('fax', 'alpha'); |
|
227 | + $societe->fax = GETPOST('fax', 'alpha'); |
|
228 | 228 | |
229 | - $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
229 | + $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
230 | 230 | |
231 | - $societe->client = 2 ; // our client is a prospect |
|
231 | + $societe->client = 2; // our client is a prospect |
|
232 | 232 | |
233 | - $societe->code_client = '-1'; |
|
233 | + $societe->code_client = '-1'; |
|
234 | 234 | |
235 | 235 | $societe->name_alias = GETPOST('name_alias', 'alphanohtml'); |
236 | 236 |
@@ -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 |