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

Fix PSR2

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-22 20:57:43 +02:00
parent b049cf194d
commit e9a2894727
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -6605,7 +6605,7 @@ abstract class CommonObject
{ {
if(empty($this->{$field})) if(empty($this->{$field}))
{ {
$queryarray[$field] = NULL; $queryarray[$field] = null;
} }
else else
{ {

4
htdocs/core/lib/files.lib.php
View File

@ -1139,7 +1139,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file)) if (preg_match('/\.\./',$file) || preg_match('/[<>|]/',$file))
{ {
dol_syslog("Refused to delete file ".$file, LOG_WARNING); dol_syslog("Refused to delete file ".$file, LOG_WARNING);
return False; return false;
} }
if (empty($nohook)) if (empty($nohook))
@ -1238,7 +1238,7 @@ function dol_delete_dir($dir,$nophperrors=0)
if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir)) if (preg_match('/\.\./',$dir) || preg_match('/[<>|]/',$dir))
{ {
dol_syslog("Refused to delete dir ".$dir, LOG_WARNING); dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
return False; return false;
} }
$dir_osencoded=dol_osencode($dir); $dir_osencoded=dol_osencode($dir);

4
htdocs/fourn/commande/card.php
View File

@ -2660,7 +2660,7 @@ elseif (! empty($object->id))
// Ensure that price is equal and warn user if it's not // Ensure that price is equal and warn user if it's not
$supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
$local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found $local_price = null; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
$product_fourn = new ProductFournisseur($db); $product_fourn = new ProductFournisseur($db);
$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product); $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
@ -2675,7 +2675,7 @@ elseif (! empty($object->id))
} }
} }
if ($local_price != NULL && $local_price != $supplier_price) { if ($local_price != null && $local_price != $supplier_price) {
setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings'); setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
} }

10
scripts/accountancy/export-thirdpartyaccount.php
View File

@ -201,13 +201,9 @@ if ($resql) {
print '<td align="left">' . $langs->trans("Phone") . '</td>'; print '<td align="left">' . $langs->trans("Phone") . '</td>';
print '<td align="left">' . $langs->trans("Fax") . '</td></tr>'; print '<td align="left">' . $langs->trans("Fax") . '</td></tr>';
$var = True; while ($obj = $db->fetch_object($resql))
{
while ( $obj = $db->fetch_object($resql) ) { print '<tr class="oddeven">';
$var = ! $var;
print '<tr'. $bc[$var].'>';
print '<td>'; print '<td>';
$thirdpartystatic->id = $obj->rowid; $thirdpartystatic->id = $obj->rowid;
$thirdpartystatic->name = $obj->name; $thirdpartystatic->name = $obj->name;

2
test/phpunit/WebservicesInvoicesTest.php
View File

@ -291,7 +291,7 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
// Test URL // Test URL
$result=''; $result='';
$parameters = array('authentication'=>$authentication,'id'=>NULL,'ref'=>NULL,'ref_ext'=>'ref-phpunit-2'); $parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
print __METHOD__." call method ".$WS_METHOD."\n"; print __METHOD__." call method ".$WS_METHOD."\n";
try { try {
$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,''); $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');