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

Fix bugs reported by scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-06 10:42:51 +02:00
parent bb81f66a1a
commit f08c07f315
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1023,22 +1023,16 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
{ {
case UPLOAD_ERR_INI_SIZE: // 1 case UPLOAD_ERR_INI_SIZE: // 1
return 'ErrorFileSizeTooLarge'; return 'ErrorFileSizeTooLarge';
break;
case UPLOAD_ERR_FORM_SIZE: // 2 case UPLOAD_ERR_FORM_SIZE: // 2
return 'ErrorFileSizeTooLarge'; return 'ErrorFileSizeTooLarge';
break;
case UPLOAD_ERR_PARTIAL: // 3 case UPLOAD_ERR_PARTIAL: // 3
return 'ErrorPartialFile'; return 'ErrorPartialFile';
break;
case UPLOAD_ERR_NO_TMP_DIR: // case UPLOAD_ERR_NO_TMP_DIR: //
return 'ErrorNoTmpDir'; return 'ErrorNoTmpDir';
break;
case UPLOAD_ERR_CANT_WRITE: case UPLOAD_ERR_CANT_WRITE:
return 'ErrorFailedToWriteInDir'; return 'ErrorFailedToWriteInDir';
break;
case UPLOAD_ERR_EXTENSION: case UPLOAD_ERR_EXTENSION:
return 'ErrorUploadBlockedByAddon'; return 'ErrorUploadBlockedByAddon';
break;
default: default:
break; break;
} }

11
htdocs/core/menus/standard/empty.php
View File

@ -51,12 +51,15 @@ class MenuManager
/** /**
* Load this->tabMenu * Load this->tabMenu
* *
* @return void * @param string $forcemainmenu To force mainmenu to load
* @param string $forceleftmenu To force leftmenu to load
* @return void
*/ */
public function loadMenu() public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
{ {
// Do nothing
} }

2
htdocs/core/modules/import/import_csv.modules.php
View File

@ -761,7 +761,7 @@ class ImportCsv extends ModeleImports
$lastinsertid = $res->rowid; $lastinsertid = $res->rowid;
$last_insert_id_array[$tablename] = $lastinsertid; $last_insert_id_array[$tablename] = $lastinsertid;
} elseif($resql->num_rows > 1) { } elseif($resql->num_rows > 1) {
$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', ')); $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
$this->errors[$error]['type']='SQL'; $this->errors[$error]['type']='SQL';
$error++; $error++;
} else { } else {

2
htdocs/core/modules/import/import_xlsx.modules.php
View File

@ -782,7 +782,7 @@ class ImportXlsx extends ModeleImports
$lastinsertid = $res->rowid; $lastinsertid = $res->rowid;
$last_insert_id_array[$tablename] = $lastinsertid; $last_insert_id_array[$tablename] = $lastinsertid;
} elseif($resql->num_rows > 1) { } elseif($resql->num_rows > 1) {
$this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode($filters, ', ')); $this->errors[$error]['lib']=$langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
$this->errors[$error]['type']='SQL'; $this->errors[$error]['type']='SQL';
$error++; $error++;
} else { } else {