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 2020-10-02 19:10:30 +02:00
parent 1a535dc77b
commit 50ca9f4145
3 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/admin.lib.php
View File

@ -1689,8 +1689,11 @@ function phpinfo_array()
{ {
ob_start(); ob_start();
phpinfo(); phpinfo();
$phpinfostring = ob_get_contents();
ob_end_clean();
$info_arr = array(); $info_arr = array();
$info_lines = explode("\n", strip_tags(ob_get_clean(), "<tr><td><h2>")); // end of ob_start() $info_lines = explode("\n", strip_tags($phpinfostring, "<tr><td><h2>"));
$cat = "General"; $cat = "General";
foreach ($info_lines as $line) foreach ($info_lines as $line)
{ {

45
htdocs/product/inventory/lib/inventory.lib.php
View File

@ -73,48 +73,3 @@ function inventoryPrepareHead(&$inventory, $title = 'Inventory', $get = '')
array(dol_buildpath('/product/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans('Inventory'), 'inventory') array(dol_buildpath('/product/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans('Inventory'), 'inventory')
); );
} }
/**
* Define head array for tabs of inventory tools setup pages
*
* @param Inventory $inventory Object inventory
*
* @return string html of products
*/
function inventorySelectProducts(&$inventory)
{
global $conf, $db, $langs;
$except_product_id = array();
foreach ($inventory->Inventorydet as $Inventorydet)
{
$except_product_id[] = $Inventorydet->fk_product;
}
ob_start();
$form = new Form($db);
$form->select_produits(-1, 'fk_product');
$TChildWarehouses = array($inventory->fk_warehouse);
$e = new Entrepot($db);
$e->fetch($inventory->fk_warehouse);
if (method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses);
$Tab = array();
$sql = 'SELECT rowid, label
FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')';
if (method_exists($e, 'get_children_warehouses')) $sql .= ' ORDER BY fk_parent';
$resql = $db->query($sql);
while ($res = $db->fetch_object($resql)) {
$Tab[$res->rowid] = $res->label;
}
print '&nbsp;&nbsp;&nbsp;';
print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab);
$select_html = ob_get_clean();
return $select_html;
}

2
htdocs/takepos/send.php
View File

@ -60,10 +60,12 @@ if ($action=="send")
$model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE; $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id); $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
$subject = $arraydefaultmessage->topic; $subject = $arraydefaultmessage->topic;
ob_start(); // turn on output receipt ob_start(); // turn on output receipt
include 'receipt.php'; include 'receipt.php';
$receipt = ob_get_contents(); // get the contents of the output buffer $receipt = ob_get_contents(); // get the contents of the output buffer
ob_end_clean(); ob_end_clean();
$msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>"; $msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
$sendto=$email; $sendto=$email;
$from=$mysoc->email; $from=$mysoc->email;