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

Merge pull request #15188 from frederic34/20201027_phpcs

Browse Source 
fix phpcs
This commit is contained in:
Laurent Destailleur 2020-10-28 17:08:25 +01:00 committed by GitHub
commit 07da283707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/setup/codesniffer/ruleset.xml
View File

@ -17,6 +17,7 @@
<exclude-pattern type="relative">*/nltechno*</exclude-pattern>
<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
<exclude-pattern type="relative">*/htdocs/includes</exclude-pattern>
<exclude-pattern type="relative">.git</exclude-pattern>
<!-- List of all tests -->

17
htdocs/compta/cashcontrol/report.php
View File

@ -29,7 +29,7 @@
* \brief List of bank transactions
*/
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification
require '../../main.inc.php';
@ -125,8 +125,7 @@ elseif ($syear && $smonth && $sday) $sql .= " AND datef BETWEEN '".$db->idate(
else dol_print_error('', 'Year not defined');
$resql = $db->query($sql);
if ($resql)
{
if ($resql) {
$num = $db->num_rows($resql);
$i = 0;
@ -166,12 +165,10 @@ if ($resql)
$totalarray = array();
$cachebankaccount = array();
$amountpertype = array();
while ($i < $num)
{
while ($i < $num) {
$objp = $db->fetch_object($resql);
if (empty($cachebankaccount[$objp->bankid]))
{
if (empty($cachebankaccount[$objp->bankid])) {
$bankaccounttmp = new Account($db);
$bankaccounttmp->fetch($objp->bankid);
$cachebankaccount[$objp->bankid] = $bankaccounttmp;
@ -235,8 +232,7 @@ if ($resql)
// Debit
print '<td class="right">';
if ($objp->amount < 0)
{
if ($objp->amount < 0) {
print price($objp->amount * -1);
$totalarray['val']['totaldebfield'] += $objp->amount;
$amountpertype[$objp->code] += $objp->amount;
@ -247,8 +243,7 @@ if ($resql)
// Credit
print '<td class="right">';
if ($objp->amount > 0)
{
if ($objp->amount > 0) {
print price($objp->amount);
$totalarray['val']['totalcredfield'] += $objp->amount;
$amountpertype[$objp->code] -= $objp->amount;

9
htdocs/core/lib/geturl.lib.php
View File

@ -195,8 +195,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
dol_syslog("getURLContent response size=".strlen($response)); // This may contains binary data, so we dont output it
$rep = array();
if (curl_errno($ch))
{
if (curl_errno($ch)) {
// Ad keys to $rep
$rep['content'] = $response;
@ -239,14 +238,12 @@ function getDomainFromURL($url, $mode = 0)
{
$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
if ($mode == 2)
{
if ($mode == 2) {
$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
} else {
$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
}
if (empty($mode))
{
if (empty($mode)) {
$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
}