diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 541262b2bf5..ae4fde1876b 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -4,7 +4,7 @@ * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2017 Regis Houssin * Copyright (C) 2010-2016 Juanjo Menent - * Copyright (C) 2011-2015 Philippe Grand + * Copyright (C) 2011-2019 Philippe Grand * Copyright (C) 2011 Remy Younes * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Christophe Battarel @@ -370,7 +370,7 @@ $tabfieldinsert[35]= "label"; $tabfieldinsert[36]= "range_ik,fk_c_exp_tax_cat"; $tabfieldinsert[37]= "code,label,short_label,unit_type,scale"; -// Nom du rowid si le champ n'est pas de type autoincrement +// Rowid name if the field is not autoincrement type // Example: "" if id field is "rowid" and has autoincrement on // "nameoffield" if id field is not "rowid" or has not autoincrement on $tabrowid=array(); @@ -703,12 +703,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $_POST["code"]=preg_replace('/\s/', '', $_POST["code"]); } - // Si verif ok et action add, on ajoute la ligne + // If check ok and action add, add the line if ($ok && GETPOST('actionadd')) { if ($tabrowid[$id]) { - // Recupere id libre pour insertion + // Get free id for insert $newid=0; $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id]; $result = $db->query($sql); @@ -771,7 +771,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } } - // Si verif ok et action modify, on modifie la ligne + // If verif ok and action modify, modify the line if ($ok && GETPOST('actionmodify')) { if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; } @@ -1382,7 +1382,7 @@ if ($id) $withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit'); } - print ''; + print ''; print '
'; print ''; print ''; @@ -1549,7 +1549,7 @@ if ($id) $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]}); } elseif ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') { - $align="center"; + $class="center"; } elseif ($fieldlist[$field]=='localtax1_type') { if ($obj->localtax1 != 0) @@ -1644,14 +1644,14 @@ if ($id) // Only activated on country dictionary if ($id == 4) { - print ''; + print ''; if ($iserasable) print ''.$actl[$obj->favorite].''; else print $langs->trans("AlwaysActive"); print ''; } // Active - print ''; + print ''; if ($canbedisabled) print ''.$actl[$obj->active].''; else { @@ -1669,7 +1669,7 @@ if ($id) // Delete link if ($iserasable) { - print ''; + print ''; if ($user->admin) print ''.img_delete().''; //else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin print ''; @@ -1872,7 +1872,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') print ''; } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') { - if ($fieldlist[$field] == 'type_cdr') print ''; + if ($fieldlist[$field] == 'type_cdr') print ''; else print ''; if ($fieldlist[$field] == 'type_cdr') { print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')); @@ -1884,7 +1884,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') elseif (in_array($fieldlist[$field], array('nbjour','decalage','taux','localtax1','localtax2'))) { $align="left"; if (in_array($fieldlist[$field], array('taux','localtax1','localtax2'))) $align="center"; // Fields aligned on right - print ''; + print ''; print ''; print ''; } @@ -1928,7 +1928,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') // Le type de taxe locale elseif ($fieldlist[$field] == 'localtax1_type' || $fieldlist[$field] == 'localtax2_type') { - print ''; + print ''; print $form->selectarray($fieldlist[$field], $localtax_typeList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'')); print ''; } diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index d8398f610ba..04dcf3ddc36 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -254,7 +254,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; + print ''; if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file") { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -285,7 +285,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; @@ -336,10 +336,10 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; print "\n"; clearstatcache(); @@ -391,7 +391,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print ''; // Preview - print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -260,7 +260,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print ''; @@ -339,10 +339,10 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -399,13 +399,13 @@ foreach ($dirmodels as $reldir) } else { - print ''."\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print "'; + print ''; if ($conf->global->EXPEDITION_ADDON_PDF == $name) { print img_picto($langs->trans("Default"), 'on'); @@ -430,12 +430,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').''; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 687e3fdf1e2..cac83ef8d8b 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -216,8 +216,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; if ($conf->global->EXPENSEREPORT_ADDON == $file) { print img_picto($langs->trans("Activated"), 'switch_on'); @@ -291,7 +291,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print '
'; print ''; print ''; print ''; -print '\n"; -print '\n"; -print ''; -print ''; +print '\n"; +print '\n"; +print ''; +print ''; print "\n"; clearstatcache(); @@ -393,7 +393,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print ""; } // Default - print "'; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status")."'.$langs->trans("Default")."'.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -401,13 +401,13 @@ foreach ($dirmodels as $reldir) } else { - print "\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').''; print ""; + print ''; if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -428,12 +428,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, -1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'intervention').''; @@ -472,7 +472,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print "\n"; $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2); diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php index b477a75256b..ca160a7dfda 100644 --- a/htdocs/admin/export.php +++ b/htdocs/admin/export.php @@ -75,15 +75,15 @@ $form=new Form($db); print '
'.$langs->trans("Parameter").'
'; print ''; print ''."\n"; -print ''; -print ''."\n"; +print ''; +print ''."\n"; // Example with a yes / no select print ''; print ''; -print ''; -print ''; +print ''; print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''."\n"; clearstatcache(); @@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir) else print $tmp; print ''."\n"; - print '
'.$langs->trans("ExportModel").'  
'.$langs->trans("set_EXPORTS_SHARE_MODELS").' '; +print ' '; print '
'; print ''; print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index b1c9df224ea..57a18afcbd3 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -284,8 +284,8 @@ print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Example").''.$langs->trans("Status").''.$langs->trans("ShortInfo").''.$langs->trans("Status").''.$langs->trans("ShortInfo").'
'; + print ''; //print "> ".$conf->global->FACTURE_ADDON." - ".$file; if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file) { @@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir) } } - print ''; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); if ($conf->global->FACTURE_ADDON.'.php' == $file) // If module is the one used, we show existing errors @@ -472,10 +472,10 @@ print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; print "\n"; clearstatcache(); @@ -528,7 +528,7 @@ foreach ($dirmodels as $reldir) // Active if (in_array($name, $def)) { - print '"; } // Defaut - print "'; // Preview - print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").''.$langs->trans("Status").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'."\n"; + print ''."\n"; print ''; print img_picto($langs->trans("Enabled"), 'switch_on'); print ''; @@ -536,13 +536,13 @@ foreach ($dirmodels as $reldir) } else { - print "\n"; + print ''."\n"; print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').''; print ""; + print ''; if ($conf->global->FACTURE_ADDON_PDF == "$name") { print img_picto($langs->trans("Default"), 'on'); @@ -570,12 +570,12 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark, 1, 1); - print '		'; + print ''; print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; + print ''; if ($module->type == 'pdf') { print ''.img_object($langs->trans("Preview"), 'bill').''; @@ -742,7 +742,7 @@ print load_fiche_titre($langs->trans("OtherOptions"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; @@ -752,7 +752,7 @@ print ''; print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; - print ''; // IP - print ''; - print ''; - print ''; @@ -279,7 +279,7 @@ if ($result) print ''; // Date - print ''; + print ''; // Code print ''; diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index bb397833ed3..08890379955 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -142,16 +142,16 @@ if ($savehandler == 'files') print ''; // ID - print ''; // Date creation - print ''; + print ''; // Date modification - print ''; + print ''; // Age print ''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index db0632be486..4246d27f49e 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1976,7 +1976,7 @@ class User extends CommonObject } else { - $url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.$this->login."&passwordhash=".dol_hash($password); + $url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password); $mesg.= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n"; $mesg.= $outputlangs->transnoentitiesnoconv("NewKeyWillBe")." :\n\n";
'.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Value").' 
'; print $langs->trans("ForceInvoiceDate"); -print ''; +print ''; print $form->selectyesno("forcedate", $conf->global->FAC_FORCE_DATE_VALIDATION, 1); print ''; print ''; @@ -828,7 +828,7 @@ print load_fiche_titre($langs->trans("Notifications"), '', ''); print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 5b695066c58..b6e8fcf0fd2 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -148,7 +148,7 @@ else print '
'.$langs->trans("Parameter").' 
'; print ''; print ''; - print ''; + print ''; print "\n"; // Modules @@ -160,7 +160,7 @@ else print ''; print ''; print ''; - print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print '
'.$langs->trans("ActivateFCKeditor").''.$langs->trans("Action").''.$langs->trans("Action").'
'.img_object("", $picto[$const]).''.$langs->trans($desc).''; + print ''; $constante = 'FCKEDITOR_ENABLE_'.$const; $value = (isset($conf->global->$constante)?$conf->global->$constante:0); if ($value == 0) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 82f73b8066c..fb9eababad8 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -446,7 +446,7 @@ print "\n";
-
" id="buttonGo" />

@@ -575,7 +575,7 @@ print "\n"; ?>
-
" id="buttonGo" />

diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 830499f2c59..61ae6bcf17f 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -173,10 +173,10 @@ function create_script_table($list) foreach($list as $script) { print '
'.dol_trunc($script['file'], 80, 'left').''.dol_print_date($script['mtime'], 'dayhour').''.number_format($script['size'] / 1024, 2).'KB'.$script['reloads'].' ('.$script['usecount'].')'.$script['hits'].''.dol_print_date($script['mtime'], 'dayhour').''.number_format($script['size'] / 1024, 2).'KB'.$script['reloads'].' ('.$script['usecount'].')'.$script['hits'].'
'; @@ -203,9 +203,9 @@ function create_key_table($list) foreach($list as $key) { print '
'.dol_trunc($key['name'], 80, 'left').''.dol_print_date($key['created'], 'dayhour').''.number_format($key['size']/1024, 3).'KB'; + print ''.dol_print_date($key['created'], 'dayhour').''.number_format($key['size']/1024, 3).'KB'; if ($key['ttl'] == -1) { print 'expired'; } elseif ($key['ttl'] == 0) { diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index ab9a86b614f..987f965576a 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -238,20 +238,20 @@ if ($result) print ''.$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0).''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; + print ''; //print ''; print '
'.dol_print_date($db->jdate($obj->dateevent), '%Y-%m-%d %H:%M:%S').''.dol_print_date($db->jdate($obj->dateevent), '%Y-%m-%d %H:%M:%S').''.$obj->type.''.$sessionentry['login'].''; + print ''; if ("$key" == session_id()) print $form->textwithpicto($key, $langs->trans("YourSession")); else print $key; print ''.dol_print_date($sessionentry['creation'], '%Y-%m-%d %H:%M:%S').''.dol_print_date($sessionentry['creation'], '%Y-%m-%d %H:%M:%S').''.dol_print_date($sessionentry['modification'], '%Y-%m-%d %H:%M:%S').''.dol_print_date($sessionentry['modification'], '%Y-%m-%d %H:%M:%S').''.$sessionentry['age'].'