diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 76531832776..2f763c4e576 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -448,7 +448,7 @@ if ($useajax || $action == 'deletefile') {
if ($useajax) {
print ''."\n";
- print '';
// This ajax service is called only when a directory $selecteddir is opened but not when closed.
- //print '';
}
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index ac0df03184a..a47f5d4f744 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -256,7 +256,7 @@ class box_actions extends ModeleBoxes
}
$out .= '';
if ($actioncejour) {
- $out .= '';
} else {
- $out .= '';
}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 03b0e1d087b..34dc015a1db 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -227,7 +227,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
if (!$mesg) {
$stringtoshow = '';
- $stringtoshow .= '';
// set cookie by js
- $boxcontent .= '';
+ $boxcontent .= '';
}
$this->info_box_contents[0][] = array(
'tr' => 'class="nohover showiffilter'.$this->boxcode.' hideobject"',
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b8a986a0663..1376155e0e7 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7443,7 +7443,7 @@ abstract class CommonObject
if (!empty($conf->use_javascript_ajax)) {
$out .= '
- ';
+ $result .= '';
}
return $result;
@@ -833,7 +833,7 @@ class Form
if (!empty($conf->use_javascript_ajax)) {
$ret .= '
- ';
+ print '';
+ print 'console.log("hide the margin info"); $("#margintable").hide();';
}
+ print '});';
}
print '
';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 7e14474bc96..21e5b608a41 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -104,7 +104,7 @@ class FormOther
$out .= '
';
$out .= '
';
- $out .= '';
- $out .= '';
+ $out .= '';
- $out .= '';
+ $out .= '';
}
- $stringtoprint .='';
} else { // Default Header Redirect
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index fefdc5880c8..d61a07f59bc 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -443,7 +443,7 @@ if (empty($conf->use_javascript_ajax)) {
print '
';
} else {
print '
- '."\n";
+ print ''."\n";
} else {
print '
'.$langs->trans("Calendar").'';
}
@@ -93,7 +93,7 @@ $tradTemp = array(
$langs->trans("November"),
$langs->trans("December")
);
-print '
+
";
+ gtag(\'config\', \''.trim($tmptag).'\');
+ ';
print "\n";
}
}
@@ -9772,7 +9772,7 @@ function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
function dol_set_focus($selector)
{
print "\n".''."\n";
- print ''."\n";
+ print ''."\n";
}
@@ -10074,7 +10074,7 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param
function ajax_autoselect($htmlname, $addlink = '', $textonlink = 'Link')
{
global $langs;
- $out = '';*/
-
print '';
// Note
@@ -1656,15 +1647,6 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
//$tableCell.='
';
print $tableCell;
- // Comment for avoid unnecessary multiple calculation
- /*$modeinput = 'hours';
-
- print '';*/
-
print '';
// Note
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index e0bf4a683f0..c68bb49d93b 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -570,7 +570,8 @@ function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token
global $conf;
if (!empty($conf->use_javascript_ajax)) {
- print "\n".''."\n";
} elseif ($type == 'qa') {
$ret = ''."\n";
- $ret .= '';
+ $out .= '';
$out .= '
'."\n";
// Reddit
@@ -931,7 +931,7 @@ function getSocialNetworkSharingLinks()
// Facebook
$out .= ''."\n";
$out .= '
'."\n";
- $out .= ''."\n";
+ $tplcontent .= ''."\n";
// Add headers
$tplcontent .= ''."\n";
$tplcontent .= ''."\n";
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 9bb974d75b3..b35e7748570 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -600,7 +600,7 @@ if (!empty($conf->use_javascript_ajax)) {
}
/* Check that mandatory fields are filled */
-print ''."\n";
+ print ''."\n";
} else {
- print ''."\n";
+ print ''."\n";
}
if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
- print ''."\n";
+ print ''."\n";
} else {
- print ''."\n";
+ print ''."\n";
}
// jQuery jnotify
if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
- print ''."\n";
+ print ''."\n";
}
// Table drag and drop lines
if (empty($disableforlogin) && !defined('DISABLE_JQUERY_TABLEDND')) {
- print ''."\n";
+ print ''."\n";
}
// Chart
if (empty($disableforlogin) && (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') && !defined('DISABLE_JS_GRAPH')) {
- print ''."\n";
+ print ''."\n";
}
// jQuery jeditable for Edit In Place features
if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {
print ''."\n";
- print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
// jQuery Timepicker
if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) {
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
// jQuery plugin "mutiselect", "multiple-select", "select2", ...
$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
- print ''."\n"; // We include full because we need the support of containerCssClass
+ print ''."\n"; // We include full because we need the support of containerCssClass
}
if (!defined('DISABLE_MULTISELECT')) { // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
- print ''."\n";
+ print ''."\n";
}
}
@@ -1863,7 +1863,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
// To use external ckeditor 4 js lib
$pathckeditor = constant('JS_CKEDITOR');
}
- print ''."\n";
+ print ''."\n";
}
}
// Global js function
print ''."\n";
- print ''."\n";
+ print ''."\n";
// JS forced by modules (relative url starting with /)
if (!empty($conf->modules_parts['js'])) { // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
@@ -1908,7 +1908,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
// jsfile is a relative path
$urlforjs = dol_buildpath($jsfile, 1);
if ($urlforjs && $urlforjs != '/') {
- print ''."\n".''."\n";
+ print ''."\n";
+ print ''."\n";
} else {
dol_syslog("Warning: module ".$modjs." declared a js path file for a file we can't find.", LOG_WARNING);
}
@@ -1920,9 +1921,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print ''."\n";
foreach ($arrayofjs as $jsfile) {
if (preg_match('/^(http|\/\/)/i', $jsfile)) {
- print ''."\n";
+ print ''."\n";
} else {
- print ''."\n";
+ print ''."\n";
}
}
}
@@ -1932,7 +1933,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!empty($conf->global->ALLOW_THEME_JS)) {
$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
if (file_exists($theme_js)) {
- print ''."\n";
+ print ''."\n";
}
}