diff --git a/ChangeLog b/ChangeLog
index c52a486523cefdfafd50694147d28ee3e1aa3e1b..5b93245f378afa657c9d247c6f101ea0f14f6785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,7 @@ Dolibarr better:
- Function delete of class Facture (invoice) need the object $user as first parameter. Also you must
check you make a fetch on object before calling the delete.
- The old driver of "mysql" has been removed. Dolibarr use the new one (mysqli) by default.
-
+- Remove not used function calculate_byte(). Use dol_print_size() instead.
***** ChangeLog for 4.0.0 compared to 3.9.* *****
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 186a17a9934a4ada3834f31a1bb98a87ccc893db..c1436e6d36e35c6e7ab136b5c7e496e83555343b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -204,328 +204,6 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
}
}
-/**
- * Scan a directory and return a array of files/directories from a selection.
- * Content for string is UTF8 and dir separator is "/".
- *
- * @param int $fk_soc select socid - for your selection in array
- * @param string $module_get Starting path from which to search
- * @param string $sortorder SORT_ASC or SORT_DESC
- * @param array $excludefiles Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
- * @return array Array of array( filefolder=> array( filelabel=> array( file=> array('name'=>'xxx','date'=>'yyy','size'=>99,'type'=>'dir|file'))))
- */
-function get_soc_file_array($fk_soc, $module_get = false, $sortorder = false, $excludefiles = false)
-{
- global $user, $conf, $db;
-
- $sortfield = "date";
-
- if(!$sortorder){
- $sorting = SORT_DESC;
- }else{
- $sorting = $sortorder;
- }
-
- $ar_modules_get = array();
- if (is_array($module_get)) $ar_modules_get = $module_get;
- elseif (strlen($module_get) > 0) $ar_modules_get[$module_get] = $module_get;
- else
- {
- $ar_modules_get['company'] = 'company';
- $ar_modules_get['dolimail'] = 'dolimail';
- $ar_modules_get['actions'] = 'actions';
- $ar_modules_get['invoice'] = 'invoice';
- $ar_modules_get['order'] = 'order';
- $ar_modules_get['propal'] = 'propal';
- $ar_modules_get['contract'] = 'contract';
- $ar_modules_get['project'] = 'project';
- $ar_modules_get['invoice_supplier'] = 'invoice_supplier';
- $ar_modules_get['order_supplier'] = 'order_supplier';
- }
-
-
- // rights
- if (count($ar_modules_get) > 0)
- foreach($ar_modules_get as $curmodule)
- {
- switch($curmodule)
- {
- case 'company':
- if (! empty($conf->societe->enabled)) // Recht Alle oder nur die Vertriebspartneradressen
- $ar_modules_secure['company']['outputdir'] = $conf->societe->dir_output;
- break;
- case 'dolimail':
- if (! empty($conf->dolimail->enabled) && ($user->rights->dolimail->read || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->dolimail->dir_output.'/attachments';
- break;
- case 'actions':
- if (! empty($conf->agenda->enabled) || ($user->rights->agenda->allactions->read || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->agenda->dir_output;
- break;
- case 'invoice':
- if (! empty($conf->facture->enabled) && ($user->rights->facture->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->facture->dir_output;
- break;
- case 'order':
- if (!empty($conf->commande->enabled) && ($user->rights->commande->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->commande->dir_output;
- break;
- case 'propal':
- if (!empty($conf->propal->enabled) && ($user->rights->propale->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->propal->dir_output;
- break;
- case 'project':
- if (! empty($conf->projet->enabled) && ($user->rights->projet->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->projet->dir_output;
- break;
- case 'invoice_supplier':
- if (! empty($conf->fournisseur->enabled) && ($user->rights->fournisseur->facture->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->fournisseur->dir_output.'/facture';
- break;
- case 'order_supplier':
- if (! empty($conf->fournisseur->enabled) && ($user->rights->fournisseur->commande->lire || $user->admin))
- $ar_modules_secure[$curmodule]['outputdir']=$conf->fournisseur->dir_output.'/commande';
- break;
- }
- }
- /* TODO make a outputdir*/
- //unset($ar_modules_secure['dolimail']);
- unset($ar_modules_secure['project']); // project (list with project) is "ref"
- unset($ar_modules_secure['actions']);
- unset($ar_modules_secure['contract']);
- /* TODO make a outputdir*/
- unset($curmodule);
-
- if($fk_soc > 0)
- $ar_modules_get = $ar_modules_secure;
-
- $xy=0;
- if (count($ar_modules_get)>0)
- foreach($ar_modules_get as $curmodule => $myarray)
- {
- if($fk_soc > 0 && $curmodule != "company")
- {
-
- // SQL to find documents (ref number)
-
- if($curmodule == "invoice") $sql = "SELECT facnumber as refstr FROM ".MAIN_DB_PREFIX."facture";
- elseif($curmodule == "order") $sql = "SELECT ref as refstr FROM ".MAIN_DB_PREFIX."commande";
- elseif($curmodule == "invoice_supplier") $sql = "SELECT rowid as refstr FROM ".MAIN_DB_PREFIX."facture_fourn";
- elseif($curmodule == "order_supplier") $sql = "SELECT ref as refstr FROM ".MAIN_DB_PREFIX."commande_fournisseur";
- elseif($curmodule == "propal") $sql = "SELECT ref as refstr FROM ".MAIN_DB_PREFIX."propal";
- elseif($curmodule == "contract") $sql = "SELECT ref as refstr FROM ".MAIN_DB_PREFIX."contrat";
- elseif($curmodule == "dolimail") $sql = "SELECT uid as refstr, subject FROM ".MAIN_DB_PREFIX."mails";
-
- $sql.= ' WHERE entity IN ('.getEntity('societe', 1).')';
- $sql.= " AND fk_soc = '".$fk_soc."'";
-
-
- $res = $db->query($sql);
- if ($res && $db->num_rows($res) > 0)
- {
- while($obj = $db->fetch_object($res))
- {
- $ar_modules_secure[$curmodule]['socref'][] = $obj->refstr;
- if($curmodule == "dolimail") $ar_modules_secure['dolimail']['subject'][$obj->refstr] = $obj->subject;
- }
- }
- else
- {
- unset($ar_modules_secure[$curmodule]);
- continue;
- $errors[]="SQL Error: ".$sql;
- $error++;
- }
-
-
- }else{
- if($curmodule == "dolimail") $sql = "SELECT uid as refstr, subject FROM ".MAIN_DB_PREFIX."mails";
-
- $res = $db->query($sql);
- if ($res && $db->num_rows($res) > 0)
- {
- while($obj = $db->fetch_object($res))
- {
- if($curmodule == "dolimail") $ar_modules_secure['dolimail']['subject'][$obj->refstr] = $obj->subject;
- }
- }
- }
-
- // Data in Array
- // Get Array from ar_module
-
- $output[$curmodule]=dol_dir_list($myarray['outputdir'],"files",1,'', $excludefiles, $sortfield, $sorting,1);
- if($fk_soc > 0)
- {
- if($curmodule == "company")
- {
- foreach($output["company"] as $label => $filedata)
- {
- if($filedata['level1name'] != $fk_soc)
- {
- unset($output['company'][$label]);
- }
- }
- }
-
- elseif($curmodule == "invoice")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // wenn no file exsit
- foreach($output["invoice"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref']))
- {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($fac_supp_N_arr) array
- }
-
- }
- }
- elseif($curmodule == "invoice_supplier")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["invoice_supplier"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($fac_supp_N_arr) array
- }
- }
- }
- elseif($curmodule == "order")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["order"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($ref_order_arr) array
- }
- }
- }
- elseif($curmodule == "order_supplier")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["order_supplier"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($ref_order_supp_arr) array
- }
- }
- }
- elseif($curmodule == "propal")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["propal"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($ref_propal_arr) array
- }
- }
- }
- elseif($curmodule == "contract")
- {
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["contract"] as $label => $filedata)
- {
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($ref_contract_arr) array
- }
- }
- }
- elseif($curmodule == "dolimail")
- {
-
- if (! is_array($ar_modules_secure[$curmodule]['socref'])) { unset($output[$curmodule]); continue; } // throw all ref number who are not in ($fac_invoice_arr) array
- foreach($output["dolimail"] as $label => $filedata)
- {
- if($filedata['name'] == "winmail.dat" || $filedata['name'] == "smime.p7s") unset($output[$curmodule][$label]);
- else
- if (! in_array($filedata['level1name'], $ar_modules_secure[$curmodule]['socref'])) {
- unset($output[$curmodule][$label]); // throw all ref number who are not in ($ref_propal_arr) array
- }
- }
- }
- // Error if ther isn't any File
- if(count($output[$curmodule]) == 0)
- {
- $error++;
- $errors[]="Error [404]: No File found for User: ".$fk_soc." in module: ".$curmodule;
- unset($output[$curmodule]);
- }
- }
-
- // Extra for Mail attachments
- if($curmodule == "dolimail" && count($output["dolimail"])>0)
- {
- foreach($output["dolimail"] as $label => $filedata)
- {
- $output[$curmodule][$label]['subject'] = $ar_modules_secure['dolimail']['subject'][$filedata['level1name']];
- }
- }
-
- // Extra for Mail attachments
- if($curmodule == "invoice" && count($output["invoice"])>0)
- {
- foreach($output["invoice"] as $label => $filedata)
- {
- $output[$curmodule][$label]['subject'] = $filedata['level1name'];
- }
- }
-
- // Extra for Mail attachments
- if($curmodule == "invoice_supplier" && count($output["invoice_supplier"])>0)
- {
- foreach($output["invoice_supplier"] as $label => $filedata)
- {
- $output[$curmodule][$label]['subject'] = $filedata['level1name'];
- }
- }
-
- // Extra for Mail attachments
- if($curmodule == "contract" && count($output["contract"])>0)
- {
- foreach($output["contract"] as $label => $filedata)
- {
- $output[$curmodule][$label]['subject'] = $filedata['level1name'];
- }
- }
-
- $xy++;
- }
-
- if(count($output) > 0)
- {
- return $output;
- }
- else
- {
- return -1;
- }
-}
-
-/**
- * Calculate Bytes to kb, mb and translate it to current language
- *
- * @param int $byt Bytes
- * @return string calculated string
- */
-function calculate_byte($byt)
-{
- global $langs;
-
- if ($byt < 1024) {
- $unit = ' '.$langs->trans("b");
- $mailsize=$byt;
- } else if ($byt / 1024 > 1024) {
- $mailsize = $byt / 1024 / 1024;
- $unit = ' '.$langs->trans("Mb");
- } else {
- $mailsize = $byt / 1024;
- $unit = ' '.$langs->trans("Kb");
- }
-
- $val = number_format($mailsize, 2).$unit;
-
- return $val;
-}
/**
* Fast compare of 2 files identified by their properties ->name, ->date and ->size