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

Fix public pages

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-31 13:31:23 +02:00
parent a823b10b58
commit d388ac58be
4 changed files with 234 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
htdocs/public/eventorganization/attendee_new.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2021 Dorian Vabre <dorian.vabre@gmail.com> /* Copyright (C) 2021 Dorian Vabre <dorian.vabre@gmail.com>
* Copyright (C) 2023 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -680,22 +681,25 @@ $formcompany = new FormCompany($db);
llxHeaderVierge($langs->trans("NewRegistration")); llxHeaderVierge($langs->trans("NewRegistration"));
print '<br>';
print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center');
print '<div align="center">'; print '<div align="center">';
print '<div id="divsubscribe">'; print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext justify">';
// Sub banner
print '<div class="center subscriptionformbanner subbanner justify margintoponly paddingtop marginbottomonly padingbottom">';
print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center');
// Welcome message // Welcome message
print '<span class="opacitymedium">'.$langs->trans("EvntOrgWelcomeMessage").'</span>'; print '<span class="opacitymedium">'.$langs->trans("EvntOrgWelcomeMessage").'</span>';
print '<br>'; print '<br>';
// Title // Title
print '<span class="eventlabel">'.dol_escape_htmltag($project->title . ' '. $conference->label).'</span><br>'; print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $conference->label).'</span><br>';
print '</div>';
// Help text
print '<div class="justify subscriptionformhelptext">';
if ($project->date_start_event || $project->date_end_event) { if ($project->date_start_event || $project->date_end_event) {
print '<br><span class="fa fa-calendar pictofixedwidth"></span>'; print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
} }
if ($project->date_start_event) { if ($project->date_start_event) {
$format = 'day'; $format = 'day';
@ -720,29 +724,31 @@ if ($project->date_start_event || $project->date_end_event) {
print '<br>'; print '<br>';
} }
if ($project->location) { if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth"></span>'.dol_escape_htmltag($project->location).'<br>'; print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
} }
print '</div>';
$maxattendees = 0; $maxattendees = 0;
if ($conference->id > 0) { if ($conference->id > 0) {
/* date of project is not date of event so commented /* date of project is not date of event so commented
print $langs->trans("Date").': '; print $langs->trans("Date").': ';
print dol_print_date($conference->datep); print dol_print_date($conference->datep);
if ($conference->date_end) { if ($conference->date_end) {
print ' - '; print ' - ';
print dol_print_date($conference->datef); print dol_print_date($conference->datef);
}*/ }*/
} else { } else {
/* date of project is not date of event so commented /* date of project is not date of event so commented
print $langs->trans("Date").': '; print $langs->trans("Date").': ';
print dol_print_date($project->date_start); print dol_print_date($project->date_start);
if ($project->date_end) { if ($project->date_end) {
print ' - '; print ' - ';
print dol_print_date($project->date_end); print dol_print_date($project->date_end);
}*/ }*/
$maxattendees = $project->max_attendees; // Max attendeed for the project/event $maxattendees = $project->max_attendees; // Max attendeed for the project/event
} }
print '</div>';
if ($maxattendees && $currentnbofattendees >= $maxattendees) { if ($maxattendees && $currentnbofattendees >= $maxattendees) {
print '<br>'; print '<br>';
@ -884,12 +890,15 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
print "</form>\n"; print "</form>\n";
print "<br>"; print "<br>";
print '</div></div>';
} }
} else { } else {
print '<br><br>';
print $langs->trans("ConferenceIsNotConfirmed"); print $langs->trans("ConferenceIsNotConfirmed");
print '<br><br>';
} }
print '</div></div>';
llxFooterVierge(); llxFooterVierge();
$db->close(); $db->close();

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

