diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 7ce39a43354..51a16f717b2 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -878,7 +878,7 @@ class Export print ''.str_replace(',', ' , ', $filter['value']).''; } // suppression de l'export - print ''; + print ''; print 'rowid.'">'; print img_delete(); print ''; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index f872d230498..9663806fdc2 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -463,7 +463,7 @@ if ($step == 1 || ! $datatoexport) //print $value.'-'.$icon.'-'.$label."
"; print img_object($objexport->array_export_module[$key]->getName(), $icon).' '; print $label; - print ''; + print ''; if ($objexport->array_export_perms[$key]) { print ''.img_picto($langs->trans("NewExport"), 'filenew').''; @@ -623,7 +623,7 @@ if ($step == 2 && $datatoexport) { // Selected fields print ' '; - print ''.img_left('default', 0, 'style="max-width: 20px"').''; + print ''.img_left('default', 0, 'style="max-width: 20px"').''; print ''; //print $text.'-'.$htmltext."
"; print $form->textwithpicto($text, $htmltext); @@ -638,7 +638,7 @@ if ($step == 2 && $datatoexport) print $form->textwithpicto($text, $htmltext); //print ' ('.$code.')'; print ''; - print ''.img_right('default', 0, 'style="max-width: 20px"').''; + print ''.img_right('default', 0, 'style="max-width: 20px"').''; print ' '; } @@ -751,7 +751,7 @@ if ($step == 3 && $datatoexport) print ''; print ''.$langs->trans("Entities").''; //print ''.$langs->trans("ExportableFields").''; - //print ''; + //print ''; print ''.$langs->trans("ExportableFields").''; print ''.$langs->trans("FilteredFieldsValues").''; print ''; @@ -955,7 +955,7 @@ if ($step == 4 && $datatoexport) print ''; print ''.$langs->trans("Entities").''; print ''.$langs->trans("ExportedFields").''; - print ''.$langs->trans("Position").''; + print ''.$langs->trans("Position").''; //print ' '; //print ''.$langs->trans("FieldsTitle").''; print ''; @@ -1007,9 +1007,9 @@ if ($step == 4 && $datatoexport) //print ' ('.$code.')'; print ''; - print ''; + print ''; print $value.' '; - print ''; + print ''; if ($value < count($array_selected)) print ''.img_down().''; if ($value > 1) print ''.img_up().''; print ''; @@ -1060,7 +1060,7 @@ if ($step == 4 && $datatoexport) print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -1080,7 +1080,7 @@ if ($step == 4 && $datatoexport) $obj = $db->fetch_object($resql); print ''; print $obj->label; - print ''; + print ''; print 'rowid.'">'; print img_delete(); print ''; @@ -1231,7 +1231,7 @@ if ($step == 5 && $datatoexport) $label=$listeall[$key]; $htmltabloflibs.= $form->textwithpicto($label, $text).''; $htmltabloflibs.= ''.$objmodelexport->getLibLabelForKey($key).''; - $htmltabloflibs.= ''.$objmodelexport->getLibVersionForKey($key).''; + $htmltabloflibs.= ''.$objmodelexport->getLibVersionForKey($key).''; $htmltabloflibs.= ''."\n"; } $htmltabloflibs.= ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index f84f7bb8418..98b1f4552a0 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -71,7 +71,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php'; @@ -91,7 +91,7 @@ foreach($liste as $key => $val) $label=$liste[$key]; print ''; print ''; - print ''; + print ''; print ''; } diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php index 7e802762a09..ff344c45809 100644 --- a/htdocs/ftp/admin/ftpclient.php +++ b/htdocs/ftp/admin/ftpclient.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011 Juanjo Menent +/* Copyright (C) 2004-2016 Laurent Destailleur + * Copyright (C) 2011 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ if (GETPOST('delete', 'alpha')) if ($result3) $result4=dolibarr_del_const($db, "FTP_PASSWORD_" . $entry, $conf->entity); if ($result4) $result5=dolibarr_del_const($db, "FTP_NAME_" . $entry, $conf->entity); if ($result4) $result6=dolibarr_del_const($db, "FTP_PASSIVE_" . $entry, $conf->entity); - + if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6) { $db->commit(); @@ -199,9 +199,9 @@ else print ''; print ''; print ''; - + print '
'.$langs->trans("AvailableFormats").''.$langs->trans("LibraryShort").''.$langs->trans("LibraryVersion").''.$langs->trans("LibraryVersion").'
'.$form->textwithpicto($label, $text).''.$model->getLibLabelForKey($key).''.$model->getLibVersionForKey($key).''.$model->getLibVersionForKey($key).'
'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).''.$langs->trans("No").'
'; - + ?>
">
@@ -236,7 +236,7 @@ else print "
"; print ''; print ''; - + print ''."\n"; print ''; @@ -250,44 +250,44 @@ else $keyforuser="FTP_USER_" . $idrss; $keyforpassword="FTP_PASSWORD_" . $idrss; $keyforpassive="FTP_PASSIVE_" . $idrss; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ''; print ""; print ""; - print ""; print '
".$langs->trans("Name")."global->$keyforname . "\" size=\"64\">
".$langs->trans("Server")."global->$keyforserver . "\" size=\"64\">
".$langs->trans("Port")."global->$keyforport . "\" size=\"64\">
".$langs->trans("User")."global->$keyforuser . "\" size=\"24\">
".$langs->trans("Password")."global->$keyforpassword . "\" size=\"24\">
".$langs->trans("FTPPassiveMode")."'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'
"; + print ""; print "trans("Modify")."\">"; print "   "; print "trans("Delete")."\">"; @@ -295,10 +295,10 @@ else print "
'; - + print "
"; print '
'; - + $i++; } } diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index a543066a670..07af448aedd 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -1,6 +1,7 @@ - * Copyright (C) 2008-2009 Regis Houssin +/* Copyright (C) 2008-2016 Laurent Destailleur + * Copyright (C) 2008-2009 Regis Houssin + * Copyright (C) 2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,9 +18,9 @@ */ /** - * \file htdocs/ftp/index.php - * \ingroup ftp - * \brief Main page for FTP section area + * \file htdocs/ftp/index.php + * \ingroup ftp + * \brief Main page for FTP section area */ require '../main.inc.php'; @@ -453,13 +454,13 @@ else print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; @@ -558,28 +559,28 @@ else if ($is_directory) print ''; print ''; // Size - print ''; // Date - print ''; // User - print ''; // Group - print ''; // Permissions - print ''; // Action - print '
'.$langs->trans("Content").''.$langs->trans("Size").''.$langs->trans("Date").''.$langs->trans("Owner").''.$langs->trans("Group").''.$langs->trans("Permissions").''; + print ''.$langs->trans("Content").''.$langs->trans("Size").''.$langs->trans("Date").''.$langs->trans("Owner").''.$langs->trans("Group").''.$langs->trans("Permissions").''; if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").' '; print ''.img_picto($langs->trans("Refresh"), 'refresh').' '; print ''; + print ''; if (! $is_directory && ! $is_link) print $vals[4]; else print ' '; print ''; + print ''; print $vals[5].' '.$vals[6].' '.$vals[7]; print ''; + print ''; print $vals[2]; print ''; + print ''; print $vals[3]; print ''; + print ''; print $vals[0]; print ''; + print ''; if ($is_directory) { if ($file != '..') print ''.img_delete().''; @@ -628,7 +629,7 @@ else */ print '
'; - print '
'; + print '
'; print ''; print '
';