clean and update code

This commit is contained in:
Philippe GRAND 2018-06-21 15:01:45 +02:00
parent cfcedc1170
commit da2f07c848
6 changed files with 5 additions and 19 deletions

View File

@ -234,8 +234,6 @@ else
$idrss = $reg[0];
//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
$var=true;
print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="numero_entry" value="'.$idrss.'">';

View File

@ -509,7 +509,6 @@ else
}
$nboflines=count($contents);
$var=true;
$rawlisthasfailed=false;
$i=0;
while ($i < $nboflines && $i < 1000)
@ -553,7 +552,7 @@ else
}
print '<tr '.$bc[$var].' height="18">';
print '<tr class="oddeven" height="18">';
// Name
print '<td>';
$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;

View File

@ -98,8 +98,6 @@ if ($result)
print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"e.status","","",'align="right"',$sortfield,$sortorder);
print "</tr>\n";
$var=true;
if ($num > 0)
{
$establishmentstatic=new Establishment($db);

View File

@ -71,7 +71,6 @@ class Import
dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
$var=true;
$i=0;
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

View File

@ -440,7 +440,6 @@ if ($step == 2 && $datatoimport)
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
$filetoimport='';
$var=true;
// Add format informations and link to download example
print '<tr class="liste_titre"><td colspan="6">';
@ -556,14 +555,12 @@ if ($step == 3 && $datatoimport)
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
$filetoimport='';
$var=true;
print '<tr><td colspan="6">'.$langs->trans("ChooseFileToImport",img_picto('','filenew')).'</td></tr>';
//print '<tr class="liste_titre"><td colspan="6">'.$langs->trans("FileWithDataToImport").'</td></tr>';
// Input file name box
$var=false;
print '<tr class="oddeven"><td colspan="6">';
print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
$out = (empty($conf->global->MAIN_UPLOAD_DOC)?' disabled':'');
@ -907,13 +904,12 @@ if ($step == 4 && $datatoimport)
// List of targets fields
$height=24;
$i = 0;
$var=true;
$mandatoryfieldshavesource=true;
print '<table width="100%" class="nobordernopadding">';
foreach($fieldstarget as $code=>$label)
{
print '<tr '.$bc[$var].' height="'.$height.'">';
print '<tr class="oddeven" height="'.$height.'">';
$i++;
$entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]);
@ -1128,7 +1124,7 @@ if ($step == 4 && $datatoimport)
print '<td>'.$langs->trans("ImportModelName").'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
$var=false;
print '<tr class="oddeven">';
print '<td><input name="import_name" size="48" value=""></td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("SaveImportProfile").'">';
@ -1144,7 +1140,6 @@ if ($step == 4 && $datatoimport)
{
$num = $db->num_rows($resql);
$i = 0;
$var=false;
while ($i < $num)
{

View File

@ -60,13 +60,12 @@ print '<td>'.$langs->trans("Module").'</td>';
print '<td>'.$langs->trans("ImportableDatas").'</td>';
//print '<td>&nbsp;</td>';
print '</tr>';
$val=true;
if (count($import->array_import_code))
{
foreach ($import->array_import_code as $key => $value)
{
$val=!$val;
print '<tr '.$bc[$val].'><td>';
print '<tr class="oddeven"><td>';
print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' ';
print $import->array_import_module[$key]->getName();
print '</td><td>';
@ -108,7 +107,6 @@ print '<br>';
// List of available import format
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
@ -122,7 +120,6 @@ $liste=$model->liste_modeles($db);
foreach($liste as $key)
{
print '<tr class="oddeven">';
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
$text=$model->getDriverDescForKey($key);