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

PEAR FunctionCallSignature

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-02-10 10:45:49 +01:00
parent 580e5c42d2
commit 1e43f8e54a
129 changed files with 321 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,12 +345,6 @@
</rule> </rule>
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket"> <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
<severity>0</severity> <severity>0</severity>
</rule>
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
<severity>0</severity>
</rule>
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
<severity>0</severity>
</rule> </rule>
<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket"> <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
<severity>0</severity> <severity>0</severity>

5
htdocs/core/class/CMailFile.class.php
View File

@@ -1297,9 +1297,8 @@ class CMailFile
$port, // which Port number to use $port, // which Port number to use
$errno, // actual system level error $errno, // actual system level error
$errstr, // and any text that goes with the error $errstr, // and any text that goes with the error
$timeout $timeout // timeout for reading/writing data over the socket
)) // timeout for reading/writing data over the socket )) {
{
// Windows still does not have support for this timeout function // Windows still does not have support for this timeout function
if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0); if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);

3
htdocs/core/class/html.formmail.class.php
View File

@@ -426,8 +426,7 @@ class FormMail extends Form
$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">'; $out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
$out.= ' &nbsp; '; $out.= ' &nbsp; ';
$out.= '</div>'; $out.= '</div>';
} } elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
'propal_send','order_send','facture_send', 'propal_send','order_send','facture_send',
'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send', 'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
'invoice_supplier_send','thirdparty','contract','user','all' 'invoice_supplier_send','thirdparty','contract','user','all'

5
htdocs/core/class/smtps.class.php
View File

@@ -382,9 +382,8 @@ class SMTPs
$this->getPort(), // which Port number to use $this->getPort(), // which Port number to use
$this->errno, // actual system level error $this->errno, // actual system level error
$this->errstr, // and any text that goes with the error $this->errstr, // and any text that goes with the error
$this->_smtpTimeout $this->_smtpTimeout // timeout for reading/writing data over the socket
)) // timeout for reading/writing data over the socket )) {
{
// Fix from PHP SMTP class by 'Chris Ryan' // Fix from PHP SMTP class by 'Chris Ryan'
// Sometimes the SMTP server takes a little longer to respond // Sometimes the SMTP server takes a little longer to respond
// so we will give it a longer timeout for the first read // so we will give it a longer timeout for the first read

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

@@ -13,7 +13,7 @@
* Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr> * Copyright (C) 2014 Cédric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -2969,8 +2969,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$picto .= '.png'; $picto .= '.png';
} }
$fullpathpicto = $picto; $fullpathpicto = $picto;
} } else {
else {
$pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); $pictowithoutext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))

3
htdocs/core/tpl/objectline_create.tpl.php
View File

@@ -33,8 +33,7 @@
*/ */
// Protection to avoid direct call of template // Protection to avoid direct call of template
if (empty($object) || ! is_object($object)) if (empty($object) || ! is_object($object)) {
{
print "Error: this template page cannot be called directly as an URL"; print "Error: this template page cannot be called directly as an URL";
exit; exit;
} }