diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 8ac54b3299e..ce994385f80 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -129,6 +129,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) { } //print '-name='.$name.'-color='.$color; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $res = dolibarr_set_const($db, 'AGENDA_EXT_NAME'.$i, $name, 'chaine', 0, '', $conf->entity); if (!($res > 0)) { $error++; @@ -205,10 +206,10 @@ print "
\n"; $selectedvalue = getDolGlobalInt('AGENDA_DISABLE_EXT'); -if ($selectedvalue==1) { - $selectedvalue=0; +if ($selectedvalue == 1) { + $selectedvalue = 0; } else { - $selectedvalue=1; + $selectedvalue = 1; } print ""; @@ -224,7 +225,7 @@ print ''; print ""; print ''; - // Nb + // Nb @phan-suppress-next-line PhanPluginSuspiciousParamPosition print '"; // Name print ''; @@ -286,6 +287,7 @@ while ($i <= $MAXAGENDA) { if (!empty($conf->use_javascript_ajax)) { print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT' . $key); } else { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition if (getDolGlobalString($default)) { print '' . img_picto($langs->trans("Disabled"), 'off') . ''; } else { diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 0abc9213fb7..0ca6a21bfe2 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -54,7 +54,8 @@ $rowid = GETPOST('rowid', 'alpha'); $entity = GETPOSTINT('entity'); $code = GETPOST('code', 'alpha'); -$acts = array(); $actl = array(); +$acts = array(); +$actl = array(); $acts[0] = "activate"; $acts[1] = "disable"; $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"'); @@ -472,7 +473,7 @@ $tabrowid[27] = "id"; $tabrowid[28] = ""; $tabrowid[29] = ""; $tabrowid[30] = ""; -$tabrowid[31]= ""; +$tabrowid[31] = ""; $tabrowid[32] = "id"; $tabrowid[33] = "rowid"; $tabrowid[34] = "rowid"; @@ -539,58 +540,58 @@ $tabhelp = array(); // Table to store complete information (will replace all other table). Key is table name. $tabcomplete = array( - 'c_forme_juridique'=>array( - 'picto'=>'company', - 'help'=>array('code'=>$langs->trans("EnterAnyCode")) + 'c_forme_juridique' => array( + 'picto' => 'company', + 'help' => array('code' => $langs->trans("EnterAnyCode")) ), - 'c_departements'=>array( - 'picto'=>'state', - 'help'=>array('code'=>$langs->trans("EnterAnyCode")) + 'c_departements' => array( + 'picto' => 'state', + 'help' => array('code' => $langs->trans("EnterAnyCode")) ), - 'c_regions'=>array( - 'picto'=>'region', - 'help'=>array('code'=>$langs->trans("EnterAnyCode")) + 'c_regions' => array( + 'picto' => 'region', + 'help' => array('code' => $langs->trans("EnterAnyCode")) ), - 'c_country'=>array('picto'=>'country', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_civility'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_actioncomm'=>array('picto'=>'action', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"))), - 'c_chargesociales'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_typent'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))), - 'c_currencies'=>array('picto'=>'multicurrency', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"))), - 'c_tva'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"))), - 'c_type_contact'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))), - 'c_payment_term'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'type_cdr'=>$langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")))), - 'c_paiement'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_ecotaxe'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_paper_format'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_prospectlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_type_fees'=>array('picto'=>'trip', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_shipment_mode'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"))), - 'c_effectif'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_input_method'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_input_reason'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))), - 'c_availability'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_revenuestamp'=>array('picto'=>'bill', 'help'=>array('revenuestamp_type'=>$langs->trans('FixedOrPercent'))), - 'c_type_resource'=>array('picto'=>'resource', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_type_container'=>array('picto'=>'website', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_stcomm'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))), - 'c_holiday_types'=>array('picto'=>'holiday', 'help'=>array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"))), - 'c_lead_status'=>array('picto'=>'project', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"))), - 'c_format_cards'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"))), - 'c_hrm_public_holiday'=>array('picto'=>'holiday', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).
Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"))), - 'c_hrm_department'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_hrm_function'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_exp_tax_cat'=>array('picto'=>'expensereport', 'help'=>array()), - 'c_exp_tax_range'=>array('picto'=>'expensereport', 'help'=>array('range_ik'=>$langs->trans('PrevRangeToThisRange'))), - 'c_units'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('Measuringtype_durationDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'))), - 'c_socialnetworks'=>array('picto'=>'share-alt', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'))), - 'c_prospectcontactlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_stcommcontact'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))), - 'c_transport_mode'=>array('picto'=>'incoterm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_product_nature'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_productbatch_qcstatus'=>array('picto'=>'lot', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_asset_disposal_type'=>array('picto'=>'asset', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), - 'c_invoice_subtype'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))), + 'c_country' => array('picto' => 'country', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_civility' => array('picto' => 'contact', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_actioncomm' => array('picto' => 'action', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'color' => $langs->trans("ColorFormat"), 'position' => $langs->trans("PositionIntoComboList"))), + 'c_chargesociales' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_typent' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))), + 'c_currencies' => array('picto' => 'multicurrency', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'unicode' => $langs->trans("UnicodeCurrency"))), + 'c_tva' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'taux' => $langs->trans("SellTaxRate"), 'recuperableonly' => $langs->trans("RecuperableOnly"), 'localtax1_type' => $langs->trans("LocalTaxDesc"), 'localtax2_type' => $langs->trans("LocalTaxDesc"))), + 'c_type_contact' => array('picto' => 'contact', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))), + 'c_payment_term' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'type_cdr' => $langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")))), + 'c_paiement' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_ecotaxe' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_paper_format' => array('picto' => 'generic', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_prospectlevel' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_type_fees' => array('picto' => 'trip', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_shipment_mode' => array('picto' => 'shipment', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'tracking' => $langs->trans("UrlTrackingDesc"))), + 'c_effectif' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_input_method' => array('picto' => 'order', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_input_reason' => array('picto' => 'order', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))), + 'c_availability' => array('picto' => 'shipment', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_revenuestamp' => array('picto' => 'bill', 'help' => array('revenuestamp_type' => $langs->trans('FixedOrPercent'))), + 'c_type_resource' => array('picto' => 'resource', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_type_container' => array('picto' => 'website', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_stcomm' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'picto' => $langs->trans("PictoHelp"))), + 'c_holiday_types' => array('picto' => 'holiday', 'help' => array('affect' => $langs->trans("FollowedByACounter"), 'delay' => $langs->trans("MinimumNoticePeriod"), 'newbymonth' => $langs->trans("NbAddedAutomatically"))), + 'c_lead_status' => array('picto' => 'project', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'percent' => $langs->trans("OpportunityPercent"), 'position' => $langs->trans("PositionIntoComboList"))), + 'c_format_cards' => array('picto' => 'generic', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'name' => $langs->trans("LabelName"), 'paper_size' => $langs->trans("LabelPaperSize"))), + 'c_hrm_public_holiday' => array('picto' => 'holiday', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'dayrule' => "Keep empty for a date defined with month and day (most common case).
Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country' => $langs->trans("CountryIfSpecificToOneCountry"), 'year' => $langs->trans("ZeroMeansEveryYear"))), + 'c_hrm_department' => array('picto' => 'hrm', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_hrm_function' => array('picto' => 'hrm', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_exp_tax_cat' => array('picto' => 'expensereport', 'help' => array()), + 'c_exp_tax_range' => array('picto' => 'expensereport', 'help' => array('range_ik' => $langs->trans('PrevRangeToThisRange'))), + 'c_units' => array('picto' => 'product', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('Measuringtype_durationDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'))), + 'c_socialnetworks' => array('picto' => 'share-alt', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'))), + 'c_prospectcontactlevel' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_stcommcontact' => array('picto' => 'company', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'picto' => $langs->trans("PictoHelp"))), + 'c_transport_mode' => array('picto' => 'incoterm', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_product_nature' => array('picto' => 'product', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_productbatch_qcstatus' => array('picto' => 'lot', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_asset_disposal_type' => array('picto' => 'asset', 'help' => array('code' => $langs->trans("EnterAnyCode"))), + 'c_invoice_subtype' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))), ); @@ -622,7 +623,7 @@ foreach ($tabcomplete as $key => $value) { $keytable = ''; if ($id > 0) { $arrayofkeys = array_keys($tabcomplete); - if (array_key_exists($id -1, $arrayofkeys)) { + if (array_key_exists($id - 1, $arrayofkeys)) { $keytable = $arrayofkeys[$id - 1]; } } @@ -701,23 +702,23 @@ $localtax_typeList = array( $object = new stdClass(); $parameters = array( - 'id' =>$id, - 'rowid' =>$rowid, - 'code' =>$code, - 'confirm' =>$confirm, - 'entity' =>$entity, - 'taborder' =>$taborder, - 'tabname' =>$tabname, - 'tablib' =>$tablib, - 'tabsql' =>$tabsql, - 'tabsqlsort' =>$tabsqlsort, - 'tabfield' =>$tabfield, - 'tabfieldvalue' =>$tabfieldvalue, - 'tabfieldinsert'=>$tabfieldinsert, - 'tabrowid' =>$tabrowid, - 'tabcond' =>$tabcond, - 'tabhelp' =>$tabhelp, - 'tabcomplete' =>$tabcomplete + 'id' => $id, + 'rowid' => $rowid, + 'code' => $code, + 'confirm' => $confirm, + 'entity' => $entity, + 'taborder' => $taborder, + 'tabname' => $tabname, + 'tablib' => $tablib, + 'tabsql' => $tabsql, + 'tabsqlsort' => $tabsqlsort, + 'tabfield' => $tabfield, + 'tabfieldvalue' => $tabfieldvalue, + 'tabfieldinsert' => $tabfieldinsert, + 'tabrowid' => $tabrowid, + 'tabcond' => $tabcond, + 'tabhelp' => $tabhelp, + 'tabcomplete' => $tabcomplete ); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -771,11 +772,11 @@ if (empty($reshook)) { && ( !in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent')) // Fields that are not mandatory && ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10 - ) - ) { - $ok = 0; - $fieldnamekey = $value; - // We take translate key of field + ) + ) { + $ok = 0; + $fieldnamekey = $value; + // We take translate key of field if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) { $fieldnamekey = 'Label'; } @@ -828,7 +829,7 @@ if (empty($reshook)) { $fieldnamekey = 'UseByDefault'; } - setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors'); + setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors'); } } // Other special checks @@ -955,7 +956,7 @@ if (empty($reshook)) { if ($id == 10 && GETPOSTINT('country') > 0) { $search_country_id = GETPOSTINT('country'); } - $_POST = array('id'=>$id); + $_POST = array('id' => $id); } else { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors'); @@ -1669,7 +1670,7 @@ if ($id > 0) { } $tmpaction = 'create'; - $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error = $hookmanager->error; $errors = $hookmanager->errors; @@ -2168,7 +2169,7 @@ if ($id > 0) { if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) { $tmpaction = 'edit'; - $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error = $hookmanager->error; $errors = $hookmanager->errors; @@ -2190,7 +2191,7 @@ if ($id > 0) { print ''; } else { $tmpaction = 'view'; - $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error = $hookmanager->error; @@ -2281,7 +2282,7 @@ if ($id > 0) { $key = $langs->trans("PaymentType".strtoupper($obj->code)); $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->$value); } elseif ($value == 'type' && $tabname[$id] == 'c_paiement') { - $payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth')); + $payment_type_list = array(0 => $langs->trans('PaymentTypeCustomer'), 1 => $langs->trans('PaymentTypeSupplier'), 2 => $langs->trans('PaymentTypeBoth')); $valuetoshow = $payment_type_list[$valuetoshow]; } elseif ($value == 'label' && $tabname[$id] == 'c_input_reason') { $key = $langs->trans("DemandReasonType".strtoupper($obj->code)); @@ -2378,7 +2379,7 @@ if ($id > 0) { } elseif ($value == 'icon') { $valuetoshow = $obj->{$value}." ".img_picto("", $obj->{$value}); } elseif ($value == 'type_duration') { - $TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes')); + $TDurationTypes = array('y' => $langs->trans('Years'), 'm' => $langs->trans('Month'), 'w' => $langs->trans('Weeks'), 'd' => $langs->trans('Days'), 'h' => $langs->trans('Hours'), 'i' => $langs->trans('Minutes')); if (!empty($obj->{$value}) && array_key_exists($obj->{$value}, $TDurationTypes)) { $valuetoshow = $TDurationTypes[$obj->{$value}]; } @@ -2634,6 +2635,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') } elseif (in_array($value, array('public', 'use_default'))) { // Fields 0/1 with a combo select Yes/No print ''; } elseif ($value == 'private') { @@ -2648,7 +2650,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') print ''; } elseif ($value == 'type' && $tabname == 'c_paiement') { print ''; } elseif ($value == 'recuperableonly' || $value == 'type_cdr' || $value == 'deductible' || $value == 'category_type') { @@ -2658,8 +2660,9 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') print ''; @@ -2709,7 +2712,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') } elseif ($value == 'type_vat') { // VAT type 0: all, 1: sell, 2: purchase print ''; } elseif ($value == 'localtax1_type' || $value == 'localtax2_type') { // Le type de taxe locale diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 6e651307207..af09ef6d283 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -44,13 +44,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; // Load translation files required by the page -$langsArray=array("errors", "admin", "mails", "languages"); +$langsArray = array("errors", "admin", "mails", "languages"); if (isModEnabled('member')) { - $langsArray[]='members'; + $langsArray[] = 'members'; } if (isModEnabled('eventorganization')) { - $langsArray[]='eventorganization'; + $langsArray[] = 'eventorganization'; } $langs->loadLangs($langsArray); @@ -163,16 +163,16 @@ if (!getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) { $tabhelp = array(); $tabhelp[25] = array( - 'label'=>$langs->trans('EnterAnyCode'), - 'type_template'=>$langs->trans("TemplateForElement"), - 'private'=>$langs->trans("TemplateIsVisibleByOwnerOnly"), - 'position'=>$langs->trans("PositionIntoComboList"), - 'topic'=>''.$helpsubstit.'', - 'email_from'=>$langs->trans('ForceEmailFrom'), - 'joinfiles'=>$langs->trans('AttachMainDocByDefault'), - 'defaultfortype'=>$langs->trans("DefaultForTypeDesc"), - 'content'=>''.$helpsubstit.'', - 'content_lines'=>''.$helpsubstitforlines.'' + 'label' => $langs->trans('EnterAnyCode'), + 'type_template' => $langs->trans("TemplateForElement"), + 'private' => $langs->trans("TemplateIsVisibleByOwnerOnly"), + 'position' => $langs->trans("PositionIntoComboList"), + 'topic' => ''.$helpsubstit.'', + 'email_from' => $langs->trans('ForceEmailFrom'), + 'joinfiles' => $langs->trans('AttachMainDocByDefault'), + 'defaultfortype' => $langs->trans("DefaultForTypeDesc"), + 'content' => ''.$helpsubstit.'', + 'content_lines' => ''.$helpsubstitforlines.'' ); @@ -241,7 +241,7 @@ if (isModEnabled('partnership') && $user->hasRight('partnership', 'read')) { $elementList['partnership_send'] = img_picto('', 'partnership', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToPartnership')); } -$parameters = array('elementList'=>$elementList); +$parameters = array('elementList' => $elementList); $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks if ($reshook == 0) { foreach ($hookmanager->resArray as $item => $value) { @@ -418,7 +418,7 @@ if (empty($reshook)) { $result = $db->query($sql); if ($result) { // Add is ok setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs'); - $_POST = array('id'=>$id); // Clean $_POST array, we keep only id + $_POST = array('id' => $id); // Clean $_POST array, we keep only id } else { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors'); @@ -1040,7 +1040,7 @@ foreach ($fieldlist as $field => $value) { } $sortfieldtouse = ($sortable ? $fieldlist[$field] : ''); if ($sortfieldtouse == 'type_template') { - $sortfieldtouse.= 'type_template,lang,position,label'; + $sortfieldtouse .= 'type_template,lang,position,label'; } print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], $sortfieldtouse, ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $css.' '); } @@ -1065,7 +1065,7 @@ if ($num) { print ''; $tmpaction = 'edit'; - $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); $reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error = $hookmanager->error; $errors = $hookmanager->errors; @@ -1216,7 +1216,7 @@ if ($num) { } $tmpaction = 'view'; - $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); + $parameters = array('fieldlist' => $fieldlist, 'tabname' => $tabname[$id]); $reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks $error = $hookmanager->error; @@ -1461,8 +1461,10 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '') print ''; if ($value == 'private' && $context != 'preview') { if (empty($user->admin)) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->selectyesno($value, '1', 1); } else { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1); } } else { diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index cdce65af5b5..1f95458a8b2 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -89,8 +89,8 @@ if (!count($listofvars) && !count($listofstatus)) { $arraytest = array(); if (preg_match('/mysql/i', $db->type)) { $arraytest = array( - 'character_set_database'=>array('var'=>'dolibarr_main_db_character_set', 'valifempty'=>'utf8'), - 'collation_database'=>array('var'=>'dolibarr_main_db_collation', 'valifempty'=>'utf8_unicode_ci') + 'character_set_database' => array('var' => 'dolibarr_main_db_character_set', 'valifempty' => 'utf8'), + 'collation_database' => array('var' => 'dolibarr_main_db_collation', 'valifempty' => 'utf8_unicode_ci') ); } @@ -123,9 +123,11 @@ if (!count($listofvars) && !count($listofstatus)) { print $paramval; } if ($show == 1) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->textwithpicto($paramval, $text); } if ($show == 2) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->textwithpicto($paramval, $text, 1, 'warning'); } print ''; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 8316969135a..da70b1fbbec 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -58,11 +58,11 @@ $object = new stdClass(); // Definition of fields for lists $arrayfields = array( - 'name'=>array('label'=>$langs->trans("Modules"), 'checked'=>1, 'position'=>10), - 'version'=>array('label'=>$langs->trans("Version"), 'checked'=>1, 'position'=>20), - 'id'=>array('label'=>$langs->trans("IdModule"), 'checked'=>1, 'position'=>30), - 'module_position'=>array('label'=>$langs->trans("Position"), 'checked'=>1, 'position'=>35), - 'permission'=>array('label'=>$langs->trans("IdPermissions"), 'checked'=>1, 'position'=>40) + 'name' => array('label' => $langs->trans("Modules"), 'checked' => 1, 'position' => 10), + 'version' => array('label' => $langs->trans("Version"), 'checked' => 1, 'position' => 20), + 'id' => array('label' => $langs->trans("IdModule"), 'checked' => 1, 'position' => 30), + 'module_position' => array('label' => $langs->trans("Position"), 'checked' => 1, 'position' => 35), + 'permission' => array('label' => $langs->trans("IdPermissions"), 'checked' => 1, 'position' => 40) ); $arrayfields = dol_sort_array($arrayfields, 'position'); @@ -143,6 +143,7 @@ foreach ($modules as $key => $module) { if (!empty($module->picto)) { if (preg_match('/^\//', $module->picto)) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $newModule->picto = img_picto($alt, $module->picto, 'width="14px"', 1); } else { $newModule->picto = img_object($alt, $module->picto, 'width="14px"'); @@ -157,7 +158,7 @@ foreach ($modules as $key => $module) { if (empty($rights[0])) { continue; } - $arrayofpermissions[$rights[0]] = array('label'=> 'user->hasRight(\''.$module->rights_class.'\', \''.$rights[4].'\''.(empty($rights[5]) ? '' : ', \''.$rights[5].'\'').')'); + $arrayofpermissions[$rights[0]] = array('label' => 'user->hasRight(\''.$module->rights_class.'\', \''.$rights[4].'\''.(empty($rights[5]) ? '' : ', \''.$rights[5].'\'').')'); $permission[] = $rights[0]; array_push($rights_ids, $rights[0]); @@ -296,7 +297,7 @@ if ($arrayfields['module_position']['checked']) { } // Fields from hook -$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); +$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder); $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -408,13 +409,13 @@ llxFooter(); $db->close(); - /** - * Compare two modules by their ID for a ascending order - * - * @param stdClass $a First module - * @param stdClass $b Second module - * @return int Compare result (-1, 0, 1) - */ +/** + * Compare two modules by their ID for a ascending order + * + * @param stdClass $a First module + * @param stdClass $b Second module + * @return int Compare result (-1, 0, 1) + */ function compareIdAsc(stdClass $a, stdClass $b) { if ((int) $a->id == (int) $b->id) { @@ -424,13 +425,13 @@ function compareIdAsc(stdClass $a, stdClass $b) return ((int) $a->id < (int) $b->id) ? -1 : 1; } - /** - * Compare two modules by their ID for a descending order - * - * @param stdClass $a First module - * @param stdClass $b Second module - * @return int Compare result (-1, 0, 1) - */ +/** + * Compare two modules by their ID for a descending order + * + * @param stdClass $a First module + * @param stdClass $b Second module + * @return int Compare result (-1, 0, 1) + */ function compareIdDesc(stdClass $a, stdClass $b) { if ((int) $a->id == (int) $b->id) { @@ -440,13 +441,13 @@ function compareIdDesc(stdClass $a, stdClass $b) return ((int) $b->id < (int) $a->id) ? -1 : 1; } - /** - * Compare two modules by their ID for a ascending order - * - * @param stdClass $a First module - * @param stdClass $b Second module - * @return int Compare result (-1, 0, 1) - */ +/** + * Compare two modules by their ID for a ascending order + * + * @param stdClass $a First module + * @param stdClass $b Second module + * @return int Compare result (-1, 0, 1) + */ function comparePermissionIdsAsc(stdClass $a, stdClass $b) { if (empty($a->permission) && empty($b->permission)) { @@ -467,13 +468,13 @@ function comparePermissionIdsAsc(stdClass $a, stdClass $b) return $a->permission[0] < $b->permission[0] ? -1 : 1; } - /** - * Compare two modules by their permissions for a descending order - * - * @param stdClass $a First module - * @param stdClass $b Second module - * @return int Compare result (-1, 0, 1) - */ +/** + * Compare two modules by their permissions for a descending order + * + * @param stdClass $a First module + * @param stdClass $b Second module + * @return int Compare result (-1, 0, 1) + */ function comparePermissionIdsDesc(stdClass $a, stdClass $b) { if (empty($a->permission) && empty($b->permission)) { diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 2c71f7592c4..0dbeab0db6d 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -617,6 +617,7 @@ if ($mode == 'searchkey') { print ''.img_delete().''; print '  '; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key); print $form->textwithpicto('', $htmltext, 1, 'warning'); } diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index 2fc450af8d0..75d27c1e125 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -58,7 +58,8 @@ print "
\n"; $interfaces = new Interfaces($db); $triggers = $interfaces->getTriggersList(); -$param = ''; $align = ''; +$param = ''; +$align = ''; print '
'; print '
".$langs->trans("ExtSitesEnableThisTool")."'; if ($conf->use_javascript_ajax) { - print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1); + print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled' => array(0 => '.hideifnotset')), null, 1); } else { if (!getDolGlobalString('AGENDA_DISABLE_EXT')) { print ''.img_picto($langs->trans("Enabled"), 'on').''; @@ -269,7 +270,7 @@ while ($i <= $MAXAGENDA) { $default = 'AGENDA_EXT_ACTIVEBYDEFAULT' . $key; print '
' . $langs->trans("AgendaExtNb", $key) . "'; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1); print ''; - $select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth')); + $select_list = array(0 => $langs->trans('PaymentTypeCustomer'), 1 => $langs->trans('PaymentTypeSupplier'), 2 => $langs->trans('PaymentTypeBoth')); print $form->selectarray($value, $select_list, (!empty($obj->{$value}) ? $obj->{$value} : '2')); print ''; } if ($value == 'type_cdr') { - print $form->selectarray($value, array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value} : '')); + print $form->selectarray($value, array(0 => $langs->trans('None'), 1 => $langs->trans('AtEndOfMonth'), 2 => $langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value} : '')); } else { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1); } print ''; - print $form->selectarray($value, $type_vatList, (!empty($obj->{$value}) ? $obj->{$value}:'')); + print $form->selectarray($value, $type_vatList, (!empty($obj->{$value}) ? $obj->{$value} : '')); print '
'; @@ -78,6 +79,7 @@ foreach ($triggers as $trigger) { $text = $trigger['info']; $text .= "
\n".$langs->trans("File").":
\n".$trigger['relpath']; //$text.="\n".$langs->trans("ExternalModule",$trigger['isocreorexternal']); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->textwithpicto('', $text); print ''; print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 45c6579b4a7..7ce401bc3c9 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -276,6 +276,7 @@ if (!getDolGlobalString('AGENDA_DISABLE_EXT')) { 'name' => dol_string_nohtmltag(getDolGlobalString($name)), 'offsettz' => (int) getDolGlobalInt($offsettz, 0), 'color' => dol_string_nohtmltag(getDolGlobalString($color)), + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition 'default' => dol_string_nohtmltag(getDolGlobalString($default)), 'buggedfile' => dol_string_nohtmltag(getDolGlobalString('buggedfile', '')) ); @@ -301,6 +302,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) { 'src' => getDolUserString($source), 'name' => dol_string_nohtmltag(getDolUserString($name)), 'offsettz' => (int) (empty($user->conf->$offsettz) ? 0 : $user->conf->$offsettz), + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition 'color' => dol_string_nohtmltag(getDolUserString($color)), 'default' => dol_string_nohtmltag(getDolUserString($default)), 'buggedfile' => dol_string_nohtmltag(isset($user->conf->buggedfile) ? $user->conf->buggedfile : '') @@ -1562,6 +1564,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month $style .= ' cal_other_month_right'; } echo ' \n"; } elseif ($tmpday <= $max_day_in_month) { @@ -1583,6 +1586,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month } //var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style); echo ' \n"; } else { @@ -1592,6 +1596,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month $style .= ' cal_other_month_right'; } echo ' \n"; } @@ -1656,6 +1661,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month } echo ' \n"; } @@ -1746,12 +1752,14 @@ if (empty($mode) || $mode == 'show_month') { // View by month echo ''; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1, $bookcalcalendars); print ''; } else { print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars); print '
'; diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php index bb296e516ee..e0098643747 100644 --- a/htdocs/comm/mailing/advtargetemailing.php +++ b/htdocs/comm/mailing/advtargetemailing.php @@ -448,6 +448,7 @@ if ($object->fetch($id) >= 0) { $nbemail = ($object->nbemail ? $object->nbemail : '0'); if (getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) { $text = $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB')); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->textwithpicto($nbemail, $text, 1, 'warning'); } else { print $nbemail; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 6b8745332b8..10b20b58b85 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2093,7 +2093,7 @@ if (empty($reshook)) { // Set if we used free entry or predefined product $predef = ''; - $product_desc =(GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : ''); + $product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : ''); $price_ht = ''; $price_ht_devise = ''; @@ -2292,8 +2292,8 @@ if (empty($reshook)) { } //If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time - if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) { - $product_desc=''; + if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) { + $product_desc = ''; } if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) { @@ -2347,10 +2347,16 @@ if (empty($reshook)) { $type = $prod->type; $fk_unit = $prod->fk_unit; } else { - if (!empty($price_ht)) $pu_ht = price2num($price_ht, 'MU'); - else $pu_ht = ''; - if (!empty($price_ttc)) $pu_ttc = price2num($price_ttc, 'MU'); - else $pu_ttc = ''; + if (!empty($price_ht)) { + $pu_ht = price2num($price_ht, 'MU'); + } else { + $pu_ht = ''; + } + if (!empty($price_ttc)) { + $pu_ttc = price2num($price_ttc, 'MU'); + } else { + $pu_ttc = ''; + } $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0); $tva_tx = str_replace('*', '', $tva_tx); if (empty($tva_tx)) { @@ -2822,7 +2828,7 @@ if (empty($reshook)) { && !$objectidnext && $object->is_last_in_cycle() && $usercanunvalidate - ) { + ) { $outingError = 0; $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle if ($newCycle > 1) { @@ -2836,7 +2842,7 @@ if (empty($reshook)) { if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE && $next_invoice->situation_counter == $object->situation_counter && $next_invoice->fk_facture_source == $object->id - ) { + ) { $linkedCreditNotesList[] = $next_invoice->id; } } @@ -3942,7 +3948,7 @@ if ($action == 'create') { } // Other attributes - $parameters = array('objectsrc' => !empty($objectsrc) ? $objectsrc : 0, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid'=>$socid); + $parameters = array('objectsrc' => !empty($objectsrc) ? $objectsrc : 0, 'colspan' => ' colspan="2"', 'cols' => '2', 'socid' => $socid); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (empty($reshook)) { @@ -4276,7 +4282,7 @@ if ($action == 'create') { && !$objectidnext && $object->is_last_in_cycle() && $usercanunvalidate - ) { + ) { $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1); } } @@ -5444,6 +5450,7 @@ if ($action == 'create') { $text .= '

'.$langs->trans("Reason").':'.$object->close_note; } print ''; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1); print ''; print ''; @@ -5479,7 +5486,7 @@ if ($action == 'create') { print ''; print ''; + print price(price2num($object->multicurrency_tx * $resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).''; } // Retained warranty : usually use on construction industry @@ -5827,7 +5834,7 @@ if ($action == 'create') { // For credit note if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->status == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercancreate && (getDolGlobalString('INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $sumofpayment == 0) && $object->total_ht < 0 - ) { + ) { print ''.$langs->trans('ConvertToReduc').''; } // For down payment invoice (deposit) @@ -5890,7 +5897,7 @@ if ($action == 'create') { && !$objectidnext && $object->is_last_in_cycle() && getDolGlobalInt('INVOICE_USE_SITUATION_CREDIT_NOTE') - ) { + ) { if ($usercanunvalidate) { print ''.$langs->trans("CreateCreditNote").''; } else { @@ -5920,7 +5927,7 @@ if ($action == 'create') { && $object->situation_counter > 1 && $object->is_last_in_cycle() && $usercanunvalidate - ) { + ) { if (($object->total_ttc - $totalcreditnotes) == 0) { print ''.$langs->trans("RemoveSituationFromCycle").''; } else { diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index e79cc953f3a..7912337feeb 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -613,6 +613,7 @@ if ($object->id > 0) { print ''; print ''; print ''; print ''; $htmltabloflibs .= ''; $htmltabloflibs .= ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index d7ede2988cc..2cde771c03a 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -83,6 +83,7 @@ foreach ($liste as $key => $val) { print ''; $text = $model->getDriverDescForKey($key); $label = $liste[$key]; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 8365a92f7f8..6c097c907d8 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -143,7 +143,7 @@ $error = 0; * Actions */ -$parameters = array('socid'=>$socid); +$parameters = array('socid' => $socid); $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -2403,7 +2403,7 @@ if ($action == 'create') { // Deposit - Down payment if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) { print '
'; - $tmp=' '; + $tmp = ' '; print '"; - if ($nbofsuggested>0) { + if ($nbofsuggested > 0) { echo "
".$langs->trans("SearchIntoBatch").": $nbofsuggested

'; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam); echo " '; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam, 0, 60, 0, $bookcalcalendars); echo "'; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam); echo "'; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars); echo " '.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).' 
'; //print (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code).' '; - print price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).' 
 
'.$langs->trans($title).''; $bac = new CompanyBankAccount($db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $bac->fetch(0, $object->thirdparty->id); print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php index f67add4b840..83f044af16f 100644 --- a/htdocs/compta/tva/payments.php +++ b/htdocs/compta/tva/payments.php @@ -146,6 +146,7 @@ if ($resql) { setEventMessages($db->lasterror, null, 'errors'); } +// @phan-suppress-next-line PhanPluginSuspiciousParamPosition print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $num, 'title_accountancy', 0, '', '', $limit); if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) { diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php index fa98bed7b41..ba63bba320e 100644 --- a/htdocs/core/class/commonstickergenerator.class.php +++ b/htdocs/core/class/commonstickergenerator.class.php @@ -190,7 +190,9 @@ abstract class CommonStickerGenerator extends CommonDocGenerator for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) { for ($j = $i; $j <= ($i + $Pointilles); $j++) { if ($j <= ($x2 - 1)) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point } } @@ -198,7 +200,9 @@ abstract class CommonStickerGenerator extends CommonDocGenerator for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) { for ($j = $i; $j <= ($i + $Pointilles); $j++) { if ($j <= ($y2 - 1)) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point } } @@ -257,8 +261,8 @@ abstract class CommonStickerGenerator extends CommonDocGenerator { if ($src != $dest) { $tab = array( - 'in'=>39.37008, - 'mm'=>1000 + 'in' => 39.37008, + 'mm' => 1000 ); return $value * $tab[$dest] / $tab[$src]; } @@ -278,7 +282,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator { // phpcs:enable // Array for link between height of characters and space between lines - $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10); + $_Table_Hauteur_Chars = array(6 => 2, 7 => 2.5, 8 => 3, 9 => 3.5, 10 => 4, 11 => 6, 12 => 7, 13 => 8, 14 => 9, 15 => 10); if (in_array($pt, array_keys($_Table_Hauteur_Chars))) { return $_Table_Hauteur_Chars[$pt]; } else { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 21e33db578e..630602e2c75 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -796,12 +796,15 @@ class Form } elseif ($type == 'helpclickable') { $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt); } elseif ($type == 'superadmin') { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $img = img_picto($alt, 'redstar'); } elseif ($type == 'admin') { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $img = img_picto($alt, 'star'); } elseif ($type == 'warning') { $img = img_warning($alt); } elseif ($type != 'none') { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $img = img_picto($alt, $type); // $type can be an image path } @@ -2222,11 +2225,11 @@ class Form $outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength) . $moreinfo; $outarray2[$userstatic->id] = array( - 'id'=>$userstatic->id, - 'label'=>$labeltoshow, - 'labelhtml'=>$labeltoshowhtml, - 'color'=>'', - 'picto'=>'' + 'id' => $userstatic->id, + 'label' => $labeltoshow, + 'labelhtml' => $labeltoshowhtml, + 'color' => '', + 'picto' => '' ); $i++; @@ -3370,7 +3373,7 @@ class Form } } - $parameters = array('objp'=>$objp); + $parameters = array('objp' => $objp); $reshook = $hookmanager->executeHooks('constructProductListOption', $parameters); // Note that $action and $object may have been modified by hook if (empty($reshook)) { $opt .= $hookmanager->resPrint; @@ -5375,11 +5378,11 @@ class Form } $more .= $this->selectDate($input['value'], $input['name'], $h, $m, 0, '', 1, $addnowlink); $more .= ''."\n"; - $formquestion[] = array('name'=>$input['name'].'day'); - $formquestion[] = array('name'=>$input['name'].'month'); - $formquestion[] = array('name'=>$input['name'].'year'); - $formquestion[] = array('name'=>$input['name'].'hour'); - $formquestion[] = array('name'=>$input['name'].'min'); + $formquestion[] = array('name' => $input['name'].'day'); + $formquestion[] = array('name' => $input['name'].'month'); + $formquestion[] = array('name' => $input['name'].'year'); + $formquestion[] = array('name' => $input['name'].'hour'); + $formquestion[] = array('name' => $input['name'].'min'); } elseif ($input['type'] == 'other') { // can be 1 column or 2 depending if label is set or not $more .= '
'; if (!empty($input['label'])) { @@ -7202,7 +7205,7 @@ class Form // Add a link to set data if ($conf->use_javascript_ajax && !empty($adddateof)) { if (!is_array($adddateof)) { - $arrayofdateof = array(array('adddateof'=>$adddateof, 'labeladddateof'=>$labeladddateof)); + $arrayofdateof = array(array('adddateof' => $adddateof, 'labeladddateof' => $labeladddateof)); } else { $arrayofdateof = $adddateof; } @@ -8171,7 +8174,9 @@ class Form $oldValueForShowOnCombobox = 0; foreach ($objecttmp->fields as $fieldK => $fielV) { - if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) continue; + if (!$fielV['showoncombobox'] || empty($objecttmp->$fieldK)) { + continue; + } if (!$oldValueForShowOnCombobox) { $selected_input_value = ''; @@ -10723,8 +10728,8 @@ class Form include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $searchtags = removeGlobalParenthesis($searchtags); - $ret .= ''; - $ret .= 'x '; + $ret .= ''; + $ret .= 'x '; $ret .= dol_escape_htmltag($searchtags); $ret .= ''; } diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index 3f1b42aa5c2..c8409cbe9ae 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -157,7 +157,7 @@ class Utils } } if (!$alreadyincluded) { - $filesarray[] = array('fullname'=>$filelog, 'type'=>'file'); + $filesarray[] = array('fullname' => $filelog, 'type' => 'file'); } } } @@ -783,7 +783,7 @@ class Utils dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG); - return array('result'=>$result, 'output'=>$output, 'error'=>$error); + return array('result' => $result, 'output' => $output, 'error' => $error); } /** @@ -909,25 +909,26 @@ class Utils //var_dump($phpfileval['fullname']); $arrayreplacement = array( - 'mymodule'=>strtolower($module), - 'MyModule'=>$module, - 'MYMODULE'=>strtoupper($module), - 'My module'=>$module, - 'my module'=>$module, - 'Mon module'=>$module, - 'mon module'=>$module, - 'htdocs/modulebuilder/template'=>strtolower($module), - '__MYCOMPANY_NAME__'=>$mysoc->name, - '__KEYWORDS__'=>$module, - '__USER_FULLNAME__'=>$user->getFullName($langs), - '__USER_EMAIL__'=>$user->email, - '__YYYY-MM-DD__'=>dol_print_date($now, 'dayrfc'), - '---Put here your own copyright and developer email---'=>dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''), - '__DATA_SPECIFICATION__'=>'Not yet available', - '__README__'=>dolMd2Asciidoc($contentreadme), - '__CHANGELOG__'=>dolMd2Asciidoc($contentchangelog), + 'mymodule' => strtolower($module), + 'MyModule' => $module, + 'MYMODULE' => strtoupper($module), + 'My module' => $module, + 'my module' => $module, + 'Mon module' => $module, + 'mon module' => $module, + 'htdocs/modulebuilder/template' => strtolower($module), + '__MYCOMPANY_NAME__' => $mysoc->name, + '__KEYWORDS__' => $module, + '__USER_FULLNAME__' => $user->getFullName($langs), + '__USER_EMAIL__' => $user->email, + '__YYYY-MM-DD__' => dol_print_date($now, 'dayrfc'), + '---Put here your own copyright and developer email---' => dol_print_date($now, 'dayrfc').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''), + '__DATA_SPECIFICATION__' => 'Not yet available', + '__README__' => dolMd2Asciidoc($contentreadme), + '__CHANGELOG__' => dolMd2Asciidoc($contentchangelog), ); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition dolReplaceInFile($destfile, $arrayreplacement); } diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php index e5ab3e0c3cd..28434f7d405 100644 --- a/htdocs/core/get_info.php +++ b/htdocs/core/get_info.php @@ -142,6 +142,7 @@ if (isModEnabled('modulebuilder')) { //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"'); $text .= ''; $text .= ''; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $toprightmenu .= $form->textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2); } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index d18aa3c8fd2..01afca27f93 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -390,7 +390,7 @@ function societe_prepare_head(Societe $object) $head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id; $head[$h][1] = $langs->trans("Events"); - if (isModEnabled('agenda')&& ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { + if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) { $nbEvent = 0; // Enable caching of thirdparty count actioncomm require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php'; @@ -537,7 +537,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs = // Check parameters if (empty($searchkey) && empty($searchlabel)) { if ($withcode === 'all') { - return array('id'=>'', 'code'=>'', 'label'=>''); + return array('id' => '', 'code' => '', 'label' => ''); } else { return ''; } @@ -578,7 +578,7 @@ function getCountry($searchkey, $withcode = '', $dbtouse = null, $outputlangs = } elseif ($withcode == 3) { $result = $obj->rowid; } elseif ($withcode === 'all') { - $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label); + $result = array('id' => $obj->rowid, 'code' => $obj->code, 'label' => $label); } else { $result = $label; } @@ -651,9 +651,9 @@ function getState($id, $withcode = '', $dbtouse = null, $withregion = 0, $output } } elseif ($withcode === 'all') { if ($withregion == 1) { - return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name); + return array('id' => $obj->id, 'code' => $obj->code, 'label' => $label, 'region_code' => $obj->region_code, 'region' => $obj->region_name); } else { - return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label); + return array('id' => $obj->id, 'code' => $obj->code, 'label' => $label); } } else { if ($withregion == 1) { @@ -962,7 +962,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel dol_print_error($db); } - $parameters = array('sql'=>$sql, 'function'=>'show_projects'); + $parameters = array('sql' => $sql, 'function' => 'show_projects'); $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; @@ -1062,35 +1062,35 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl $extrafields->fetch_name_optionals_label($contactstatic->table_element); $contactstatic->fields = array( - 'rowid' =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1), - 'name' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1), - 'poste' =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'index'=>1, 'position'=>20), - 'address' =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30), - 'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible'=>3, 'position'=>35), - 'role' =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40), - 'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 0, 'position'=>45), - 'statut' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))), + 'rowid' => array('type' => 'integer', 'label' => "TechnicalID", 'enabled' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position' => 1), + 'name' => array('type' => 'varchar(128)', 'label' => 'Name', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'index' => 1, 'position' => 10, 'searchall' => 1), + 'poste' => array('type' => 'varchar(128)', 'label' => 'PostOrFunction', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 2, 'index' => 1, 'position' => 20), + 'address' => array('type' => 'varchar(128)', 'label' => 'Address', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 3, 'index' => 1, 'position' => 30), + 'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => (!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible' => 3, 'position' => 35), + 'role' => array('type' => 'checkbox', 'label' => 'Role', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 4, 'index' => 1, 'position' => 40), + 'birthday' => array('type' => 'date', 'label' => 'Birthday', 'enabled' => 1, 'visible' => -1, 'notnull' => 0, 'position' => 45), + 'statut' => array('type' => 'integer', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'default' => 0, 'index' => 1, 'position' => 50, 'arrayofkeyval' => array(0 => $contactstatic->LibStatut(0, 1), 1 => $contactstatic->LibStatut(1, 1))), ); // Definition of fields for list $arrayfields = array( - 't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1), - 't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10), - 't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20), - 't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30), - 't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position'=>35), - 'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40), - 't.birthday'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>45), - 't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'), + 't.rowid' => array('label' => "TechnicalID", 'checked' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled' => (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position' => 1), + 't.name' => array('label' => "Name", 'checked' => 1, 'position' => 10), + 't.poste' => array('label' => "PostOrFunction", 'checked' => 1, 'position' => 20), + 't.address' => array('label' => (empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked' => 1, 'position' => 30), + 't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position' => 35), + 'sc.role' => array('label' => "ContactByDefaultFor", 'checked' => 1, 'position' => 40), + 't.birthday' => array('label' => "Birthday", 'checked' => 0, 'position' => 45), + 't.statut' => array('label' => "Status", 'checked' => 1, 'position' => 50, 'class' => 'center'), ); // Extra fields if (!empty($extrafields->attributes[$contactstatic->table_element]['label']) && is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) { foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) { if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) { $arrayfields["ef.".$key] = array( - 'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key], - 'checked'=>(((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1), - 'position'=>1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key], + 'label' => $extrafields->attributes[$contactstatic->table_element]['label'][$key], + 'checked' => (((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1, 1, '1') < 0) ? 0 : 1), + 'position' => 1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key], 'enabled' => (abs((int) dol_eval($extrafields->attributes[$contactstatic->table_element]['list'][$key], 1)) != 3 && (int) dol_eval($extrafields->attributes[$contactstatic->table_element]['perms'][$key], 1, 1, '1')) ); } @@ -1274,7 +1274,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) { print '
'; if (in_array($key, array('statut'))) { - print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage'); + print $form->selectarray('search_status', array('-1' => '', '0' => $contactstatic->LibStatut(0, 1), '1' => $contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage'); } elseif (in_array($key, array('role'))) { print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300'); } elseif (in_array($key, array('birthday'))) { @@ -1298,7 +1298,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; // Fields from hook - $parameters = array('arrayfields'=>$arrayfields); + $parameters = array('arrayfields' => $arrayfields); $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -1345,7 +1345,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl $extrafieldsobjectkey = $contactstatic->table_element; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; // Hook fields - $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); + $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder); $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; // Action column @@ -1406,7 +1406,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl print ''; // Add to agenda - if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) { + if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) { print ''; print img_object($langs->trans("Event"), "action"); print '   '; @@ -1484,7 +1484,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl if ($showuserlogin) { print ''; - $tmpuser= new User($db); + $tmpuser = new User($db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $resfetch = $tmpuser->fetch(0, '', '', 0, -1, '', $contactstatic->id); if ($resfetch > 0) { print $tmpuser->getNomUrl(1, '', 0, 0, 24, 1); @@ -1501,7 +1502,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl print ''; // Add to agenda - if (isModEnabled('agenda')&& $user->hasRight('agenda', 'myactions', 'create')) { + if (isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) { print ''; print img_object($langs->trans("Event"), "action"); print '   '; @@ -1686,7 +1687,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon); $reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters); // Note that $action and $object may have been modified by hook if (!empty($hookmanager->resPrint)) { - $sql.= $hookmanager->resPrint; + $sql .= $hookmanager->resPrint; } $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; @@ -1708,7 +1709,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon); $reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters); // Note that $action and $object may have been modified by hook if (!empty($hookmanager->resPrint)) { - $sql.= $hookmanager->resPrint; + $sql .= $hookmanager->resPrint; } if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid"; @@ -1829,7 +1830,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr $parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module); $reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters); // Note that $action and $object may have been modified by hook if (!empty($hookmanager->resPrint)) { - $sql.= $hookmanager->resPrint; + $sql .= $hookmanager->resPrint; } if (is_array($actioncode)) { @@ -1893,48 +1894,48 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr } $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>$tododone, - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'percent'=>$obj->percent, + 'type' => $obj->type, + 'tododone' => $tododone, + 'id' => $obj->id, + 'datestart' => $db->jdate($obj->dp), + 'dateend' => $db->jdate($obj->dp2), + 'note' => $obj->label, + 'percent' => $obj->percent, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo, + 'userid' => $obj->user_id, + 'login' => $obj->user_login, + 'userfirstname' => $obj->user_firstname, + 'userlastname' => $obj->user_lastname, + 'userphoto' => $obj->user_photo, - 'contact_id'=>$obj->fk_contact, + 'contact_id' => $obj->fk_contact, 'socpeopleassigned' => $contactaction->socpeopleassigned, 'lastname' => empty($obj->lastname) ? '' : $obj->lastname, 'firstname' => empty($obj->firstname) ? '' : $obj->firstname, - 'fk_element'=>$obj->fk_element, - 'elementtype'=>$obj->elementtype, + 'fk_element' => $obj->fk_element, + 'elementtype' => $obj->elementtype, // Type of event - 'acode'=>$obj->acode, - 'alabel'=>$obj->alabel, - 'libelle'=>$obj->alabel, // deprecated - 'apicto'=>$obj->apicto + 'acode' => $obj->acode, + 'alabel' => $obj->alabel, + 'libelle' => $obj->alabel, // deprecated + 'apicto' => $obj->apicto ); } else { $histo[$numaction] = array( - 'type'=>$obj->type, - 'tododone'=>'done', - 'id'=>$obj->id, - 'datestart'=>$db->jdate($obj->dp), - 'dateend'=>$db->jdate($obj->dp2), - 'note'=>$obj->label, - 'percent'=>$obj->percent, - 'acode'=>$obj->acode, + 'type' => $obj->type, + 'tododone' => 'done', + 'id' => $obj->id, + 'datestart' => $db->jdate($obj->dp), + 'dateend' => $db->jdate($obj->dp2), + 'note' => $obj->label, + 'percent' => $obj->percent, + 'acode' => $obj->acode, - 'userid'=>$obj->user_id, - 'login'=>$obj->user_login, - 'userfirstname'=>$obj->user_firstname, - 'userlastname'=>$obj->user_lastname, - 'userphoto'=>$obj->user_photo + 'userid' => $obj->user_id, + 'login' => $obj->user_login, + 'userfirstname' => $obj->user_firstname, + 'userlastname' => $obj->user_lastname, + 'userphoto' => $obj->user_photo ); } @@ -1946,7 +1947,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr } } - if (isModEnabled('agenda')|| (isModEnabled('mailing') && !empty($objcon->email))) { + if (isModEnabled('agenda') || (isModEnabled('mailing') && !empty($objcon->email))) { $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php index 3218ee9212d..19d9c9319a2 100644 --- a/htdocs/core/lib/modulebuilder.lib.php +++ b/htdocs/core/lib/modulebuilder.lib.php @@ -450,7 +450,7 @@ function dolGetListOfObjectClasses($destdir) $objects[$fileobj['fullname']] = $objectnameloop; } } - if (count($objects)>0) { + if (count($objects) > 0) { return $objects; } @@ -559,12 +559,12 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $ } } } elseif ($action == -2 && !empty($objectname) && !empty($module)) { - $key= null; + $key = null; $right = null; $objectOfRights = array(); //check if object already declared in rights file foreach ($permissions as $right) { - $objectOfRights[]= $right[4]; + $objectOfRights[] = $right[4]; } if (in_array(strtolower($objectname), $objectOfRights)) { $error++; @@ -591,7 +591,7 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $ if (!$error) { // prepare permissions array $count_perms = count($permissions); - for ($i = 0;$i<$count_perms;$i++) { + for ($i = 0;$i < $count_perms;$i++) { $permissions[$i][0] = "\$this->rights[\$r][0] = \$this->numero . sprintf('%02d', \$r + 1)"; $permissions[$i][1] = "\$this->rights[\$r][1] = '".$permissions[$i][1]."'"; $permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'"; @@ -611,7 +611,7 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $ // parcourir les objects - $o=0; + $o = 0; foreach ($permissions as &$object) { // récupérer la permission de l'objet $p = 1; @@ -735,7 +735,7 @@ function writePropsInAsciiDoc($file, $objectname, $destfile) foreach ($attributesUnique as $attUnique) { $table .= "|".$attUnique; } - $table .="\n"; + $table .= "\n"; $valuesModif = array(); foreach ($keys as $string) { $string = trim($string, "'"); @@ -783,9 +783,9 @@ function writePropsInAsciiDoc($file, $objectname, $destfile) $table .= "|===\n"; $table .= "__ end table for object $objectname\n"; - //write in file + //write in file @phan-suppress-next-line PhanPluginSuspiciousParamPosition $writeInFile = dolReplaceInFile($destfile, array('== DATA SPECIFICATIONS' => $table)); - if ($writeInFile<0) { + if ($writeInFile < 0) { return -1; } return 1; @@ -897,7 +897,7 @@ function writePermsInAsciiDoc($file, $destfile) foreach ($permissions as $key => $element) { $element = str_replace(" '", '', $element); $element = trim($element, "'"); - $permsN[] = substr($element, strpos($element, "=")+1); + $permsN[] = substr($element, strpos($element, "=") + 1); } array_pop($permsN); @@ -926,8 +926,9 @@ function writePermsInAsciiDoc($file, $destfile) } // end table $string .= "\n|===\n"; - $write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__'=> $string)); - if ($write<0) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition + $write = dolReplaceInFile($destfile, array('__DATA_PERMISSIONS__' => $string)); + if ($write < 0) { return -1; } return 1; @@ -985,7 +986,7 @@ function addObjectsToApiFile($file, $objects, $modulename) //add methods for each object $allContent = getFromFile($file, '/*begin methods CRUD*/', '/*end methods CRUD*/'); foreach ($objects as $object) { - $contentReplaced =str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent); + $contentReplaced = str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent); dolReplaceInFile($file, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/')); } dolReplaceInFile($file, array($allContent => '','MyModule' => ucfirst($modulename))); @@ -1049,7 +1050,7 @@ function removeObjectFromApiFile($file, $objectname, $modulename) */ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action) { - $errors =0; + $errors = 0; $counter = 0; if (!file_exists($file)) { return -1; @@ -1062,7 +1063,7 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action) array_push($menus, $menuWantTo); } elseif ($action == 2 && !empty($key) && !empty($menuWantTo)) { // update right from permissions array - $urlCounter=0; + $urlCounter = 0; // check if the values already exists foreach ($menus as $index => $menu) { if ($index !== $key) { @@ -1111,20 +1112,20 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action) //var_dump(dol_escape_php($menu['perms'], 1)); exit; $str_menu .= $start."\n"; - $str_menu.= "\t\t\$this->menu[\$r++]=array(\n"; - $str_menu.= "\t\t\t 'fk_menu' => '".dol_escape_php($menu['fk_menu'], 1)."',\n"; - $str_menu.= "\t\t\t 'type' => '".dol_escape_php($menu['type'], 1)."',\n"; - $str_menu.= "\t\t\t 'titre' => '".dol_escape_php($menu['titre'], 1)."',\n"; - $str_menu.= "\t\t\t 'mainmenu' => '".dol_escape_php($menu['mainmenu'], 1)."',\n"; - $str_menu.= "\t\t\t 'leftmenu' => '".dol_escape_php($menu['leftmenu'], 1)."',\n"; - $str_menu.= "\t\t\t 'url' => '".dol_escape_php($menu['url'], 1)."',\n"; - $str_menu.= "\t\t\t 'langs' => '".dol_escape_php($menu['langs'], 1)."',\n"; - $str_menu.= "\t\t\t 'position' => ".((int) $menu['position']).",\n"; - $str_menu.= "\t\t\t 'enabled' => '".dol_escape_php($menu['enabled'], 1)."',\n"; - $str_menu.= "\t\t\t 'perms' => '".dol_escape_php($menu['perms'], 1)."',\n"; - $str_menu.= "\t\t\t 'target' => '".dol_escape_php($menu['target'], 1)."',\n"; - $str_menu.= "\t\t\t 'user' => ".((int) $menu['user']).",\n"; - $str_menu.= "\t\t);\n"; + $str_menu .= "\t\t\$this->menu[\$r++]=array(\n"; + $str_menu .= "\t\t\t 'fk_menu' => '".dol_escape_php($menu['fk_menu'], 1)."',\n"; + $str_menu .= "\t\t\t 'type' => '".dol_escape_php($menu['type'], 1)."',\n"; + $str_menu .= "\t\t\t 'titre' => '".dol_escape_php($menu['titre'], 1)."',\n"; + $str_menu .= "\t\t\t 'mainmenu' => '".dol_escape_php($menu['mainmenu'], 1)."',\n"; + $str_menu .= "\t\t\t 'leftmenu' => '".dol_escape_php($menu['leftmenu'], 1)."',\n"; + $str_menu .= "\t\t\t 'url' => '".dol_escape_php($menu['url'], 1)."',\n"; + $str_menu .= "\t\t\t 'langs' => '".dol_escape_php($menu['langs'], 1)."',\n"; + $str_menu .= "\t\t\t 'position' => ".((int) $menu['position']).",\n"; + $str_menu .= "\t\t\t 'enabled' => '".dol_escape_php($menu['enabled'], 1)."',\n"; + $str_menu .= "\t\t\t 'perms' => '".dol_escape_php($menu['perms'], 1)."',\n"; + $str_menu .= "\t\t\t 'target' => '".dol_escape_php($menu['target'], 1)."',\n"; + $str_menu .= "\t\t\t 'user' => ".((int) $menu['user']).",\n"; + $str_menu .= "\t\t);\n"; if (is_null($next_val) || $val_actuel['leftmenu'] !== $next_val['leftmenu']) { $str_menu .= $end."\n"; @@ -1266,7 +1267,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul $dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : ''); $dictionnaires['tabrowid'][] = $primaryKey; $dictionnaires['tabcond'][] = isModEnabled('$modulename'); - $dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : ''); + $dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code' => $langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : ''); // Build the dictionary string $writeInfile = updateDictionaryInFile($modulename, $file, $dictionnaires); diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index aaf3b602a36..271667675cd 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -519,6 +519,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri if ($containeraliasalt) { include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; $tmpwebsitepage = new WebsitePage($db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt); if ($result > 0) { $containerref = $tmpwebsitepage->pageurl; @@ -542,6 +543,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri if (!$containeraliasalt) { // If containeraliasalt set, we already did the test include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php'; $tmpwebsitepage = new WebsitePage($db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $result = $tmpwebsitepage->fetch(0, $website->id, $containerref); unset($tmpwebsitepage); } @@ -1104,7 +1106,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running included containers. $error = 0; - $arrayresult = array('code'=>'', 'list'=>array()); + $arrayresult = array('code' => '', 'list' => array()); if (!is_object($weblangs)) { $weblangs = $langs; @@ -1212,22 +1214,22 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so $filecontent = file_get_contents($filehtmlheader); if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) { - $arrayresult['list'][] = array('type'=>'website_htmlheadercontent'); + $arrayresult['list'][] = array('type' => 'website_htmlheadercontent'); } $filecontent = file_get_contents($filecss); if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) { - $arrayresult['list'][] = array('type'=>'website_csscontent'); + $arrayresult['list'][] = array('type' => 'website_csscontent'); } $filecontent = file_get_contents($filejs); if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) { - $arrayresult['list'][] = array('type'=>'website_jscontent'); + $arrayresult['list'][] = array('type' => 'website_jscontent'); } $filerobot = file_get_contents($filerobot); if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) { - $arrayresult['list'][] = array('type'=>'website_robotcontent'); + $arrayresult['list'][] = array('type' => 'website_robotcontent'); } $searchdone = 1; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 48d43f760e9..f1e0d0c26ad 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -285,7 +285,7 @@ class pdf_crabe extends ModelePDFFactures $hookmanager = new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); - $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs); + $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs); global $action; $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks @@ -775,7 +775,7 @@ class pdf_crabe extends ModelePDFFactures if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) { $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0; } - $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne); + $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne); if ($posYAfterImage > $posYAfterDescription) { $nexY = $posYAfterImage; @@ -784,10 +784,10 @@ class pdf_crabe extends ModelePDFFactures // Add line if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) { $pdf->setPage($pageposafter); - $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80))); + $pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80))); //$pdf->SetDrawColor(190,190,200); $pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1); - $pdf->SetLineStyle(array('dash'=>0)); + $pdf->SetLineStyle(array('dash' => 0)); } $nexY += 2; // Add space between lines @@ -872,7 +872,7 @@ class pdf_crabe extends ModelePDFFactures // Add pdfgeneration hook $hookmanager->initHooks(array('pdfgeneration')); - $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs); + $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs); global $action; $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -882,7 +882,7 @@ class pdf_crabe extends ModelePDFFactures dolChmod($file); - $this->result = array('fullpath'=>$file); + $this->result = array('fullpath' => $file); return 1; // No error } else { @@ -1204,8 +1204,9 @@ class pdf_crabe extends ModelePDFFactures if ($object->mode_reglement_code == "PRE") { require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php'; $bac = new CompanyBankAccount($this->db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $bac->fetch(0, $object->thirdparty->id); - $iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; + $iban = $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; $lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1)); } $pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L'); @@ -2139,11 +2140,11 @@ class pdf_crabe extends ModelePDFFactures $contactshipping = $object->fetch_Contact($idaddressshipping[0]); $companystatic = new Societe($this->db); $companystatic->fetch($object->contact->fk_soc); - $carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs); + $carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs); $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $companystatic, $object->contact, $usecontact, 'target', $object); } else { - $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs); - $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); + $carac_client_name_shipping = pdfBuildThirdpartyName($object->thirdparty, $outputlangs); + $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); } if (!empty($carac_client_shipping)) { $posy += $hautcadre; @@ -2162,7 +2163,7 @@ class pdf_crabe extends ModelePDFFactures $posy = $pdf->getY(); // Show shipping information - $pdf->SetXY($posx+2, $posy); + $pdf->SetXY($posx + 2, $posy); $pdf->SetFont('', '', $default_font_size - 1); $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L'); $top_shift += $hautcadre; diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 00c28594717..438123738d4 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -317,7 +317,7 @@ class pdf_sponge extends ModelePDFFactures $hookmanager = new HookManager($this->db); } $hookmanager->initHooks(array('pdfgeneration')); - $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs); + $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs); global $action; $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks @@ -848,9 +848,9 @@ class pdf_sponge extends ModelePDFFactures $parameters = array( 'object' => $object, 'i' => $i, - 'pdf' =>& $pdf, - 'curY' =>& $curY, - 'nexY' =>& $nexY, + 'pdf' => & $pdf, + 'curY' => & $curY, + 'nexY' => & $nexY, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails ); @@ -900,7 +900,7 @@ class pdf_sponge extends ModelePDFFactures // Retrieve type from database for backward compatibility with old records if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined && (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax - $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc); + $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc); $localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : ''; $localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : ''; } @@ -934,17 +934,17 @@ class pdf_sponge extends ModelePDFFactures if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) { $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0; } - $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne); + $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate' => $vatrate, 'vatcode' => $vatcode, 'amount' => $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne); $nexY = max($nexY, $posYAfterImage); // Add line if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1)) { $pdf->setPage($pageposafter); - $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80))); + $pdf->SetLineStyle(array('dash' => '1,1', 'color' => array(80, 80, 80))); //$pdf->SetDrawColor(190,190,200); $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY); - $pdf->SetLineStyle(array('dash'=>0)); + $pdf->SetLineStyle(array('dash' => 0)); } // Detect if some page were added automatically and output _tableau for past pages @@ -1024,7 +1024,7 @@ class pdf_sponge extends ModelePDFFactures // Add pdfgeneration hook $hookmanager->initHooks(array('pdfgeneration')); - $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs); + $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs); global $action; $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { @@ -1034,7 +1034,7 @@ class pdf_sponge extends ModelePDFFactures dolChmod($file); - $this->result = array('fullpath'=>$file); + $this->result = array('fullpath' => $file); return 1; // No error } else { @@ -1298,8 +1298,9 @@ class pdf_sponge extends ModelePDFFactures if ($object->mode_reglement_code == "PRE") { require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php'; $bac = new CompanyBankAccount($this->db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $bac->fetch(0, $object->thirdparty->id); - $iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; + $iban = $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic; $lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1)); } @@ -2390,11 +2391,11 @@ class pdf_sponge extends ModelePDFFactures $contactshipping = $object->fetch_Contact($idaddressshipping[0]); $companystatic = new Societe($this->db); $companystatic->fetch($object->contact->fk_soc); - $carac_client_name_shipping=pdfBuildThirdpartyName($object->contact, $outputlangs); + $carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs); $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $companystatic, $object->contact, $usecontact, 'target', $object); } else { - $carac_client_name_shipping=pdfBuildThirdpartyName($object->thirdparty, $outputlangs); - $carac_client_shipping=pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); + $carac_client_name_shipping = pdfBuildThirdpartyName($object->thirdparty, $outputlangs); + $carac_client_shipping = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'target', $object); } if (!empty($carac_client_shipping)) { $posy += $hautcadre; @@ -2413,7 +2414,7 @@ class pdf_sponge extends ModelePDFFactures $posy = $pdf->getY(); // Show shipping information - $pdf->SetXY($posx+2, $posy); + $pdf->SetXY($posx + 2, $posy); $pdf->SetFont('', '', $default_font_size - 1); $pdf->MultiCell($widthrecbox - 2, 2, $carac_client_shipping, '', 'L'); $shipp_shift += $hautcadre; diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index bb3f6ae561e..2cc8f02d3b8 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -393,6 +393,7 @@ class ImportCsv extends ModeleImports // Is it a required field ? if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key); $this->errors[$error]['type'] = 'NOTNULL'; $errorforthistable++; @@ -405,7 +406,7 @@ class ImportCsv extends ModeleImports if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel' - ) { + ) { // New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess. $isidorref = 'id'; if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) { @@ -854,7 +855,7 @@ class ImportCsv extends ModeleImports $fname = 'rowid'; if (strpos($tablename, '_categorie_') !== false) { $is_table_category_link = true; - $fname='*'; + $fname = '*'; } if (!empty($updatekeys)) { diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 5e9ca592a0c..9750222149a 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -516,6 +516,7 @@ class ImportXlsx extends ModeleImports $newval = $classinstance->id; } elseif (! $error) { if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict'])); } elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) { $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element'])); @@ -558,6 +559,7 @@ class ImportXlsx extends ModeleImports $newval = $classinstance->id; } else { if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict'])); } else { $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn'; @@ -595,6 +597,7 @@ class ImportXlsx extends ModeleImports $newval = $scaleorid ? $scaleorid : 0; } else { if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict'])); } else { $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn'; @@ -753,6 +756,7 @@ class ImportXlsx extends ModeleImports if (!empty($filter)) { $tableforerror .= ':' . $filter; } + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror); $this->errors[$error]['type'] = 'FOREIGNKEY'; $errorforthistable++; @@ -761,6 +765,7 @@ class ImportXlsx extends ModeleImports } elseif (!preg_match('/' . $objimport->array_import_regex[0][$val] . '/i', $newval)) { // If test is just a static regex //if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."
"; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]); $this->errors[$error]['type'] = 'REGEX'; $errorforthistable++; @@ -771,6 +776,7 @@ class ImportXlsx extends ModeleImports // Check HTML injection $inj = testSqlAndScriptInject($newval, 0); if ($inj) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', $key, dol_trunc($newval, 100)); $this->errors[$error]['type'] = 'HTMLINJECTION'; $errorforthistable++; @@ -892,7 +898,7 @@ class ImportXlsx extends ModeleImports $fname = 'rowid'; if (strpos($tablename, '_categorie_') !== false) { $is_table_category_link = true; - $fname='*'; + $fname = '*'; } if (!empty($updatekeys)) { diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index a12dd5ed70a..09a79dca030 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -359,7 +359,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales ); complete_substitutions_array($substitutionarray, $langs, $object); // Call the ODTSubstitution hook - $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray); + $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$substitutionarray); $reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks // Line of free text @@ -412,9 +412,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales include_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php'; $companybankaccount = new CompanyBankAccount($this->db); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $companybankaccount->fetch(0, $object->thirdparty->id); - $array_objet['company_default_bank_iban']=$companybankaccount->iban; - $array_objet['company_default_bank_bic']=$companybankaccount->bic; + $array_objet['company_default_bank_iban'] = $companybankaccount->iban; + $array_objet['company_default_bank_bic'] = $companybankaccount->bic; // retrieve contact information for use in object as contact_xxx tags $array_thirdparty_contact = array(); @@ -426,7 +427,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales complete_substitutions_array($tmparray, $outputlangs, $object); // Call the ODTSubstitution hook - $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray); + $parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray); $reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks foreach ($tmparray as $key => $value) { @@ -464,7 +465,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales $tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber); complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines"); // Call the ODTSubstitutionLine hook - $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line); + $parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray, 'line' => $line); $reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks foreach ($tmparray as $key => $val) { try { @@ -496,7 +497,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales } // Call the beforeODTSave hook - $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray); + $parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray); $reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks // Write new file @@ -517,14 +518,14 @@ class doc_generic_proposal_odt extends ModelePDFPropales return -1; } } - $parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray); + $parameters = array('odfHandler' => &$odfHandler, 'file' => $file, 'object' => $object, 'outputlangs' => $outputlangs, 'substitutionarray' => &$tmparray); $reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks dolChmod($file); $odfHandler = null; // Destroy object - $this->result = array('fullpath'=>$file); + $this->result = array('fullpath' => $file); return 1; // Success } else { diff --git a/htdocs/don/card.php b/htdocs/don/card.php index adaa6686ebf..d925aa68368 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -293,6 +293,7 @@ if (empty($reshook)) { // Action validation if ($action == 'valid_promesse') { $object->fetch($id); + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition if ($object->valid_promesse($id, $user->id) >= 0) { setEventMessages($langs->trans("DonationValidated", $object->ref), null); $action = ''; diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php index 5e13d12bd35..1312e385480 100644 --- a/htdocs/don/class/api_donations.class.php +++ b/htdocs/don/class/api_donations.class.php @@ -317,6 +317,7 @@ class Donations extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $result = $this->don->valid_promesse($id, DolibarrApiAccess::$user->id, $notrigger); if ($result == 0) { throw new RestException(304, 'Error nothing done. May be object is already validated'); diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index dbdd5caf745..c3bce69d1db 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -725,6 +725,7 @@ class Don extends CommonObject */ public function setValid($user, $notrigger = 0) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition return $this->valid_promesse($this->id, $user->id, $notrigger); } @@ -957,7 +958,7 @@ class Don extends CommonObject $result .= $linkend; global $action; $hookmanager->initHooks(array($this->element . 'dao')); - $parameters = array('id'=>$this->id, 'getnomurl' => &$result); + $parameters = array('id' => $this->id, 'getnomurl' => &$result); $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks if ($reshook > 0) { $result = $hookmanager->resPrint; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index a6c3687c9c5..638dbd6b700 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -58,7 +58,7 @@ $entitytoicon = array( 'other' => 'generic', 'account' => 'account', 'product' => 'product', - 'virtualproduct'=>'product', + 'virtualproduct' => 'product', 'subproduct' => 'product', 'product_supplier_ref' => 'product', 'stock' => 'stock', @@ -67,11 +67,11 @@ $entitytoicon = array( 'stockbatch' => 'stock', 'category' => 'category', 'shipment' => 'sending', - 'shipment_line'=> 'sending', - 'reception'=> 'sending', - 'reception_line'=> 'sending', - 'expensereport'=> 'trip', - 'expensereport_line'=> 'trip', + 'shipment_line' => 'sending', + 'reception' => 'sending', + 'reception_line' => 'sending', + 'expensereport' => 'trip', + 'expensereport_line' => 'trip', 'holiday' => 'holiday', 'contract_line' => 'contract', 'translation' => 'generic', @@ -114,16 +114,16 @@ $entitytolang = array( 'other' => 'Other', 'trip' => 'TripsAndExpenses', 'shipment' => 'Shipments', - 'shipment_line'=> 'ShipmentLine', + 'shipment_line' => 'ShipmentLine', 'project' => 'Projects', 'projecttask' => 'Tasks', 'task_time' => 'TaskTimeSpent', 'action' => 'Event', - 'expensereport'=> 'ExpenseReport', - 'expensereport_line'=> 'ExpenseReportLine', + 'expensereport' => 'ExpenseReport', + 'expensereport_line' => 'ExpenseReportLine', 'holiday' => 'TitreRequestCP', 'contract' => 'Contract', - 'contract_line'=> 'ContractLine', + 'contract_line' => 'ContractLine', 'translation' => 'Translation', 'bom' => 'BOM', 'bomline' => 'BOMLine', @@ -1020,7 +1020,7 @@ if ($step == 4 && $datatoexport) { print '
'; - $arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody")); + $arrayvisibility = array('private' => $langs->trans("Private"), 'all' => $langs->trans("Everybody")); print $form->selectarray('visibility', $arrayvisibility, 'private'); print ''; @@ -1203,6 +1203,7 @@ if ($step == 5 && $datatoexport) { $htmltabloflibs .= ''.img_picto_common($key, $objmodelexport->getPictoForKey($key)).' '; $text = $objmodelexport->getDriverDescForKey($key); $label = $listeall[$key]; + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $htmltabloflibs .= $form->textwithpicto($label, $text).''.$objmodelexport->getLibLabelForKey($key).''.$objmodelexport->getLibVersionForKey($key).''.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).''.$form->textwithpicto($label, $text).''.$model->getLibLabelForKey($key).''.$model->getLibVersionForKey($key).'
"; foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) { // $dbatch is instance of Productbatch $batchStock = + $dbatch->qty; // To get a numeric @@ -628,7 +628,7 @@ if (empty($reshook)) { if (getDolGlobalString('TAKEPOS_GROUP_SAME_PRODUCT')) { foreach ($invoice->lines as $line) { if ($line->product_ref == $prod->ref) { - if ($line->special_code==4) { + if ($line->special_code == 4) { continue; } // If this line is sended to printer create new line // check if qty in stock @@ -678,7 +678,7 @@ if (empty($reshook)) { // complete line by hook $parameters = array('prod' => $prod, 'line' => $line); - $reshook=$hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks + $reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } @@ -733,7 +733,7 @@ if (empty($reshook)) { if ($action == "addnote" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { $desc = GETPOST('addnote', 'alpha'); - if ($idline==0) { + if ($idline == 0) { $invoice->update_note($desc, '_public'); } else { foreach ($invoice->lines as $line) { @@ -791,6 +791,7 @@ if (empty($reshook)) { // We delete the lines $resdeletelines = 1; foreach ($invoice->lines as $line) { + // @phan-suppress-next-line PhanPluginSuspiciousParamPosition $tmpres = $invoice->deleteLine($line->id); if ($tmpres < 0) { $resdeletelines = 0; @@ -928,7 +929,7 @@ if (empty($reshook)) { $invoice->fetch($placeid); } - if ($action=="setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { + if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) { $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set batch=".$db->escape($batch).", fk_warehouse=".getDolGlobalString($constantforkey)." where rowid=".((int) $idoflineadded); $db->query($sql); @@ -1139,7 +1140,7 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la