';
if (is_array($cate_arbo))
{
- if (! sizeof($cate_arbo)) $output.= ''.$langs->trans("NoCategoriesDefined").' ';
+ if (! sizeof($cate_arbo)) $output.= ''.$langs->trans("NoCategoriesDefined").' ';
else
{
$output.= ' ';
@@ -2049,7 +2049,7 @@ class Form
$more.=' ';
$more.=' ';
$more.=''."\n";
@@ -2063,7 +2063,7 @@ class Form
if ($i==0) $more.=''.$input['label'].' ';
else $more.=' ';
$more.=' ';
$more.='';
$more.=$selval;
@@ -2986,7 +2986,7 @@ class Form
{
// Zone de saisie manuelle de la date
$retstring.=' ';
@@ -3012,7 +3012,7 @@ class Form
if (empty($conf->use_javascript_ajax) || $conf->global->MAIN_POPUP_CALENDAR == "none")
{
// Day
- $retstring.='';
+ $retstring.='';
if ($empty || $set_time == -1)
{
@@ -3034,7 +3034,7 @@ class Form
$retstring.=" ";
- $retstring.='';
+ $retstring.='';
if ($empty || $set_time == -1)
{
$retstring.=' ';
@@ -3052,11 +3052,11 @@ class Form
// Year
if ($empty || $set_time == -1)
{
- $retstring.=' ';
+ $retstring.=' ';
}
else
{
- $retstring.='';
+ $retstring.='';
for ($year = $syear - 5; $year < $syear + 10 ; $year++)
{
@@ -3080,7 +3080,7 @@ class Form
if ($h)
{
// Show hour
- $retstring.='';
+ $retstring.='';
if ($empty) $retstring.=' ';
for ($hour = 0; $hour < 24; $hour++)
{
@@ -3104,7 +3104,7 @@ class Form
if ($m)
{
// Show minutes
- $retstring.='';
+ $retstring.='';
if ($empty) $retstring.=' ';
for ($min = 0; $min < 60 ; $min++)
{
@@ -3189,7 +3189,7 @@ class Form
$minSelected = ConvertSecondToTime($iSecond,'min');
}
- print '';
+ print '';
for ($hour = 0; $hour < 24; $hour++)
{
print '";
print "H ";
- print '';
+ print '';
for ($min = 0; $min <= 55; $min=$min+5)
{
print '';
+ $out='';
if ($show_empty)
{
@@ -3564,7 +3564,7 @@ class Form
$i = 0;
if ($num)
{
- $out.= '';
+ $out.= '';
if ($show_empty) $out.= ' '."\n";
while ($i < $num)
@@ -3574,7 +3574,7 @@ class Form
if (is_array($enableonly) && sizeof($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1;
$out.= 'id == $obj->rowid) || (! is_object($selected) && $selected == $obj->rowid))
{
$out.= ' selected="selected"';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index d86fd46336e..56081253519 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -80,20 +80,20 @@ class FormActions
print 'else { document.'.$formname.'.percentageshown.disabled=false; }'."\n";
print '}'."\n";
print ''."\n";
- print '';
+ print '';
foreach($listofstatus as $key => $val)
{
print ''.$val.' ';
}
print ' ';
if ($selected == 0 || $selected == 100) $canedit=0;
- print ' =0)?'':' disabled="true"').'>';
+ print ' =0)?'':' disabled="disabled"').'>';
print '% ';
print ' ';
}
else
{
- print ' %';
+ print ' %';
}
}
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 9e43f83eea3..07ffffbef63 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -259,11 +259,9 @@ class FormAdmin
{
print ' selected="selected"';
}
- //if ($key == 'rodolphe') print ' disabled="true"';
print '>';
if ($key == 'all') print $langs->trans("AllMenus");
else print $key;
- //if ($key == 'rodolphe') print ' ('.$langs->trans("PersonalizedMenusNotSupported").')';
print ' '."\n";
}
print ' ';
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 4109c6e70a9..1b1b8c2a0e2 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -243,7 +243,7 @@ class FormCompany
// Affiche la rupture si on est en mode liste multipays
if (! $pays_code && $obj->code_pays)
{
- $out.= '----- '.$obj->libelle_pays." ----- \n";
+ $out.= '----- '.$obj->libelle_pays." ----- \n";
$pays=$obj->libelle_pays;
}
}
@@ -575,14 +575,14 @@ class FormCompany
if ($selected > 0 && $selected == $obj->rowid)
{
print ''.dol_trunc($obj->nom,24).' ';
$firstCompany = $obj->rowid;
}
else
{
print ''.dol_trunc($obj->nom,24).' ';
}
$i ++;
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 9acc0fe4c2b..1db71e01d52 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -90,11 +90,11 @@ class FormFile
print ' ';
}
print ' global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="true"':'');
+ print (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="disabled"':'');
print '>';
print ' ';
print ' global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="true"':'');
+ print (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled="disabled"':'');
print '>';
if ($addcancel)
@@ -424,7 +424,7 @@ class FormFile
$out.= '';
$out.= ' ';
if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && $modulepart != 'unpaid')
{
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index fbee51c11d1..7d0357c2d68 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -211,7 +211,7 @@ class FormOther
*/
function select_percent($selected=0,$htmlname='percent',$disabled=0,$increment=5,$start=0,$end=100)
{
- $return = '';
+ $return = '';
for ($i = $start ; $i <= $end ; $i += $increment)
{
@@ -674,7 +674,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selecte
{
if ($lines[$i]->fk_project != $lastprojectid)
{
- if ($i > 0 && $conf->browser->firefox) print '---------- ';
+ if ($i > 0 && $conf->browser->firefox) print '---------- ';
print 'fk_project) print ' selected="selected"';
print '>'; // Project -> Task
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 841f98302c0..cf4fdb75133 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -63,7 +63,7 @@ class FormEcm
$output = '';
if (is_array($cate_arbo))
{
- if (! sizeof($cate_arbo)) $output.= ''.$langs->trans("NoCategoriesDefined").' ';
+ if (! sizeof($cate_arbo)) $output.= ''.$langs->trans("NoCategoriesDefined").' ';
else
{
$output.= ' ';
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 1a5644d96e3..628936f8059 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -135,7 +135,7 @@ if (sizeof($export->array_export_code))
}
/*
print ' ';
*/
}
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 60d756f1a6d..93f7c29158a 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -236,7 +236,7 @@ if ($id > 0)
$formcompany->selectTypeContact($fichinter, '', 'type','external');
print ' ';
print ' ';
print '';
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index b2395f656f2..2e634a2f403 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -243,7 +243,7 @@ if ($id > 0 || ! empty($ref))
$formcompany->selectTypeContact($commande, '', 'type','external');
print ' ';
print ' ';
print '';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index f97c9d38f78..68b01ef2310 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -314,7 +314,7 @@ if ($id > 0 || ! empty($ref))
print '" class="flat"> ';
print ' ';
}
if (! $nbproduct && $nbfreeproduct)
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index c6add125897..ffbf5966e73 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -237,7 +237,7 @@ if ($id > 0)
$formcompany->selectTypeContact($facture, '', 'type','external');
print '';
print ' ';
print '';
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 4c8f0238178..cf4a5a568d9 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -997,12 +997,12 @@ if ($_GET['action'] == 'create')
// Replacement
print '';
print ' ';
print ' ';
$text=$langs->trans("InvoiceReplacementAsk").' ';
$text.='';
if ($options)
{
@@ -1021,13 +1021,13 @@ if ($_GET['action'] == 'create')
// Credit note
print '';
print ' ';
print ' ';
$text=$langs->transnoentities("InvoiceAvoirAsk").' ';
// $text.=' ';
$text.='';
if ($optionsav)
{
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index af9c2600519..a1fe048009b 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1531,7 +1531,7 @@ if ($step == 6 && $datatoimport)
print '';
print $langs->trans("Option");
print ' ';
- print ' ';
print ' '.$langs->trans("DoNotImportFirstLine");
diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php
index 21edb141d25..593e99d4f5c 100644
--- a/htdocs/install/etape0.php
+++ b/htdocs/install/etape0.php
@@ -282,7 +282,7 @@ if (! $error && $db->connected)
$selected="";
}
if (! $linedisabled) $nbofchoice++;
- print ''.$characterSet['charset'].' ('.$characterSet['description'].') ';
+ print ''.$characterSet['charset'].' ('.$characterSet['description'].') ';
}
print '';
if ($disabled=="disabled")
@@ -332,7 +332,7 @@ if (! $error && $db->connected)
$selected="";
}
if (! $linedisabled) $nbofchoice++;
- print ''.$collation['collation'].' ';
+ print ''.$collation['collation'].' ';
}
print '';
if ($disabled=="disabled"){
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 34e0e27fdc9..88c95a01d7b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -125,7 +125,7 @@ if (! empty($force_install_message))
';
- print ' ';
+ print ' ';
?>
';
@@ -373,9 +373,9 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
$projectsArrayId=explode(',',$projectsListId);
$numlines=sizeof($lines);
-
+
$total=0;
-
+
for ($i = 0 ; $i < $numlines ; $i++)
{
if ($parent == 0) $level = 0;
@@ -502,7 +502,7 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
print ' ';
print ''.ConvertSecondToTime($total).' ';
}
-
+
return $inc;
}
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index b34fbcf30b7..6feb71c01ae 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -115,7 +115,7 @@ class FormProduct
$this->loadWarehouses($fk_product);
- print '';
+ print '';
if ($empty) print ' ';
foreach($this->cache_warehouses as $id => $arraytypes)
{
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 0bfa0ef5a48..6b5475957a7 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -264,7 +264,7 @@ if ($id > 0 || ! empty($ref))
$formcompany->selectTypeContact($project, '', 'type','external','rowid');
print ' ';
print ' ';
print ' ';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index ca6814ed2b5..466bc02c016 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -265,7 +265,7 @@ if ($id > 0 || ! empty($ref))
$formcompany->selectTypeContact($task, '', 'type','external','rowid');
print ' ';
print ' ';
print ' ';
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 3d19b0a1dea..099431ca9e8 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -273,7 +273,7 @@ foreach ($demoprofiles as $profilarray)
$modulo=($j % $nbcolsmod);
if ($modulo == 0) print '';
print ' '.$val->getName().' ';
print '';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 3bcb27df726..c7a1e8fea53 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -168,7 +168,7 @@ if ($_GET["action"] == 'edit')
print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
print ' ';
print ' conf->MAIN_LANG_DEFAULT?" checked":"");
- print ! empty($dolibarr_main_demo)?' disabled="true"':''; // Disabled for demo
+ print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").' ';
print '';
print $formadmin->select_language($fuser->conf->MAIN_LANG_DEFAULT,'main_lang_default',1);
@@ -179,7 +179,7 @@ if ($_GET["action"] == 'edit')
print ' '.$langs->trans("MaxSizeList").' ';
print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.' ';
print ' conf->MAIN_SIZE_LISTE_LIMIT?" checked":"");
- print ! empty($dolibarr_main_demo)?' disabled="true"':''; // Disabled for demo
+ print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").' ';
print ' ';