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

Merge pull request #7873 from Dolibarr/scrutinizer-patch-4

Browse Source 
Scrutinizer Auto-Fixes
This commit is contained in:
Laurent Destailleur 2017-11-27 14:48:57 +01:00 committed by GitHub
commit f129d62259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/loan.php
View File

@ -77,7 +77,7 @@ if ($action == 'update')
llxHeader(); llxHeader();
$form = new Form($db); $form = new Form($db);
if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db); if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup'); print load_fiche_titre($langs->trans('ConfigLoan'),$linkback,'title_setup');

2
htdocs/admin/taxes.php
View File

@ -113,7 +113,7 @@ if ($action == 'update') {
llxHeader(); llxHeader();
$form=new Form($db); $form=new Form($db);
if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db); if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup'); print load_fiche_titre($langs->trans('TaxSetup'),$linkback,'title_setup');

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

@ -133,7 +133,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
$error=0; $error=0;
$i=0; $i=0;
$buffer = ''; $buffer = '';
$arraysql = Array(); $arraysql = array();
// Get version of database // Get version of database
$versionarray=$db->getVersionArray(); $versionarray=$db->getVersionArray();

6
htdocs/core/lib/barcode.lib.php
View File

@ -27,9 +27,9 @@
/* ******************************************************************** */ /* ******************************************************************** */
/* COLORS */ /* COLORS */
/* ******************************************************************** */ /* ******************************************************************** */
$bar_color=Array(0,0,0); $bar_color=array(0,0,0);
$bg_color=Array(255,255,255); $bg_color=array(255,255,255);
$text_color=Array(0,0,0); $text_color=array(0,0,0);
/* ******************************************************************** */ /* ******************************************************************** */

24
htdocs/core/lib/json.lib.php
View File

@ -356,20 +356,20 @@ function utf82utf16($utf8)
} }
switch(strlen($utf8)) { switch(strlen($utf8)) {
case 1: case 1:
// this case should never be reached, because we are in ASCII range // this case should never be reached, because we are in ASCII range
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return $utf8; return $utf8;
case 2: case 2:
// return a UTF-16 character from a 2-byte UTF-8 char // return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1}))); return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
case 3: case 3:
// return a UTF-16 character from a 3-byte UTF-8 char // return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2}))); return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
} }
// ignoring UTF-32 for now, sorry // ignoring UTF-32 for now, sorry

2
htdocs/don/admin/donation.php
View File

@ -201,7 +201,7 @@ else if ($action == 'setart885') {
$dir = "../../core/modules/dons/"; $dir = "../../core/modules/dons/";
$form=new Form($db); $form=new Form($db);
if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db); if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';

2
htdocs/product/card.php
View File

@ -848,7 +848,7 @@ llxHeader('', $title, $helpurl);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
$formproduct = new FormProduct($db); $formproduct = new FormProduct($db);
if (! empty($conf->accounting->enabled)) $formaccounting = New FormAccounting($db); if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
// Load object modBarCodeProduct // Load object modBarCodeProduct
$res=0; $res=0;

18
htdocs/product/class/product.class.php
View File

@ -3585,15 +3585,15 @@ class Product extends CommonObject
{ {
switch ($type) switch ($type)
{ {
case 0: case 0:
return $this->LibStatut($this->status,$mode,$type); return $this->LibStatut($this->status,$mode,$type);
case 1: case 1:
return $this->LibStatut($this->status_buy,$mode,$type); return $this->LibStatut($this->status_buy,$mode,$type);
case 2: case 2:
return $this->LibStatut($this->status_batch,$mode,$type); return $this->LibStatut($this->status_batch,$mode,$type);
default: default:
//Simulate previous behavior but should return an error string //Simulate previous behavior but should return an error string
return $this->LibStatut($this->status_buy,$mode,$type); return $this->LibStatut($this->status_buy,$mode,$type);
} }
} }