diff --git a/README.md b/README.md index b7cbe471426..7878f6270a7 100644 --- a/README.md +++ b/README.md @@ -201,11 +201,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) ### System Environment / Requirements -(See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)) + - PHP - MariaDB, MySQL or PostgreSQL - Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites. +See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite) + ### Extending diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php index 0ba7f56c615..43e12c9c490 100644 --- a/htdocs/core/lib/ticket.lib.php +++ b/htdocs/core/lib/ticket.lib.php @@ -248,6 +248,12 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $ print ''; } + if (!empty($conf->global->TICKET_IMAGE_PUBLIC_INTERFACE)) { + print '
'; + print ''; + print '
'; + } + print ''; print '
'; diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php index cda1bd81f79..3d8d76c5c1e 100644 --- a/htdocs/opensurvey/fonctions.php +++ b/htdocs/opensurvey/fonctions.php @@ -116,6 +116,12 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $ print '
'; } + if (!empty($conf->global->OPENSURVEY_IMAGE_PUBLIC_INTERFACE)) { + print '
'; + print ''; + print '
'; + } + print '

'; } diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php index 96dd77bce74..19bb2007bda 100644 --- a/htdocs/public/eventorganization/attendee_subscription.php +++ b/htdocs/public/eventorganization/attendee_subscription.php @@ -164,6 +164,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; } + + if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) { + print '
'; + print ''; + print '
'; + } + print ''; print '
'; diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php index b45e98b832a..4a81084223d 100644 --- a/htdocs/public/eventorganization/subscriptionok.php +++ b/htdocs/public/eventorganization/subscriptionok.php @@ -153,6 +153,11 @@ if ($urllogo) { print '
'; } +if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) { + print '
'; + print ''; + print '
'; +} print '


'; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 71446b58779..f9cd88a8c38 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -130,18 +130,25 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; + // Output html code for logo if ($urllogo) { print '
'; print '
'; - print ''; + print ''; print '
'; if (empty($conf->global->MAIN_HIDE_POWERED_BY)) { print ''; } print '
'; } + + if (!empty($conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION)) { + print '
'; + print ''; + print '
'; + } + print '
'; print '
'; diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index a4a2de27beb..d034db38be3 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -195,6 +195,11 @@ if ($urllogo) { } print '
'; } +if (!empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) { + print '
'; + print ''; + print '
'; +} // Output introduction text $text = ''; diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index fb95432256d..aeed346ab87 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -865,6 +865,11 @@ if ($urllogo) { } print ''; } +if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) { + print '
'; + print ''; + print '
'; +} diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index 6b4b28f66fe..6894e6a18c8 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -266,6 +266,11 @@ if ($urllogo) { } print ''; } +if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) { + print '
'; + print ''; + print '
'; +} print '

'; diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index 50a2de7bc68..1fbf420888d 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -226,6 +226,11 @@ if ($urllogo) { } print ''; } +if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) { + print '
'; + print ''; + print '
'; +} print '


'; diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php index d3dca7def6f..70e546cdbd9 100644 --- a/htdocs/public/project/index.php +++ b/htdocs/public/project/index.php @@ -186,6 +186,12 @@ if ($urllogo) { print ''; } +if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) { + print '
'; + print ''; + print '
'; +} + print ''."\n"; $text = ''."\n"; diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php index 240b3d8f036..ca7101a3679 100644 --- a/htdocs/public/project/new.php +++ b/htdocs/public/project/new.php @@ -118,6 +118,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; + // Output html code for logo if ($urllogo) { print '
'; @@ -130,6 +131,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; } + + if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) { + print '
'; + print ''; + print '
'; + } + print '
'; print '
'; diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php index f5ef237a9bd..6329441778f 100644 --- a/htdocs/public/project/suggestbooth.php +++ b/htdocs/public/project/suggestbooth.php @@ -152,6 +152,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; + // Output html code for logo if ($urllogo) { print '
'; @@ -164,6 +165,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; } + + if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) { + print '
'; + print ''; + print '
'; + } + print '
'; print '
'; diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php index 4ef1784e2a7..00b093ba215 100644 --- a/htdocs/public/project/suggestconference.php +++ b/htdocs/public/project/suggestconference.php @@ -152,6 +152,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; + // Output html code for logo if ($urllogo) { print '
'; @@ -164,6 +165,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $ } print '
'; } + + if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE)) { + print '
'; + print ''; + print '
'; + } + print '
'; print '
'; diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php index 64307018c38..e78176a5f56 100644 --- a/htdocs/public/project/viewandvote.php +++ b/htdocs/public/project/viewandvote.php @@ -261,6 +261,13 @@ if ($urllogo) { } print '
'; } + +if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) { + print '
'; + print ''; + print '
'; +} + print '

'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'
'."\n"; $text = ''."\n"; $text .= ''."\n"; diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php index 2133ef605f6..cd275d250c4 100644 --- a/htdocs/public/recruitment/view.php +++ b/htdocs/public/recruitment/view.php @@ -190,7 +190,7 @@ print ''."\n"; print ''; print "\n"; -print ''."\n"; +print ''."\n"; print '

'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'
'.$langs->trans("EvntOrgVoteHelpMessage").' : "'.$project->title.'".

'."\n"; @@ -228,6 +228,12 @@ if ($urllogo) { print ''; } +if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) { + print '
'; + print ''; + print '
'; +} + // Output introduction text $text = ''; if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {