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

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-30 17:28:23 +01:00
commit 91be7b279e
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -6335,7 +6335,7 @@ class Form
if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) { if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) {
$retstring .= " $retstring .= "
showOn: 'button', /* both has problem with autocompletion */ showOn: 'button', /* both has problem with autocompletion */
buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png', buttonImage: '".DOL_URL_ROOT."/theme/".dol_escape_js($conf->theme)."/img/object_calendarday.png',
buttonImageOnly: true"; buttonImageOnly: true";
} }
$retstring .= " $retstring .= "
@ -6348,7 +6348,7 @@ class Form
$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"'; $retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
$retstring .= ($disabled ? ' disabled' : ''); $retstring .= ($disabled ? ' disabled' : '');
$retstring .= ($placeholder ? ' placeholder="'.dol_escape_htmltag($placeholder).'"' : ''); $retstring .= ($placeholder ? ' placeholder="'.dol_escape_htmltag($placeholder).'"' : '');
$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring .= ' onChange="dpChangeDay(\''.dol_escape_js($prefix).'\',\''.dol_escape_js($langs->trans("FormatDateShortJavaInput")).'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
$retstring .= '>'; $retstring .= '>';
// Icone calendrier // Icone calendrier

2
htdocs/core/lib/security2.lib.php
View File

@ -157,7 +157,7 @@ if (!function_exists('dol_loginfunction')) {
// Note: $conf->css looks like '/theme/eldy/style.css.php' // Note: $conf->css looks like '/theme/eldy/style.css.php'
/* /*
$conf->css = "/theme/".(GETPOST('theme','alpha')?GETPOST('theme','alpha'):$conf->theme)."/style.css.php"; $conf->css = "/theme/".(GETPOST('theme','aZ09')?GETPOST('theme','aZ09'):$conf->theme)."/style.css.php";
$themepath=dol_buildpath($conf->css,1); $themepath=dol_buildpath($conf->css,1);
if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application if (! empty($conf->modules_parts['theme'])) // Using this feature slow down application
{ {

2
htdocs/externalsite/frames.php
View File

@ -35,7 +35,7 @@ $langs->load("externalsite");
$mainmenu = GETPOST('mainmenu', "aZ09"); $mainmenu = GETPOST('mainmenu', "aZ09");
$leftmenu = GETPOST('leftmenu', "aZ09"); $leftmenu = GETPOST('leftmenu', "aZ09");
$idmenu = GETPOST('idmenu', 'int'); $idmenu = GETPOST('idmenu', 'int');
$theme = GETPOST('theme', 'alpha'); $theme = GETPOST('theme', 'aZ09');
$codelang = GETPOST('lang', 'aZ09'); $codelang = GETPOST('lang', 'aZ09');
$keyforcontent = GETPOST('keyforcontent', 'aZ09'); $keyforcontent = GETPOST('keyforcontent', 'aZ09');

8
htdocs/main.inc.php
View File

@ -1098,8 +1098,8 @@ if (!defined('NOLOGIN')) {
// Case forcing style from url // Case forcing style from url
if (GETPOST('theme', 'alpha')) { if (GETPOST('theme', 'aZ09')) {
$conf->theme = GETPOST('theme', 'alpha', 1); $conf->theme = GETPOST('theme', 'aZ09', 1);
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
@ -1705,8 +1705,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} }
print '<script>'; print '<script>';
print '/* enable ckeditor by main.inc.php */'; print '/* enable ckeditor by main.inc.php */';
print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n"; print 'var CKEDITOR_BASEPATH = \''.dol_escape_js($pathckeditor).'\';'."\n";
print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage print 'var ckeditorConfig = \''.dol_escape_js(dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1)).'\';'."\n"; // $themesubdir='' in standard usage
print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n"; print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n"; print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
print '</script>'."\n"; print '</script>'."\n";

4
htdocs/theme/eldy/style.css.php
View File

@ -85,8 +85,8 @@ if (empty($dolibarr_nocache)) {
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
} }
if (GETPOST('theme', 'alpha')) { if (GETPOST('theme', 'aZ09')) {
$conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL $conf->theme = GETPOST('theme', 'aZ09'); // If theme was forced on URL
} }
if (GETPOST('lang', 'aZ09')) { if (GETPOST('lang', 'aZ09')) {
$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL

2
htdocs/theme/md/btn.inc.php
View File

@ -233,7 +233,7 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
background: var(--butactiondeletebg); background: var(--butactiondeletebg);
/* border: 1px solid #633; */ /* border: 1px solid #633; */
color: #633; color: #633;
vertical-align: middle; /* vertical-align: middle; */
} }
.butActionDelete:hover { .butActionDelete:hover {

4
htdocs/theme/md/style.css.php
View File

@ -86,8 +86,8 @@ if (empty($dolibarr_nocache)) {
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
} }
if (GETPOST('theme', 'alpha')) { if (GETPOST('theme', 'aZ09')) {
$conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL $conf->theme = GETPOST('theme', 'aZ09'); // If theme was forced on URL
} }
if (GETPOST('lang', 'aZ09')) { if (GETPOST('lang', 'aZ09')) {
$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL