Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix warning qodana

Browse Source
This commit is contained in:
Laurent Destailleur
2022-12-31 13:44:11 +01:00
parent e977a95cc7
commit 8774f4f092
25 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/lib/functions.lib.php
View File

@@ -368,7 +368,7 @@ function getBrowserInfo($user_agent)
// MS products at end
$name = 'ie';
$version = end($reg);
} elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
} elseif (preg_match('/l[iy]n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
// MS products at end
$name = 'lynxlinks';
$version = $reg[4];
@@ -3804,7 +3804,7 @@ function isValidMXRecord($domain)
}
}
// function idn_to_ascii or checkdnsrr does not exists
// function idn_to_ascii or checkdnsrr or getmxrr does not exists
return -1;
}
@@ -10208,12 +10208,12 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
$imgmime = 'mdb.png';
$famime = 'file-o';
}
if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) {
if (preg_match('/\.doc[xm]?$/i', $tmpfile)) {
$mime = 'application/msword';
$imgmime = 'doc.png';
$famime = 'file-word-o';
}
if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) {
if (preg_match('/\.dot[xm]?$/i', $tmpfile)) {
$mime = 'application/msword';
$imgmime = 'doc.png';
$famime = 'file-word-o';
@@ -10233,17 +10233,17 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
$imgmime = 'xls.png';
$famime = 'file-excel-o';
}
if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) {
if (preg_match('/\.xls[bmx]$/i', $tmpfile)) {
$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
$imgmime = 'xls.png';
$famime = 'file-excel-o';
}
if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) {
if (preg_match('/\.pps[mx]?$/i', $tmpfile)) {
$mime = 'application/vnd.ms-powerpoint';
$imgmime = 'ppt.png';
$famime = 'file-powerpoint-o';
}
if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) {
if (preg_match('/\.ppt[mx]?$/i', $tmpfile)) {
$mime = 'application/x-mspowerpoint';
$imgmime = 'ppt.png';
$famime = 'file-powerpoint-o';

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

@@ -1624,8 +1624,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
// Duration
print '<td class="center duration'.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
$dayWorkLoad = !empty($projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]) ? $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id] : 0;
if (!isset($totalforeachday[$preselectedday])) $totalforeachday[$preselectedday] = 0;
$dayWorkLoad = empty($projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]) ? 0 : $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
if (!isset($totalforeachday[$preselectedday])) {
$totalforeachday[$preselectedday] = 0;
}
$totalforeachday[$preselectedday] += $dayWorkLoad;
$alreadyspent = '';

2
htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
View File

@@ -262,7 +262,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref.'_'.$newfiletmp;

2
htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
View File

@@ -273,7 +273,7 @@ class doc_generic_bom_odt extends ModelePDFBom
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@@ -279,7 +279,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@@ -276,7 +276,7 @@ class doc_generic_contract_odt extends ModelePDFContract
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@@ -276,7 +276,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
View File

@@ -266,7 +266,7 @@ class doc_generic_member_odt extends ModelePDFMember
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
View File

@@ -266,7 +266,7 @@ class doc_generic_mo_odt extends ModelePDFMo
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@@ -274,7 +274,7 @@ class doc_generic_product_odt extends ModelePDFProduct
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@@ -557,7 +557,7 @@ class doc_generic_project_odt extends ModelePDFProjects
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@@ -307,7 +307,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
View File

@@ -270,7 +270,7 @@ class doc_generic_reception_odt extends ModelePdfReception
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@@ -277,7 +277,7 @@ class doc_generic_stock_odt extends ModelePDFStock
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
View File

@@ -266,7 +266,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref.'_'.$newfiletmp;

2
htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
View File

@@ -261,7 +261,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref . '_' . $newfiletmp;

2
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@@ -295,7 +295,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
View File

@@ -264,7 +264,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@@ -295,7 +295,7 @@ class doc_generic_user_odt extends ModelePDFUser
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@@ -277,7 +277,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
View File

@@ -278,7 +278,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);

2
htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
View File

@@ -264,7 +264,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
if (file_exists($dir)) {
//print "srctemplatepath=".$srctemplatepath; // Src filename
$newfile = basename($srctemplatepath);
$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
$newfiletmp = $objectref.'_'.$newfiletmp;

4
qodana.yaml
View File

@@ -67,3 +67,7 @@ exclude:
- name: PhpLoopCanBeReplacedWithStrRepeatInspection
- name: PhpPropertyOnlyWrittenInspection
- name: PhpCoveredCharacterInClassInspection
- name: PhpSameParameterValueInspection
- name: PhpConditionCheckedByNextConditionInspection
- name: PhpSuspiciousNameCombinationInspection

7
test/phpunit/FunctionsLibTest.php
View File

@@ -442,6 +442,13 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
$this->assertEquals('ios', $tmp['browseros']);
$this->assertEquals('tablet', $tmp['layout']);
$this->assertEquals('iphone', $tmp['phone']);
//iPad
$user_agent = 'Lynx/2.8.8dev.3 libwww‑FM/2.14 SSL‑MM/1.4.1';
$tmp=getBrowserInfo($user_agent);
$this->assertEquals('lynxlinks', $tmp['browsername']);
$this->assertEquals('unknown', $tmp['browseros']);
$this->assertEquals('classic', $tmp['layout']);
}