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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-11 21:03:23 +01:00
parent e5f0c8e0e7
commit abdc2aa21a
2 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/comm/propal/class/propal.class.php
View File

@ -108,7 +108,7 @@ class Propal extends CommonObject
/** /**
* @deprecated * @deprecated
* @see date_creation * @see $date_creation
*/ */
public $datec; public $datec;
@ -120,7 +120,7 @@ class Propal extends CommonObject
/** /**
* @deprecated * @deprecated
* @see date_validation * @see $date_validation
*/ */
public $datev; public $datev;
@ -138,7 +138,7 @@ class Propal extends CommonObject
/** /**
* @deprecated * @deprecated
* @see date * @see $date
*/ */
public $datep; public $datep;
public $date_livraison; public $date_livraison;
@ -150,17 +150,17 @@ class Propal extends CommonObject
/** /**
* @deprecated * @deprecated
* @see total_ht * @see $total_ht
*/ */
public $price; public $price;
/** /**
* @deprecated * @deprecated
* @see total_tva * @see $total_tva
*/ */
public $tva; public $tva;
/** /**
* @deprecated * @deprecated
* @see total_ttc * @see $total_ttc
*/ */
public $total; public $total;
@ -432,7 +432,7 @@ class Propal extends CommonObject
* @param double $pu_ht_devise Unit price in currency * @param double $pu_ht_devise Unit price in currency
* @param int $fk_remise_except Id discount if line is from a discount * @param int $fk_remise_except Id discount if line is from a discount
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* @see add_product * @see add_product()
*/ */
public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0) public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0)
{ {
@ -1199,7 +1199,7 @@ class Propal extends CommonObject
* *
* @param User $user User that create * @param User $user User that create
* @return int Id of the new object if ok, <0 if ko * @return int Id of the new object if ok, <0 if ko
* @see create * @see create()
*/ */
public function create_from($user) public function create_from($user)
{ {
@ -3199,7 +3199,7 @@ class Propal extends CommonObject
elseif ($statut==self::STATUS_SIGNED) $statusType='status3'; elseif ($statut==self::STATUS_SIGNED) $statusType='status3';
elseif ($statut==self::STATUS_NOTSIGNED) $statusType='status5'; elseif ($statut==self::STATUS_NOTSIGNED) $statusType='status5';
elseif ($statut==self::STATUS_BILLED) $statusType='status6'; elseif ($statut==self::STATUS_BILLED) $statusType='status6';
return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statusType, $mode); return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statusType, $mode);
} }
@ -3649,7 +3649,7 @@ class PropaleLigne extends CommonObjectLine
public $fk_product; // Id produit predefini public $fk_product; // Id produit predefini
/** /**
* @deprecated * @deprecated
* @see product_type * @see $product_type
*/ */
public $fk_product_type; public $fk_product_type;
/** /**
@ -3677,7 +3677,7 @@ class PropaleLigne extends CommonObjectLine
// 2: ecotaxe // 2: ecotaxe
// 3: option line (when qty = 0) // 3: option line (when qty = 0)
public $info_bits = 0; // Liste d'options cumulables: public $info_bits = 0; // Some other info:
// Bit 0: 0 si TVA normal - 1 si TVA NPR // Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe // Bit 1: 0 ligne normale - 1 si ligne de remise fixe
@ -3692,14 +3692,14 @@ class PropaleLigne extends CommonObjectLine
public $remise; public $remise;
/** /**
* @deprecated * @deprecated
* @see subprice * @see $subprice
*/ */
public $price; public $price;
// From llx_product // From llx_product
/** /**
* @deprecated * @deprecated
* @see product_ref * @see $product_ref
*/ */
public $ref; public $ref;
/** /**
@ -3709,7 +3709,7 @@ class PropaleLigne extends CommonObjectLine
public $product_ref; public $product_ref;
/** /**
* @deprecated * @deprecated
* @see product_label * @see $product_label
*/ */
public $libelle; public $libelle;
/** /**
@ -3725,8 +3725,8 @@ class PropaleLigne extends CommonObjectLine
public $localtax1_tx; // Local tax 1 public $localtax1_tx; // Local tax 1
public $localtax2_tx; // Local tax 2 public $localtax2_tx; // Local tax 2
public $localtax1_type; // Local tax 1 type public $localtax1_type; // Local tax 1 type
public $localtax2_type; // Local tax 2 type public $localtax2_type; // Local tax 2 type
public $total_localtax1; // Line total local tax 1 public $total_localtax1; // Line total local tax 1
public $total_localtax2; // Line total local tax 2 public $total_localtax2; // Line total local tax 2

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

@ -7900,29 +7900,31 @@ function roundUpToNextMultiple($n, $x = 5)
} }
/** /**
* @param string $label label of badge no html : use in alt attribute for accessibility * Function dolGetBadge
* @param string $html optional : label of badge with html *
* @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 * @param string $label label of badge no html : use in alt attribute for accessibility
* @param string $mode default '' , pill, dot * @param string $html optional : label of badge with html
* @param string $url the url for link * @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9
* @param array $params various params for future : recommended rather than adding more fuction arguments * @param string $mode default '' , pill, dot
* @return string html badge * @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more fuction arguments
* @return string Html badge
*/ */
function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array()) function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
{ {
$attr=array( $attr=array(
'class'=>'badge'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'') 'class'=>'badge'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'')
); );
if(empty($html)){ if(empty($html)){
$html = $label; $html = $label;
} }
if(!empty($url)){ if(!empty($url)){
$attr['href'] = $url; $attr['href'] = $url;
} }
if($mode==='dot') if($mode==='dot')
{ {
$attr['class'].= ' classfortooltip'; $attr['class'].= ' classfortooltip';
@ -7930,7 +7932,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
$attr['aria-label'] = $label; $attr['aria-label'] = $label;
$html=''; $html='';
} }
// Override attr // Override attr
if(!empty($params['attr']) && is_array($params['attr'])){ if(!empty($params['attr']) && is_array($params['attr'])){
foreach($params['attr']as $key => $value){ foreach($params['attr']as $key => $value){
@ -7939,17 +7941,17 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
} }
// TODO: add hook // TODO: add hook
// escape all attribute // escape all attribute
$attr = array_map('dol_escape_htmltag', $attr); $attr = array_map('dol_escape_htmltag', $attr);
$TCompiledAttr = array(); $TCompiledAttr = array();
foreach($attr as $key => $value){ foreach($attr as $key => $value){
$TCompiledAttr[] = $key.'="'.$value.'"'; $TCompiledAttr[] = $key.'="'.$value.'"';
} }
$compiledAttributes = !empty($TCompiledAttr)?implode(' ', $TCompiledAttr):''; $compiledAttributes = !empty($TCompiledAttr)?implode(' ', $TCompiledAttr):'';
$tag = !empty($url)?'a':'span'; $tag = !empty($url)?'a':'span';
return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>'; return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
@ -7957,14 +7959,16 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
/** /**
* @param string $statusLabel label of badge no html : use in alt attribute for accessibility * Function dolGetStatus
* @param string $statusLabelShort short label of badge no html *
* @param string $html optional : label of badge with html * @param string $statusLabel Label of badge no html : use in alt attribute for accessibility
* @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name * @param string $statusLabelShort Short label of badge no html
* @param int $displayMode for retrocompatibility 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto * @param string $html Optional : label of badge with html
* @param string $url the url for link * @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
* @param array $params various params for future : recommended rather than adding more function arguments * @param int $displayMode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
* @return string html status * @param string $url The url for link
* @param array $params Various params for future : recommended rather than adding more function arguments
* @return string Html status string
*/ */
function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array()) function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
{ {
@ -7983,49 +7987,47 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
,'status8' => 'statut8' ,'status8' => 'statut8'
,'status9' => 'statut9' ,'status9' => 'statut9'
); );
// TODO : add a hook // TODO : add a hook
if($displayMode==0){ if ($displayMode == 0) {
$return = !empty($html)?$html:$statusLabel; $return = !empty($html)?$html:$statusLabel;
} }
elseif($displayMode==1){ elseif ($displayMode == 1) {
$return = !empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel); $return = !empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel);
} }
// use status with images // use status with images
elseif(empty($conf->global->MAIN_STATUS_USES_CSS)){ elseif (empty($conf->global->MAIN_STATUS_USES_CSS)){
$return = ''; $return = '';
$htmlLabel = '<span class="hideonsmartphone">'.(!empty($html)?$html:$statusLabel).'</span>'; $htmlLabel = '<span class="hideonsmartphone">'.(!empty($html)?$html:$statusLabel).'</span>';
$htmlLabelShort = '<span class="hideonsmartphone">'.(!empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel)).'</span>'; $htmlLabelShort = '<span class="hideonsmartphone">'.(!empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel)).'</span>';
if(!empty($statusImg[$statusType])){ if(!empty($statusImg[$statusType])){
$htmlImg = img_picto($statusLabel, $statusImg[$statusType]); $htmlImg = img_picto($statusLabel, $statusImg[$statusType]);
}else{ }else{
$htmlImg = img_picto($statusLabel, $statusType); $htmlImg = img_picto($statusLabel, $statusType);
} }
if ($displayMode === 2) {
if($displayMode === 2){
$return = $htmlImg .' '. $htmlLabel; $return = $htmlImg .' '. $htmlLabel;
} }
elseif($displayMode === 3){ elseif ($displayMode === 3) {
$return = $htmlImg; $return = $htmlImg;
} }
elseif($displayMode === 4){ elseif ($displayMode === 4) {
$return = $htmlImg .' '. $htmlLabel; $return = $htmlImg .' '. $htmlLabel;
} }
elseif($displayMode === 5){ elseif ($displayMode === 5) {
$return = $htmlLabelShort .' '. $htmlImg; $return = $htmlLabelShort .' '. $htmlImg;
} }
else{ // $displayMode >= 6 else { // $displayMode >= 6
$return = $htmlLabel .' '. $htmlImg; $return = $htmlLabel .' '. $htmlImg;
} }
} }
// Use new badge // Use new badge
elseif(!empty($conf->global->MAIN_STATUS_USES_CSS) && !empty($displayMode)){ elseif (!empty($conf->global->MAIN_STATUS_USES_CSS) && !empty($displayMode)) {
$statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel; $statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel;
if($displayMode == 3){ if($displayMode == 3){
$return = dolGetBadge($statusLabel, '', $statusType, 'dot'); $return = dolGetBadge($statusLabel, '', $statusType, 'dot');
} }
@ -8036,30 +8038,30 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
$return = dolGetBadge($statusLabel, $html, $statusType); $return = dolGetBadge($statusLabel, $html, $statusType);
} }
} }
return $return; return $return;
} }
/** /**
* @param string $label label of button no html : use in alt attribute for accessibility $html is not empty * Function dolGetButtonAction
* @param string $html optional : content with html *
* @param string $actionType default, delete, danger * @param string $label label of button no html : use in alt attribute for accessibility $html is not empty
* @param string $url the url for link * @param string $html optional : content with html
* @param string $id attribute id of button * @param string $actionType default, delete, danger
* @param int $userRight user action right * @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more function arguments * @param string $id attribute id of button
* @return string html button * @param int $userRight user action right
* @param array $params various params for future : recommended rather than adding more function arguments
* @return string html button
*/ */
function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array()) function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
{ {
$class = 'butAction' ; $class = 'butAction' ;
if($actionType == 'danger' || $actionType == 'delete'){ if($actionType == 'danger' || $actionType == 'delete'){
$class = 'butActionDelete' ; $class = 'butActionDelete' ;
} }
$attr=array( $attr=array(
'class' => $class 'class' => $class
,'href' => empty($url)?'':$url ,'href' => empty($url)?'':$url
@ -8070,41 +8072,41 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
}else{ }else{
$attr['aria-label'] = $label; $attr['aria-label'] = $label;
} }
if(empty($userRight)){ if(empty($userRight)){
$attr['class'] = 'butActionRefused'; $attr['class'] = 'butActionRefused';
$attr['href'] = ''; $attr['href'] = '';
} }
if(empty($id)){ if(empty($id)){
$attr['id'] = $id; $attr['id'] = $id;
} }
// Override attr // Override attr
if(!empty($params['attr']) && is_array($params['attr'])){ if(!empty($params['attr']) && is_array($params['attr'])){
foreach($params['attr'] as $key => $value){ foreach($params['attr'] as $key => $value){
$attr[$key] = $value; $attr[$key] = $value;
} }
} }
if(isset($attr['href']) && empty($attr['href'])){ if(isset($attr['href']) && empty($attr['href'])){
unset($attr['href']); unset($attr['href']);
} }
// TODO : add a hook // TODO : add a hook
// escape all attribute // escape all attribute
$attr = array_map('dol_escape_htmltag', $attr); $attr = array_map('dol_escape_htmltag', $attr);
$TCompiledAttr = array(); $TCompiledAttr = array();
foreach($attr as $key => $value){ foreach($attr as $key => $value){
$TCompiledAttr[] = $key.'="'.$value.'"'; $TCompiledAttr[] = $key.'="'.$value.'"';
} }
$compiledAttributes = !empty($TCompiledAttr)?implode(' ', $TCompiledAttr):''; $compiledAttributes = !empty($TCompiledAttr)?implode(' ', $TCompiledAttr):'';
$tag = !empty($attr['href'])?'a':'span'; $tag = !empty($attr['href'])?'a':'span';
return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>'; return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
} }