@ -124,10 +124,14 @@ $conf->dol_hide_topmenu = 1;
$conf->dol_hide_leftmenu = 1; $conf->dol_hide_leftmenu = 1;
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>'; $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
llxHeaderVierge($langs->trans("SuggestForm"));
print '<span id="dolpaymentspan"></span>'."\n"; print '<span id="dolpaymentspan"></span>'."\n";
print '<div class="center">'."\n"; print '<div class="center">'."\n";
print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n"; print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">'."\n"; print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
print '<input type="hidden" name="action" value="dopayment">'."\n"; print '<input type="hidden" name="action" value="dopayment">'."\n";
@ -150,7 +154,7 @@ if (!empty($conf->global->$paramlogo)) {
} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) { } elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
$logosmall = $conf->global->ONLINE_PAYMENT_LOGO; $logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
} }
//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n"; //print '- Show logo (logosmall='.$logosmall.' logo='.$logo.') '."\n";
// Define urllogo // Define urllogo
$urllogo = ''; $urllogo = '';
$urllogofull = ''; $urllogofull = '';
@ -184,21 +188,55 @@ if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
print '<br>'; print '<br>';
print '<div align="center">';
print '<div id="divsubscribe">';
// Event summary // Event summary
print '<div class="center">'; print '<div class="center">';
print '<span class="large">'.$project->title.'</span><br>'; print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
print dol_print_date($project->date_start, 'daytext');
if ($project->date_end && $project->date_start != $project->date_end) {
print ' - '.dol_print_date($project->date_end, 'daytext');
}
print '<br><br>'."\n"; print '<br><br>'."\n";
print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
print $project->note_public."\n"; print $project->note_public."\n";
//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
print '</div>'; print '</div>';
// Help text
print '<div class="center subscriptionformhelptext">';
if ($project->date_start_event || $project->date_end_event) {
print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
}
if ($project->date_start_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_start_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_start_event, $format);
}
if ($project->date_start_event && $project->date_end_event) {
print ' - ';
}
if ($project->date_end_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_end_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_end_event, $format);
}
if ($project->date_start_event || $project->date_end_event) {
print '<br>';
}
if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
}
print '</div>';
print '<br>'; print '<br>';
print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n"; print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
@ -245,6 +283,10 @@ print '</td></tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";
print '</div></div>';
print '</form>'."\n"; print '</form>'."\n";
print '</div>'."\n"; print '</div>'."\n";
print '<br>'; print '<br>';
@ -255,3 +297,61 @@ htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
llxFooter('', 'public'); llxFooter('', 'public');
$db->close(); $db->close();
/**
* Show header for new member
*
* @param string $title Title
* @param string $head Head array
* @param int $disablejs More content into html header
* @param int $disablehead More content into html header
* @param array $arrayofjs Array of complementary js files
* @param array $arrayofcss Array of complementary css files
* @return void
*/
function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
{
global $user, $conf, $langs, $mysoc;
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
print '<body id="mainbody" class="publicnewmemberform">';
// Define urllogo
$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
}
print '<div class="center">';
// Output html code for logo
if ($urllogo) {
print '<div class="backgreypublicpayment">';
print '<div class="logopublicpayment">';
print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
print '>';
print '</div>';
if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
}
print '</div>';
}
if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE)) {
print '<div class="backimagepublicsuggestconference">';
print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE.'">';
print '</div>';
}
print '</div>';
print '<div class="divmainbodylarge">';
}

61
htdocs/public/project/suggestbooth.php
View File

