Fix: Checkstyle

This commit is contained in:
Laurent Destailleur 2012-12-19 20:59:08 +01:00
parent 78a1354a52
commit e39ec132e5
9 changed files with 162 additions and 123 deletions

View File

@ -528,6 +528,7 @@ class ActionComm extends CommonObject
/** /**
* Load all objects with filters * Load all objects with filters
* *
* @param DoliDb $db Database handler
* @param int $socid Filter by thirdparty * @param int $socid Filter by thirdparty
* @param int $fk_element Id of element action is linked to * @param int $fk_element Id of element action is linked to
* @param string $elementtype Type of element action is linked to * @param string $elementtype Type of element action is linked to

View File

@ -173,7 +173,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
$sFileName = '' ; $sFileName = '' ;
if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name']) if ( isset( $_FILES['NewFile'] ) && !is_null($_FILES['NewFile']['tmp_name'])
# This is for the QuickUpload tab box // This is for the QuickUpload tab box
or (isset($_FILES['upload']) and !is_null($_FILES['upload']['tmp_name']))) or (isset($_FILES['upload']) and !is_null($_FILES['upload']['tmp_name'])))
{ {
global $Config ; global $Config ;

View File

@ -22,12 +22,26 @@
* Utility functions for the File Manager Connector for PHP. * Utility functions for the File Manager Connector for PHP.
*/ */
/**
* RemoveFromStart
*
* @param string $sourceString Source
* @param string $charToRemove Char to remove
* @return string Result
*/
function RemoveFromStart($sourceString, $charToRemove) function RemoveFromStart($sourceString, $charToRemove)
{ {
$sPattern = '|^' . $charToRemove . '+|' ; $sPattern = '|^' . $charToRemove . '+|' ;
return preg_replace($sPattern, '', $sourceString); return preg_replace($sPattern, '', $sourceString);
} }
/**
* RemoveFromEnd
*
* @param string $sourceString Source
* @param string $charToRemove Rhar to remove
* @return string Result
*/
function RemoveFromEnd($sourceString, $charToRemove) function RemoveFromEnd($sourceString, $charToRemove)
{ {
$sPattern = '|' . $charToRemove . '+$|' ; $sPattern = '|' . $charToRemove . '+$|' ;
@ -38,11 +52,11 @@ function RemoveFromEnd( $sourceString, $charToRemove)
* FindBadUtf8 * FindBadUtf8
* *
* @param unknown_type $string String * @param unknown_type $string String
* @return boolean
*/ */
function FindBadUtf8($string) function FindBadUtf8($string)
{ {
$regex = $regex = '([\x00-\x7F]'.
'([\x00-\x7F]'.
'|[\xC2-\xDF][\x80-\xBF]'. '|[\xC2-\xDF][\x80-\xBF]'.
'|\xE0[\xA0-\xBF][\x80-\xBF]'. '|\xE0[\xA0-\xBF][\x80-\xBF]'.
'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'. '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
@ -65,7 +79,8 @@ function FindBadUtf8( $string )
/** /**
* ConvertToXmlAttribute * ConvertToXmlAttribute
* *
* @param unknown_type $value * @param string $value Value
* @return string
*/ */
function ConvertToXmlAttribute( $value ) function ConvertToXmlAttribute( $value )
{ {
@ -91,8 +106,8 @@ function ConvertToXmlAttribute( $value )
/** /**
* Check whether given extension is in html etensions list * Check whether given extension is in html etensions list
* *
* @param string $ext * @param string $ext Extension
* @param array $formExtensions * @param array $formExtensions Array of extensions
* @return boolean * @return boolean
*/ */
function IsHtmlExtension( $ext, $formExtensions ) function IsHtmlExtension( $ext, $formExtensions )

View File

@ -129,6 +129,13 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
*/ */
class FPDI_DolExtended extends FPDI class FPDI_DolExtended extends FPDI
{ {
/**
* __call
*
* @param string $method Method
* @param mixed $args Arguments
* @return void
*/
public function __call($method, $args) public function __call($method, $args)
{ {
if (isset($this->$method)) { if (isset($this->$method)) {
@ -137,6 +144,22 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
} }
} }
/**
* writeHTMLCell
*
* @param unknown_type $w Width
* @param unknown_type $h Height
* @param unknown_type $x X
* @param unknown_type $y Y
* @param unknown_type $html Html
* @param unknown_type $border Border
* @param unknown_type $ln Ln
* @param unknown_type $fill Fill
* @param unknown_type $reseth Reseth
* @param unknown_type $align Align
* @param unknown_type $autopadding Autopadding
* @return void
*/
public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true) public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
{ {
$this->SetXY($x,$y); $this->SetXY($x,$y);

View File

@ -107,7 +107,6 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
* Export the message * Export the message
* *
* @param array $content Array containing the info about the message * @param array $content Array containing the info about the message
* @param int $ident 1=Increase ident of 1, -1=Decrease ident of 1
* @return void * @return void
*/ */
public function export($content) public function export($content)

View File

@ -228,8 +228,6 @@ $server->register(
* *
* @param array $authentication Array of authentication information * @param array $authentication Array of authentication information
* @param int $id Id of object * @param int $id Id of object
* @param string $ref Ref of object
* @param ref_ext $ref_ext Ref external of object
* @return mixed * @return mixed
*/ */
function getActionComm($authentication,$id) function getActionComm($authentication,$id)

View File

@ -444,6 +444,7 @@ function getOrder($authentication,$id='',$ref='',$ref_ext='')
/** /**
* Get list of orders for third party * Get list of orders for third party
*
* @param array $authentication Array of authentication information * @param array $authentication Array of authentication information
* @param int $idthirdparty Id of thirdparty * @param int $idthirdparty Id of thirdparty
* @return array Array result * @return array Array result
@ -604,6 +605,7 @@ function getOrdersForThirdParty($authentication,$idthirdparty)
/** /**
* Create order * Create order
*
* @param array $authentication Array of authentication information * @param array $authentication Array of authentication information
* @param array $order Order info * @param array $order Order info
* @return int Id of new order * @return int Id of new order
@ -701,6 +703,7 @@ function createOrder($authentication,$order)
/** /**
* Valid an order * Valid an order
*
* @param array $authentication Array of authentication information * @param array $authentication Array of authentication information
* @param int $id Id of order to validate * @param int $id Id of order to validate
* @return array Array result * @return array Array result