lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2012-11-21 20:24:15 +01:00
parent 1f263943c5
commit 35a887f869
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/exports/export.php
View File

@ -94,7 +94,6 @@ $entitytolang = array(
); );
$array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array(); $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
//$array_filtered=isset($_SESSION["export_filtered_fields"])?$_SESSION["export_filtered_fields"]:array();
$array_filtervalue=isset($_SESSION["export_FilterValue_fields"])?$_SESSION["export_FilterValue_fields"]:array(); $array_filtervalue=isset($_SESSION["export_FilterValue_fields"])?$_SESSION["export_FilterValue_fields"]:array();
$datatoexport=GETPOST("datatoexport"); $datatoexport=GETPOST("datatoexport");
$action=GETPOST('action', 'alpha'); $action=GETPOST('action', 'alpha');
@ -220,7 +219,6 @@ if ($step == 1 || $action == 'cleanselect')
$_SESSION["export_filtered_fields"]=array(); $_SESSION["export_filtered_fields"]=array();
$array_selected=array(); $array_selected=array();
$array_filtervalue=array(); $array_filtervalue=array();
$array_filtered=array();
} }
if ($action == 'builddoc') if ($action == 'builddoc')
@ -259,6 +257,7 @@ if ($action == 'deleteprof')
} }
} }
// TODO The export for filter is not yet implemented (old code created conflicts with step 2). We must use same way of working and same combo list of predefined export than step 2.
if ($action == 'add_export_model') if ($action == 'add_export_model')
{ {
if ($export_name) if ($export_name)
@ -273,20 +272,16 @@ if ($action == 'add_export_model')
$hexa.=$key; $hexa.=$key;
} }
$hexafilter='';
$hexafiltervalue=''; $hexafiltervalue='';
foreach($array_filtered as $key=>$val) foreach($array_filtervalue as $key=>$val)
{ {
if ($hexafilter) $hexafilter.=',';
if ($hexafilter) $hexafiltervalue.=','; if ($hexafilter) $hexafiltervalue.=',';
$hexafilter.=$key; $hexafiltervalue.=$key.'='.$val;
$hexafiltervalue.=$array_filtervalue[$key];
} }
$objexport->model_name = $export_name; $objexport->model_name = $export_name;
$objexport->datatoexport = $datatoexport; $objexport->datatoexport = $datatoexport;
$objexport->hexa = $hexa; $objexport->hexa = $hexa;
$objexport->hexafilter = $hexafilter;
$objexport->hexafiltervalue = $hexafiltervalue; $objexport->hexafiltervalue = $hexafiltervalue;
$result = $objexport->create($user); $result = $objexport->create($user);
@ -312,11 +307,9 @@ if ($action == 'add_export_model')
if ($step == 2 && $action == 'select_model') if ($step == 2 && $action == 'select_model')
{ {
$_SESSION["export_selected_fields"]=array(); $_SESSION["export_selected_fields"]=array();
//$_SESSION["export_filtered_fields"]=array();
$_SESSION["export_FilterValue_fields"]=array(); $_SESSION["export_FilterValue_fields"]=array();
$array_selected=array(); $array_selected=array();
$array_filtered=array();
$array_filtervalue=array(); $array_filtervalue=array();
$result = $objexport->fetch($exportmodelid); $result = $objexport->fetch($exportmodelid);
@ -336,11 +329,10 @@ if ($step == 2 && $action == 'select_model')
$i=1; $i=1;
foreach($fieldsarray as $val) foreach($fieldsarray as $val)
{ {
$array_filtered[$val]=$i; $tmp=explode('=',$val);
$array_filtervalue[$val]=$fieldsarrayvalue[$i-1]; $array_filtervalue[$tmp[0]]=$tmp[1];
$i++; $i++;
} }
//$_SESSION["export_filtered_fields"]=$array_filtered;
$_SESSION["export_FilterValue_fields"]=$array_filtervalue; $_SESSION["export_FilterValue_fields"]=$array_filtervalue;
} }
} }