+
';
}
-echo dol_escape_htmltag($title);
+echo dolPrintHTML($title);
if ($disablenofollow) {
echo '';
}
diff --git a/htdocs/index.php b/htdocs/index.php
index 2f61963a4d5..c67cb92a81f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -94,12 +94,17 @@ if (!isset($form) || !is_object($form)) {
$form = new Form($db);
}
-// Title
-$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
-if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $title = $langs->trans("HomeArea").' - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
+$appli = constant('DOL_APPLICATION_TITLE');
+$applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
+} else {
+ $appli .= " ".DOL_VERSION;
}
+// Title
+$title = $langs->trans("HomeArea").' - '.$appli;
+
llxHeader('', $title);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3ec582aa0f5..64edbd3a6f5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1653,8 +1653,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
// Displays title
$appli = constant('DOL_APPLICATION_TITLE');
- if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
+ $applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+ if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
}
print '
';
@@ -2058,15 +2059,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
// Define link to login card
$appli = constant('DOL_APPLICATION_TITLE');
- if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
- if (preg_match('/\d\.\d/', $appli)) {
- if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
- $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- } else {
- $appli .= " ".DOL_VERSION;
- }
+ $applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+ if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
} else {
$appli .= " ".DOL_VERSION;
}
@@ -2457,15 +2452,9 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
// Define version to show
$appli = constant('DOL_APPLICATION_TITLE');
- if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
- if (preg_match('/\d\.\d/', $appli)) {
- if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
- $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- } else {
- $appli .= " ".DOL_VERSION;
- }
+ $applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+ if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
} else {
$appli .= " ".DOL_VERSION;
}
@@ -3326,19 +3315,18 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
}
$appli = constant('DOL_APPLICATION_TITLE');
- if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
- $doliurl = '';
- if (preg_match('/\d\.\d/', $appli)) {
- if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
- $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
- }
- } else {
- $appli .= " ".DOL_VERSION;
- }
+ $applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+ if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
} else {
$appli .= " ".DOL_VERSION;
}
+
+ // Clean doliurl if we use a custom application name
+ if ($applicustom) {
+ $doliurl = '';
+ }
+
print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
if ($doliurl) {
print '<a class="help" target="_blank" rel="noopener noreferrer" href="'.$doliurl.'">';
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index f095ff3c8e8..c0e1f76677f 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -190,12 +190,17 @@ if (empty($reshook)) {
$dol_url_root = DOL_URL_ROOT;
-// Title
-$title = 'Dolibarr '.DOL_VERSION;
-if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
- $title = getDolGlobalString('MAIN_APPLICATION_TITLE');
+$appli = constant('DOL_APPLICATION_TITLE');
+$applicustom = getDolGlobalString('MAIN_APPLICATION_TITLE');
+if ($applicustom) {
+ $appli = (preg_match('/^\+/', $applicustom) ? $appli : '').$applicustom;
+} else {
+ $appli .= " ".DOL_VERSION;
}
+// Title
+$title = $appli; // $title is used in .tpl file
+
// Select templates dir
$template_dir = '';
if (!empty($conf->modules_parts['tpl'])) { // Using this feature slow down application