@ -477,6 +477,7 @@ if (empty($reshook) && $action == 'add') {
} }
} }
} }
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
@ -542,30 +543,61 @@ $formcompany = new FormCompany($db);
llxHeaderVierge($langs->trans("NewSuggestionOfBooth")); llxHeaderVierge($langs->trans("NewSuggestionOfBooth"));
print '<div align="center">';
print '<div id="divsubscribe">';
print '<br>'; print '<br>';
// Event summary // Event summary
print '<div class="center">'; print '<div class="center">';
print '<span class="large">'.$project->title.'</span><br>'; print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
print dol_print_date($project->date_start, 'daytext');
if ($project->date_end && $project->date_start != $project->date_end) {
print ' - '.dol_print_date($project->date_end, 'daytext');
}
print '<br><br>'."\n"; print '<br><br>'."\n";
//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
//print $project->note_public."\n"; print $project->note_public."\n";
//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
print '</div>'; print '</div>';
// Help text
print '<div class="center subscriptionformhelptext">';
if ($project->date_start_event || $project->date_end_event) {
print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
}
if ($project->date_start_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_start_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_start_event, $format);
}
if ($project->date_start_event && $project->date_end_event) {
print ' - ';
}
if ($project->date_end_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_end_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_end_event, $format);
}
if ($project->date_start_event || $project->date_end_event) {
print '<br>';
}
if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
}
print '</div>';
print '<br>';
print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center'); print load_fiche_titre($langs->trans("NewSuggestionOfBooth"), '', '', 0, 0, 'center');
print '<div align="center">';
print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext opacitymedium justify">';
dol_htmloutput_errors($errmsg); dol_htmloutput_errors($errmsg);
// Print form // Print form
@ -576,7 +608,6 @@ print '<input type="hidden" name="action" value="add" />';
print '<input type="hidden" name="id" value="'.$id.'" />'; print '<input type="hidden" name="id" value="'.$id.'" />';
print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />'; print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
print '<br>';
print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>'; print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
//print $langs->trans("FieldsWithIsForPublic",'**').'<br>'; //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
@ -616,8 +647,7 @@ print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'se
print '</td></tr>'; print '</td></tr>';
// Country // Country
print '<tr><td>'.$langs->trans('Country'); print '<tr><td>'.$langs->trans('Country');
print '<span style="color:red">*</span>'; print '<span class="star">*</span>';
print '</td><td>'; print '</td><td>';
$country_id = GETPOST('country_id'); $country_id = GETPOST('country_id');
if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) { if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
@ -670,7 +700,6 @@ print '</div>';
print '<br><br>'; print '<br><br>';
print "</form>\n"; print "</form>\n";
print "<br>"; print "<br>";
print '</div></div>'; print '</div></div>';

68
htdocs/public/project/suggestconference.php
View File

@ -72,8 +72,8 @@ $email = GETPOST("email");
$societe = GETPOST("societe"); $societe = GETPOST("societe");
$label = GETPOST("label"); $label = GETPOST("label");
$note = GETPOST("note"); $note = GETPOST("note");
$datestart = GETPOST("datestart"); $datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
$dateend = GETPOST("dateend"); $dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
$id = GETPOST('id'); $id = GETPOST('id');
@ -454,6 +454,7 @@ if (empty($reshook) && $action == 'add') {
} }
} }
} }
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2); $securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
@ -475,29 +476,60 @@ $formcompany = new FormCompany($db);
llxHeaderVierge($langs->trans("NewSuggestionOfConference")); llxHeaderVierge($langs->trans("NewSuggestionOfConference"));
print '<div align="center">';
print '<div id="divsubscribe">';
print '<br>'; print '<br>';
// Event summary // Event summary
print '<div class="center">'; print '<div class="center">';
print '<span class="large">'.$project->title.'</span><br>'; print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $project->label).'</span><br>';
print img_picto('', 'calendar', 'class="pictofixedwidth"').$langs->trans("Date").': ';
print dol_print_date($project->date_start, 'daytext');
if ($project->date_end && $project->date_start != $project->date_end) {
print ' - '.dol_print_date($project->date_end, 'daytext');
}
print '<br><br>'."\n"; print '<br><br>'."\n";
//print $langs->trans("EvntOrgRegistrationWelcomeMessage")."\n"; print '<span class="opacitymedium">'.$langs->trans("EvntOrgRegistrationWelcomeMessage")."</span>\n";
//print $project->note_public."\n"; print $project->note_public."\n";
//print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx'; //print img_picto('', 'map-marker-alt').$langs->trans("Location").': xxxx';
print '</div>'; print '</div>';
// Help text
print '<div class="center subscriptionformhelptext">';
if ($project->date_start_event || $project->date_end_event) {
print '<br><span class="fa fa-calendar pictofixedwidth opacitymedium"></span>';
}
if ($project->date_start_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_start_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_start_event, $format);
}
if ($project->date_start_event && $project->date_end_event) {
print ' - ';
}
if ($project->date_end_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_end_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_end_event, $format);
}
if ($project->date_start_event || $project->date_end_event) {
print '<br>';
}
if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth opacitymedium"></span>'.dol_escape_htmltag($project->location).'<br>';
}
print '</div>';
print '<br>';
print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center'); print load_fiche_titre($langs->trans("NewSuggestionOfConference"), '', '', 0, 0, 'center');
print '<div align="center">';
print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext opacitymedium justify">';
dol_htmloutput_errors($errmsg, $errors); dol_htmloutput_errors($errmsg, $errors);
@ -509,8 +541,6 @@ print '<input type="hidden" name="action" value="add" />';
print '<input type="hidden" name="id" value="'.$id.'" />'; print '<input type="hidden" name="id" value="'.$id.'" />';
print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />'; print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
print '<br>';
print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>'; print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
//print $langs->trans("FieldsWithIsForPublic",'**').'<br>'; //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
@ -585,11 +615,11 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n"; print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>'; print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
// Label // Label
print '<tr><td>'.$langs->trans("LabelOfconference").'<span style="color: red">*</span></td>'."\n"; print '<tr><td>'.$langs->trans("LabelOfconference").'<span class="star">*</span></td>'."\n";
print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n"; print '</td><td><input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
// Note // Note
print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n"; print '<tr><td>'.$langs->trans("Description").'<span class="star">*</span></td>'."\n";
print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n"; print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_4.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
print "</table>\n"; print "</table>\n";