diff --git a/ChangeLog b/ChangeLog index bc49acb9ef2..0ac6d7906a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ The following changes may create regressions for some external modules, but were * The trigger code CATEGORY_LINK and CATEGORY_UNLINK have been replaced with code CATEGORY_MODIFY. You can read ->context['linkto'] or ->context['unlinkoff'] to detect if we want to make a link or unlink. * The property ->domiciliation and ->propio on bank accounts has been deprecated and replaced with property ->address and ->owner_name everywhere. * If you were using the substitution key __MEMBER_CIVILITY__, you must now use __MEMBER_TITLE__ +* The hidden title of tab that was hidden by the CSS class tabTitleText has been completely removed from HTML content. ***** ChangeLog for 20.0.4 compared to 20.0.3 ***** diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 98d170efd4c..ce8c2a8fa80 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -1722,12 +1722,6 @@ parameters: count: 1 path: ../../../htdocs/admin/system/filecheck.php - - - message: '#^Parameter \#1 \$file_list of function getFilesUpdated expects array\{insignature\: array\, missing\?\: array\, updated\: array\\}, array\{\} given\.$#' - identifier: argument.type - count: 1 - path: ../../../htdocs/admin/system/filecheck.php - - message: '#^Parameter \#1 \$size of function dol_print_size expects int, string given\.$#' identifier: argument.type @@ -2028,12 +2022,6 @@ parameters: count: 1 path: ../../../htdocs/api/class/api.class.php - - - message: '#^Method DolibarrApiAccess\:\:verifyAccess\(\) has parameter \$m with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_access.class.php - - message: '#^Property DolibarrApiAccess\:\:\$requires type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -2052,36 +2040,6 @@ parameters: count: 1 path: ../../../htdocs/api/class/api_documents.class.php - - - message: '#^Method Documents\:\:builddoc\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_documents.class.php - - - - message: '#^Method Documents\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_documents.class.php - - - - message: '#^Method Documents\:\:getDocumentsListByElement\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_documents.class.php - - - - message: '#^Method Documents\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_documents.class.php - - - - message: '#^Method Documents\:\:post\(\) has parameter \$array_options with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_documents.class.php - - message: '#^Negated boolean expression is always true\.$#' identifier: booleanNot.alwaysTrue @@ -2100,24 +2058,6 @@ parameters: count: 1 path: ../../../htdocs/api/class/api_documents.class.php - - - message: '#^Method Login\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_login.class.php - - - - message: '#^Method Login\:\:loginUnsecured\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_login.class.php - - - - message: '#^Method Setup\:\:getModules\(\) should return array\ but returns object\.$#' - identifier: return.type - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - message: '#^Comparison operation "\<\=" between 0 and 0 is always true\.$#' identifier: smallerOrEqual.alwaysTrue @@ -2131,194 +2071,8 @@ parameters: path: ../../../htdocs/api/class/api_setup.class.php - - message: '#^Method Setup\:\:deleteExtrafieldsFromNames\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getAvailability\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getCheckIntegrity\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getEstablishments\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getExtrafields\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfCivilities\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfContactTypes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfCountries\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfCurrencies\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfEventTypes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfExpenseReportsTypes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfExtrafields\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfIncoterms\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfLegalForm\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfMeasuringUnits\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfRegions\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfStaff\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfStates\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfTowns\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getListOfsocialNetworks\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getOrderingMethods\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getOrderingOrigins\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getPaymentTerms\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getPaymentTypes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getShippingModes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getTicketsCategories\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getTicketsSeverities\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:getTicketsTypes\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:postExtrafields\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:translateLabel\(\) has parameter \$dict with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Method Setup\:\:updateExtrafields\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_setup.class.php - - - - message: '#^Parameter \#1 \$file_list of function getFilesUpdated expects array\{insignature\: array\, missing\?\: array\, updated\: array\\}, array\{\} given\.$#' - identifier: argument.type + message: '#^Method Setup\:\:getModules\(\) should return array\ but returns object\.$#' + identifier: return.type count: 1 path: ../../../htdocs/api/class/api_setup.class.php @@ -2340,12 +2094,6 @@ parameters: count: 1 path: ../../../htdocs/api/class/api_setup.class.php - - - message: '#^Method Status\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/api/class/api_status.class.php - - message: '#^Negated boolean expression is always true\.$#' identifier: booleanNot.alwaysTrue @@ -2790,66 +2538,6 @@ parameters: count: 3 path: ../../../htdocs/bom/class/api_boms.class.php - - - message: '#^Method Boms\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:deleteLine\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - - - message: '#^Method Boms\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/bom/class/api_boms.class.php - - message: '#^Result of && is always false\.$#' identifier: booleanAnd.alwaysFalse @@ -3396,24 +3084,6 @@ parameters: count: 1 path: ../../../htdocs/categories/card.php - - - message: '#^Method Categories\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/categories/class/api_categories.class.php - - - - message: '#^Method Categories\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/categories/class/api_categories.class.php - - - - message: '#^Method Categories\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/categories/class/api_categories.class.php - - message: '#^Method Categories\:\:getListForObject\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -3438,18 +3108,6 @@ parameters: count: 1 path: ../../../htdocs/categories/class/api_categories.class.php - - - message: '#^Method Categories\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/categories/class/api_categories.class.php - - - - message: '#^Method Categories\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/categories/class/api_categories.class.php - - message: '#^Method Categories\:\:unlinkObjectById\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -3618,42 +3276,12 @@ parameters: count: 2 path: ../../../htdocs/comm/action/class/actioncomm.class.php - - - message: '#^Method AgendaEvents\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - - - message: '#^Method AgendaEvents\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - - - message: '#^Method AgendaEvents\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - message: '#^Method AgendaEvents\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - - message: '#^Method AgendaEvents\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - - - message: '#^Method AgendaEvents\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/action/class/api_agendaevents.class.php - - message: '#^Left side of && is always true\.$#' identifier: booleanAnd.leftAlwaysTrue @@ -4194,24 +3822,6 @@ parameters: count: 1 path: ../../../htdocs/comm/propal/card.php - - - message: '#^Method Proposals\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - - message: '#^Method Proposals\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - - message: '#^Method Proposals\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - message: '#^Method Proposals\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -4224,42 +3834,12 @@ parameters: count: 1 path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - message: '#^Method Proposals\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - message: '#^Method Proposals\:\:postContact\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - message: '#^Method Proposals\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - - message: '#^Method Proposals\:\:postLines\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - - message: '#^Method Proposals\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - - - message: '#^Method Proposals\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/comm/propal/class/api_proposals.class.php - - message: '#^Negated boolean expression is always false\.$#' identifier: booleanNot.alwaysFalse @@ -4584,30 +4164,6 @@ parameters: count: 6 path: ../../../htdocs/commande/card.php - - - message: '#^Method Orders\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:deleteContact\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - message: '#^Method Orders\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -4626,36 +4182,6 @@ parameters: count: 1 path: ../../../htdocs/commande/class/api_orders.class.php - - - message: '#^Method Orders\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:postContact\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - - - message: '#^Method Orders\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/commande/class/api_orders.class.php - - message: '#^Negated boolean expression is always false\.$#' identifier: booleanNot.alwaysFalse @@ -5076,30 +4602,6 @@ parameters: count: 2 path: ../../../htdocs/compta/bank/class/account.class.php - - - message: '#^Method BankAccounts\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - - message: '#^Method BankAccounts\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - - message: '#^Method BankAccounts\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - - message: '#^Method BankAccounts\:\:deleteLine\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - message: '#^Method BankAccounts\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -5118,24 +4620,6 @@ parameters: count: 1 path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - message: '#^Method BankAccounts\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - - message: '#^Method BankAccounts\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - - - message: '#^Method BankAccounts\:\:transfer\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/bank/class/api_bankaccounts.class.php - - message: '#^Negated boolean expression is always true\.$#' identifier: booleanNot.alwaysTrue @@ -5580,30 +5064,6 @@ parameters: count: 1 path: ../../../htdocs/compta/facture/card.php - - - message: '#^Method Invoices\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:addPaymentDistributed\(\) has parameter \$arrayofamounts with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - message: '#^Method Invoices\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -5622,42 +5082,6 @@ parameters: count: 1 path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - message: '#^Method Invoices\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:postContact\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - - - message: '#^Method Invoices\:\:putPayment\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/compta/facture/class/api_invoices.class.php - - message: '#^Negated boolean expression is always false\.$#' identifier: booleanNot.alwaysFalse @@ -7542,30 +6966,6 @@ parameters: count: 1 path: ../../../htdocs/contrat/card.php - - - message: '#^Method Contracts\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:close\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - message: '#^Method Contracts\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -7578,36 +6978,6 @@ parameters: count: 1 path: ../../../htdocs/contrat/class/api_contracts.class.php - - - message: '#^Method Contracts\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - - - message: '#^Method Contracts\:\:validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/contrat/class/api_contracts.class.php - - message: '#^Property Contracts\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -14976,42 +14346,12 @@ parameters: count: 1 path: ../../../htdocs/document.php - - - message: '#^Method Donations\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/don/class/api_donations.class.php - - - - message: '#^Method Donations\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/don/class/api_donations.class.php - - - - message: '#^Method Donations\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/don/class/api_donations.class.php - - message: '#^Method Donations\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/don/class/api_donations.class.php - - - message: '#^Method Donations\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/don/class/api_donations.class.php - - - - message: '#^Method Donations\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/don/class/api_donations.class.php - - message: '#^Negated boolean expression is always false\.$#' identifier: booleanNot.alwaysFalse @@ -15858,54 +15198,6 @@ parameters: count: 1 path: ../../../htdocs/expedition/card.php - - - message: '#^Method Shipments\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:deleteLine\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Method Shipments\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - - - message: '#^Property Shipments\:\:\$FIELDS type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expedition/class/api_shipments.class.php - - message: '#^Call to function method_exists\(\) with \$this\(Expedition\) and ''getLibStatut'' will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -16251,7 +15543,7 @@ parameters: - message: '#^If condition is always true\.$#' identifier: if.alwaysTrue - count: 6 + count: 5 path: ../../../htdocs/expensereport/card.php - @@ -16290,84 +15582,6 @@ parameters: count: 10 path: ../../../htdocs/expensereport/card.php - - - message: '#^Method ExpenseReports\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:_validatepayment\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:_validatepayment\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:addPayment\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:getAllPayments\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Method ExpenseReports\:\:updatePayment\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Property ExpenseReports\:\:\$FIELDS type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - - - message: '#^Property ExpenseReports\:\:\$FIELDSPAYMENT has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/expensereport/class/api_expensereports.class.php - - message: '#^Call to function method_exists\(\) with \$this\(ExpenseReport\) and ''getLibStatut'' will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -16830,30 +16044,6 @@ parameters: count: 1 path: ../../../htdocs/fourn/card.php - - - message: '#^Method SupplierInvoices\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:deleteLine\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - message: '#^Method SupplierInvoices\:\:getLines\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -16872,114 +16062,6 @@ parameters: count: 1 path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - message: '#^Method SupplierInvoices\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:postLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:putLine\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierInvoices\:\:validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_invoices.class.php - - - - message: '#^Method SupplierOrders\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:approve\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:deleteContact\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:makeOrder\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:postContact\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:receiveOrder\(\) has parameter \$lines with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:receiveOrder\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - - - message: '#^Method SupplierOrders\:\:validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/fourn/class/api_supplier_orders.class.php - - message: '#^Parameter \#1 \$object of method SupplierOrders\:\:_cleanObjectDatas\(\) expects object, array\ given\.$#' identifier: argument.type @@ -19266,42 +18348,12 @@ parameters: count: 3 path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - - message: '#^Method KnowledgeManagement\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - - - message: '#^Method KnowledgeManagement\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - - - message: '#^Method KnowledgeManagement\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - message: '#^Method KnowledgeManagement\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - - message: '#^Method KnowledgeManagement\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - - - message: '#^Method KnowledgeManagement\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php - - message: '#^Result of && is always false\.$#' identifier: booleanAnd.alwaysFalse @@ -20652,36 +19704,12 @@ parameters: count: 1 path: ../../../htdocs/mrp/tpl/linkedobjectblock.tpl.php - - - message: '#^Method MultiCurrencies\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/multicurrency/class/api_multicurrencies.class.php - - message: '#^Method MultiCurrencies\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/multicurrency/class/api_multicurrencies.class.php - - - message: '#^Method MultiCurrencies\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/multicurrency/class/api_multicurrencies.class.php - - - - message: '#^Method MultiCurrencies\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/multicurrency/class/api_multicurrencies.class.php - - - - message: '#^Method MultiCurrencies\:\:updateRate\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/multicurrency/class/api_multicurrencies.class.php - - message: '#^Parameter \#1 \$object of method MultiCurrencies\:\:_cleanObjectDatasRate\(\) expects MultiCurrency, CurrencyRate given\.$#' identifier: argument.type @@ -20808,42 +19836,12 @@ parameters: count: 3 path: ../../../htdocs/partnership/class/api_partnerships.class.php - - - message: '#^Method Partnerships\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/partnership/class/api_partnerships.class.php - - - - message: '#^Method Partnerships\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/partnership/class/api_partnerships.class.php - - - - message: '#^Method Partnerships\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/partnership/class/api_partnerships.class.php - - message: '#^Method Partnerships\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/partnership/class/api_partnerships.class.php - - - message: '#^Method Partnerships\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/partnership/class/api_partnerships.class.php - - - - message: '#^Method Partnerships\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/partnership/class/api_partnerships.class.php - - message: '#^Result of && is always false\.$#' identifier: booleanAnd.alwaysFalse @@ -21174,42 +20172,6 @@ parameters: count: 1 path: ../../../htdocs/product/class/api_products.class.php - - - message: '#^Method Products\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:addPurchasePrice\(\) has parameter \$localtaxes_array with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:addVariant\(\) has parameter \$features with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:addVariantByProductRef\(\) has parameter \$features with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - message: '#^Method Products\:\:getAttributeValueById\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -21282,36 +20244,6 @@ parameters: count: 1 path: ../../../htdocs/product/class/api_products.class.php - - - message: '#^Method Products\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:putAttributeValue\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:putAttributes\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - - - message: '#^Method Products\:\:putVariant\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/class/api_products.class.php - - message: '#^Parameter \#1 \$object of method Products\:\:_cleanObjectDatas\(\) expects object, array\\|int given\.$#' identifier: argument.type @@ -22122,42 +21054,12 @@ parameters: count: 1 path: ../../../htdocs/product/stock/class/api_stockmovements.class.php - - - message: '#^Method Warehouses\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - - - message: '#^Method Warehouses\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - - - message: '#^Method Warehouses\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - message: '#^Method Warehouses\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - - message: '#^Method Warehouses\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - - - message: '#^Method Warehouses\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/product/stock/class/api_warehouses.class.php - - message: '#^Property Warehouses\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -22890,36 +21792,6 @@ parameters: count: 1 path: ../../../htdocs/projet/class/api_projects.class.php - - - message: '#^Method Tasks\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:addTimeSpent\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:deleteTimeSpent\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - message: '#^Method Tasks\:\:getRoles\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -22932,24 +21804,6 @@ parameters: count: 1 path: ../../../htdocs/projet/class/api_tasks.class.php - - - message: '#^Method Tasks\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - - - message: '#^Method Tasks\:\:putTimeSpent\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/projet/class/api_tasks.class.php - - message: '#^Parameter \#1 \$object of method Tasks\:\:_cleanObjectDatas\(\) expects object, string given\.$#' identifier: argument.type @@ -25632,36 +24486,6 @@ parameters: count: 1 path: ../../../htdocs/salaries/card.php - - - message: '#^Method Salaries\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:_validatepayments\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:_validatepayments\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:addPayment\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - message: '#^Method Salaries\:\:getAllPayments\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -25674,24 +24498,6 @@ parameters: count: 1 path: ../../../htdocs/salaries/class/api_salaries.class.php - - - message: '#^Method Salaries\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - - - message: '#^Method Salaries\:\:updatePayment\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/salaries/class/api_salaries.class.php - - message: '#^Property Salaries\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -26052,48 +24858,6 @@ parameters: count: 1 path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - message: '#^Method Thirdparties\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:createCompanyBankAccount\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:createCompanyNotification\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:createCompanyNotificationByCode\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:createSocieteAccount\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - message: '#^Method Thirdparties\:\:generateBankAccountDocument\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -26166,42 +24930,6 @@ parameters: count: 1 path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - message: '#^Method Thirdparties\:\:patchSocieteAccount\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:putSocieteAccount\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:updateCompanyBankAccount\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - - - message: '#^Method Thirdparties\:\:updateCompanyNotification\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/societe/class/api_thirdparties.class.php - - message: '#^Property Societe\:\:\$default_lang \(string\) in isset\(\) is not nullable\.$#' identifier: isset.property @@ -26616,42 +25344,12 @@ parameters: count: 4 path: ../../../htdocs/supplier_proposal/card.php - - - message: '#^Method SupplierProposals\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - - - message: '#^Method SupplierProposals\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - - - message: '#^Method SupplierProposals\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - message: '#^Method SupplierProposals\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - - message: '#^Method SupplierProposals\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - - - message: '#^Method SupplierProposals\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/supplier_proposal/class/api_supplier_proposals.class.php - - message: '#^Property SupplierProposals\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -27072,60 +25770,12 @@ parameters: count: 1 path: ../../../htdocs/ticket/card.php - - - message: '#^Method Tickets\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:_validateMessage\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:_validateMessage\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - message: '#^Method Tickets\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 path: ../../../htdocs/ticket/class/api_tickets.class.php - - - message: '#^Method Tickets\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:postNewMessage\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - - - message: '#^Method Tickets\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/ticket/class/api_tickets.class.php - - message: '#^Property Tickets\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -27912,24 +26562,6 @@ parameters: count: 1 path: ../../../htdocs/viewimage.php - - - message: '#^Method Webhook\:\:_validate\(\) has parameter \$data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/webhook/class/api_webhook.class.php - - - - message: '#^Method Webhook\:\:_validate\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/webhook/class/api_webhook.class.php - - - - message: '#^Method Webhook\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/webhook/class/api_webhook.class.php - - message: '#^Method Webhook\:\:index\(\) return type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -27942,18 +26574,6 @@ parameters: count: 1 path: ../../../htdocs/webhook/class/api_webhook.class.php - - - message: '#^Method Webhook\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/webhook/class/api_webhook.class.php - - - - message: '#^Method Webhook\:\:put\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/webhook/class/api_webhook.class.php - - message: '#^Property Webhook\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue @@ -28590,36 +27210,6 @@ parameters: count: 3 path: ../../../htdocs/zapier/class/api_zapier.class.php - - - message: '#^Method Zapier\:\:delete\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/zapier/class/api_zapier.class.php - - - - message: '#^Method Zapier\:\:getModulesChoices\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/zapier/class/api_zapier.class.php - - - - message: '#^Method Zapier\:\:index\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/zapier/class/api_zapier.class.php - - - - message: '#^Method Zapier\:\:post\(\) has parameter \$request_data with no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/zapier/class/api_zapier.class.php - - - - message: '#^Method Zapier\:\:post\(\) return type has no value type specified in iterable type array\.$#' - identifier: missingType.iterableValue - count: 1 - path: ../../../htdocs/zapier/class/api_zapier.class.php - - message: '#^Property Zapier\:\:\$FIELDS type has no value type specified in iterable type array\.$#' identifier: missingType.iterableValue diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index 2899c91805e..1c154e1ceb9 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -988,7 +988,6 @@ Analytic AnalyticLabel BankId Bcc -Birthdate Candidature ClientCollation Collation @@ -1004,9 +1003,7 @@ EmptyMessageNotAllowedError ErrorInputRequired ErrorLDAPFunctionsAreDisabledOnThisPHP ErrorUpdating -Exceptions Extra -Facture FailedToConnectToSFTPAfterSSHAuthentication FailedToLogin First diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 1e2757154a5..6188bd2802a 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -1,13 +1,13 @@ - * Copyright (C) 2004-2019 Laurent Destailleur - * Copyright (C) 2005-2017 Regis Houssin - * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2011-2017 Philippe Grand - * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2017 Rui Strecht - * Copyright (C) 2023 Nick Fragoulis - * Copyright (C) 2024-2025 Frédéric France +/* Copyright (C) 2001-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2019 Laurent Destailleur + * Copyright (C) 2005-2017 Regis Houssin + * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2011-2017 Philippe Grand + * Copyright (C) 2015-2025 Alexandre Spangaro + * Copyright (C) 2017 Rui Strecht + * Copyright (C) 2023 Nick Fragoulis + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -137,7 +137,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha')) $arrayofimages = array('logo', 'logo_squarred'); //var_dump($_FILES); exit; foreach ($arrayofimages as $varforimage) { - if ($_FILES[$varforimage]["name"] && !preg_match('/(\.jpeg|\.jpg|\.png)$/i', $_FILES[$varforimage]["name"])) { // Logo can be used on a lot of different places. Only jpg and png can be supported. + if ($_FILES[$varforimage]["name"] && !image_format_supported($_FILES[$varforimage]["name"], 0)) { // Logo can be used on a lot of different places. Recommend using jpg and png for better compatibility. $langs->load("errors"); setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors'); break; diff --git a/htdocs/admin/remotestore/class/externalModules.class.php b/htdocs/admin/remotestore/class/externalModules.class.php index 198ab07a1a0..cdb0362ca0a 100644 --- a/htdocs/admin/remotestore/class/externalModules.class.php +++ b/htdocs/admin/remotestore/class/externalModules.class.php @@ -641,10 +641,11 @@ class ExternalModules public function getRemoteYamlFile($file_source_url, $cache_time) { $cache_file = $this->cache_file; + $cache_folder = dirname($cache_file); // Check if cache directory exists - if (!dol_is_dir($cache_file)) { - dol_mkdir($cache_file, DOL_DATA_ROOT); + if (!dol_is_dir($cache_folder)) { + dol_mkdir($cache_folder, DOL_DATA_ROOT); } if (!file_exists($cache_file) || filemtime($cache_file) < (dol_now() - $cache_time)) { diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php index 19d39a72336..5fb8df51469 100644 --- a/htdocs/admin/tools/export_files.php +++ b/htdocs/admin/tools/export_files.php @@ -165,6 +165,7 @@ if ($compression == 'zip') { } } + global $errormsg; $ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip); // Can modify $errormsg if ($ret < 0) { if ($ret == -2) { diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 32fe9af0e6a..911176800a9 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5799,7 +5799,7 @@ class Facture extends CommonInvoice $langs->load("bills"); if (!isModEnabled('invoice')) { // Should not happen. If module disabled, cron job should not be visible. - $this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture")); + $this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Invoice")); return 0; } if (!in_array($datetouse, array('duedate', 'invoicedate'))) { @@ -5808,7 +5808,7 @@ class Facture extends CommonInvoice } /*if (empty($conf->global->FACTURE_REMINDER_EMAIL)) { $langs->load("bills"); - $this->output .= $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Facture")); + $this->output .= $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Invoice")); return 0; } */ diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 4ccc9a98fbb..9155185c460 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -1,11 +1,12 @@ - * Copyright (C) 2004-2016 Laurent Destailleur - * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2017-2024 Frédéric France +/* Copyright (C) 2003-2007 Rodolphe Quiedeville + * Copyright (C) 2004-2016 Laurent Destailleur + * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2011 Regis Houssin + * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet + * Copyright (C) 2017-2024 Frédéric France + * Copyright (C) 2025 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,7 +98,14 @@ $usercancreate = $user->hasRight("facture", "creer"); * Actions */ -include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; +$parameters = array('id' => $id); +$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'); +} +if (empty($reshook)) { + include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; +} /* diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 744b212b287..6492494039c 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 MDW + * Copyright (C) 2024 MDW * Copyright (C) 2024 Frédéric France * Copyright (C) 2013 Juanjo Menent * @@ -441,16 +441,13 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO $object->email_to = $sendto; $object->email_tocc = $sendtocc; $object->email_tobcc = $sendtobcc; - $object->email_subject = $subject; // Call of triggers (you should have set $triggersendname to execute trigger. $trigger_name is deprecated) if (!empty($triggersendname) || !empty($trigger_name)) { - // Call trigger $result = $object->call_trigger(empty($triggersendname) ? $trigger_name : $triggersendname, $user); // @phan-suppress-current-line PhanPossiblyUndeclaredGlobalVariable if ($result < 0) { $error++; } - // End call triggers if ($error) { setEventMessages($object->error, $object->errors, 'errors'); } diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 8d8fff229b8..a2a431b00db 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -291,7 +291,12 @@ abstract class CommonInvoice extends CommonObject $alreadypaid += $this->getSumDepositsUsed($multicurrency); $alreadypaid += $this->getSumCreditNotesUsed($multicurrency); - $remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT'); + if ((int) $multicurrency > 0) { + $totalamount = $this->multicurrency_total_ttc; + } else { + $totalamount = $this->total_ttc; + } + $remaintopay = price2num($totalamount - $alreadypaid, 'MT'); if ($this->status == self::STATUS_CLOSED && $this->close_code == 'discount_vat') { // If invoice closed with discount for anticipated payment $remaintopay = 0.0; } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 30b233204ff..dd8e788e8e4 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -973,10 +973,7 @@ class FormFile $out .= ''; - $documenturl = DOL_URL_ROOT.'/document.php'; - if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) { - $documenturl = getDolGlobalString('DOL_URL_ROOT_DOCUMENT_PHP'); // To use another wrapper - } + $documenturl = getDolGlobalString('DOL_URL_ROOT_DOCUMENT_PHP', DOL_URL_ROOT.'/document.php'); // DOL_URL_ROOT_DOCUMENT_PHP can be used to set another wrapper // Show file name with link to download $imgpreview = $this->showPreview($file, $modulepart, $relativepath, 0, $param); diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php index 43757d1128b..0d64de41ed3 100644 --- a/htdocs/core/class/html.formsetup.class.php +++ b/htdocs/core/class/html.formsetup.class.php @@ -705,10 +705,10 @@ class FormSetupItem { global $conf; if (isset($conf->global->{$this->confKey})) { - $this->fieldValue = getDolGlobalString($this->confKey); + $this->fieldValue = getDolGlobalString($this->confKey, null); return true; } else { - $this->fieldValue = ''; + $this->fieldValue = null; return false; } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 13f0967e9d1..d6fd9f751ff 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12817,7 +12817,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' // TODO: add hook // escape all attribute - $attr = array_map('dol_escape_htmltag', $attr); + $attr = array_map('dolPrintHtmlForAttribute', $attr); $TCompiledAttr = array(); foreach ($attr as $key => $value) { diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 8a2fdc2f978..11213353a15 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -329,7 +329,8 @@ function pdf_getHeightForLogo($logo, $url = false) } /** - * Function to try to calculate height of a HTML Content + * Function to try to calculate height of a HTML Content. + * WARNING: Do not use this function inside a TCPDF transaction. * * @param TCPDF $pdf PDF initialized object * @param string $htmlcontent HTML Content @@ -340,6 +341,9 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent) { // store current object $pdf->startTransaction(); + // To avoid pagebreak effect or strange behavior of writeHTMLCell when we are out of page, we imagine we are at the begin of page to test the height of the text + // Another solution would be to do the test on another PDF instance with samefont, width... + $pdf->setY(0); // store starting values $start_y = $pdf->GetY(); //var_dump($start_y); @@ -1214,7 +1218,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ $pdf->SetDrawColor(224, 224, 224); // Option for footer text color if (getDolGlobalString('PDF_FOOTER_TEXT_COLOR')) { - list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_TEXT_COLOR, '%d, %d, %d'); + list($r, $g, $b) = sscanf(getDolGlobalString('PDF_FOOTER_TEXT_COLOR'), '%d, %d, %d'); $pdf->SetTextColor($r, $g, $b); } @@ -1233,7 +1237,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_ $freetextheight = $pdf->getStringHeight($width, $line); } else { $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content) - //print '
'.$freetextheight;exit; + //print '
'.$freetextheight; } } @@ -1455,6 +1459,8 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos } $parameters = array('pdf' => $pdf, 'i' => $i, 'outputlangs' => $outputlangs, 'w' => $w, 'h' => $h, 'posx' => $posx, 'posy' => $posy, 'hideref' => $hideref, 'hidedesc' => $hidedesc, 'issupplierline' => $issupplierline, 'special_code' => $special_code); $action = ''; + // WARNING: A hook must not close/open the PDF transaction. Doing this generates a lot of trouble. + // Test to know if content added by the hooks is already done by the main caller of pdf_writelinedesc $reshook = $hookmanager->executeHooks('pdf_writelinedesc', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if (!empty($hookmanager->resPrint)) { diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index af2c363ffd6..a02ee3ec9a3 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -558,7 +558,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri unset($tmpwebsitepage); } if ($result > 0) { - $currenturi = $_SERVER["REQUEST_URI"]; // Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&nocache=1708177483 + $currenturi = $_SERVER["REQUEST_URI"]; // Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&cache=3600 $regtmp = array(); if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) { if ($regtmp[0] == $containerref) { diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index 36c81798d37..f8c0763d5ff 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -186,7 +186,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $tplcontent .= "} // Not already loaded\n"; $tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n"; $tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n"; - if (in_array($objectpage->type_container, array('page', 'blogpost'))) { + if (in_array($objectpage->type_container, array('page', 'blogpost', 'service'))) { $tplcontent .= 'dol_syslog("--- Prepare content of page '.((int) $objectpage->id).' - '.$objectpage->pageurl.'");'."\n"; } $tplcontent .= "ob_start();\n"; @@ -378,7 +378,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $tplcontent .= "} // Not already loaded\n"; $tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n"; $tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n"; - if (in_array($objectpage->type_container, array('page', 'blogpost'))) { + if (in_array($objectpage->type_container, array('page', 'blogpost', 'service'))) { $tplcontent .= 'dol_syslog("--- Prepare content of page '.((int) $objectpage->id).' - '.$objectpage->pageurl.'");'."\n"; } $tplcontent .= "// END PHP ?>\n"; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 8b1f893cb43..bdf3cd1c060 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -831,7 +831,7 @@ class pdf_crabe extends ModelePDFFactures } else { $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code); } - $this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($pagenb, $object, $langs)); + $this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($pagenb, $object, $outputlangs)); $pagenb++; $pdf->setPage($pagenb); $pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it. @@ -849,7 +849,7 @@ class pdf_crabe extends ModelePDFFactures } else { $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code); } - $this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($pagenb, $object, $langs)); + $this->_pagefoot($pdf, $object, $outputlangs, 1, $this->getHeightForQRInvoice($pagenb, $object, $outputlangs)); // New page $pdf->AddPage(); if (!empty($tplidx)) { @@ -1359,6 +1359,7 @@ class pdf_crabe extends ModelePDFFactures $langs->loadLangs(array('payment', 'paybox', 'stripe')); $servicename = $langs->transnoentities('Online'); + $paiement_url = getOnlinePaymentUrl(0, 'invoice', $object->ref, 0, '', 0); $linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' '.$outputlangs->transnoentities("ClickHere").''; diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 62f3dbf90e7..c93c91d4ae9 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -344,7 +344,7 @@ class pdf_sponge extends ModelePDFFactures $this->heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5); // Height reserved to output the free text on last page $this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin) - $heightforqrinvoice = $heightforqrinvoice_firstpage = 0; + $heightforqrinvoice = 0; if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') { if ($this->getHeightForQRInvoice(1, $object, $langs) > 0) { // Shrink infotot to a base 30 diff --git a/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php b/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php index 9e1313086f9..ca59c48f578 100644 --- a/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php +++ b/htdocs/debugbar/class/DataCollector/DolExceptionsCollector.php @@ -1,6 +1,7 @@ * Copyright (C) 2024 MDW + * Copyright (C) 2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,6 +40,7 @@ class DolExceptionsCollector extends ExceptionsCollector { global $langs; + $langs->load("other"); $title = $langs->transnoentities('Exceptions'); return array( diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 28db17eceb0..0bd44eceb31 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -1009,9 +1009,9 @@ class EcmFiles extends CommonObject if ($option) { if ($option == 'facture_fournisseur') { - $tmppath = preg_replace('/^fournisseur\/facture\//', '', $this->filepath); + $tmppath = preg_replace('/^(\d+\/)?fournisseur\/facture\//', '', $this->filepath); } elseif ($option == 'commande_fournisseur') { - $tmppath = preg_replace('/^fournisseur\/commande\//', '', $this->filepath); + $tmppath = preg_replace('/^(\d+\/)?fournisseur\/commande\//', '', $this->filepath); } else { if ((int) $this->entity > 1) { // Remove the part "entityid/commande/" into "entityid/commande/REFXXX" to get only the ref diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql index 25b303514d6..e97145bcb0a 100644 --- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql +++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql @@ -184,8 +184,10 @@ ALTER TABLE llx_product_customer_price ADD COLUMN discount_percent real DEFAULT ALTER TABLE llx_product_customer_price_log ADD COLUMN date_begin date AFTER ref_customer; ALTER TABLE llx_product_customer_price_log ADD COLUMN date_end date AFTER date_begin; ALTER TABLE llx_product_customer_price_log ADD COLUMN discount_percent real DEFAULT 0 AFTER localtax2_type; -ALTER TABLE llx_product_customer_price DROP CONSTRAINT fk_product_customer_price_fk_product; -ALTER TABLE llx_product_customer_price DROP CONSTRAINT fk_product_customer_price_fk_soc; +ALTER TABLE llx_product_customer_price DROP FOREIGN KEY fk_product_customer_price_fk_product; +ALTER TABLE llx_product_customer_price DROP FOREIGN KEY fk_product_customer_price_fk_soc; +ALTER TABLE llx_product_customer_price DROP FOREIGN KEY fk_customer_price_fk_product; +ALTER TABLE llx_product_customer_price DROP FOREIGN KEY fk_customer_price_fk_soc; ALTER TABLE llx_product_customer_price DROP INDEX uk_customer_price_fk_product_fk_soc; ALTER TABLE llx_product_customer_price ADD UNIQUE INDEX uk_customer_price_fk_product_fk_soc (fk_product, fk_soc, date_begin); ALTER TABLE llx_product_customer_price ADD CONSTRAINT fk_product_customer_price_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product(rowid); diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 603fda6438f..560556751d0 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -356,3 +356,4 @@ Pre-Prompt=Pre-prompt Post-Prompt=Post-prompt AIProcessingPleaseWait=AI (%s) is processing your request, please wait... PayOfBankTransferInvoice=You are going to make an online payment for this invoice. However, this invoice has been set up to be paid in "Credit Transfer" mode, so to avoid paying twice, please verify that no current bank transfer has already been initiated before continuing. +Exceptions=Exceptions diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 43f8ff2b0ab..bc00627a04b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4014,9 +4014,6 @@ a.tabTitle { text-decoration: none; white-space: nowrap; } -.tabTitleText { - display: none; -} .imgTabTitle { max-height: 14px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index b21d2160f57..e6663bf1448 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4160,9 +4160,6 @@ a.tabTitle { text-decoration: none; white-space: nowrap; } -.tabTitleText { - display: none; -} .imgTabTitle { max-height: 14px; } diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php index 7b2205f7824..cfb1a46a1aa 100644 --- a/htdocs/user/virtualcard.php +++ b/htdocs/user/virtualcard.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2015 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -278,7 +278,7 @@ if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) { // Birth date print ''; - print $langs->trans("ShowOnVCard", $langs->transnoentitiesnoconv("Birthdate")); + print $langs->trans("ShowOnVCard", $langs->transnoentitiesnoconv("DateOfBirth")); print ''; print ajax_constantonoff("USER_PUBLIC_SHOW_BIRTH", array(), null, 0, 0, 1, 2, 0, 0, '', '', 'reposition', $object); print "\n"; diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php index a235d54d41f..41d1a43db13 100644 --- a/htdocs/viewimage.php +++ b/htdocs/viewimage.php @@ -193,20 +193,17 @@ if ($modulepart == 'fckeditor') { * View */ -if (GETPOST("cache", 'alpha')) { +$cachestring = GETPOST("cache", 'aZ09'); // May be 1, or an int, or a hash +if ($cachestring) { // Important: The following code is to avoid a page request by the browser and PHP CPU at each Dolibarr page access. // We are here when param cache=xxx to force a cache policy: // xxx=1 means cache of 3600s // xxx=abcdef or 123456789 means a cache of 1 week (the key will be modified to get break cache use) if (empty($dolibarr_nocache)) { - if (GETPOST('cache', 'alpha') != '1') { - $delaycache = 3600 * 24 * 7; - } else { - $delaycache = 3600; - } + $delaycache = ((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600'); header('Cache-Control: max-age='.$delaycache.', public, must-revalidate'); header('Pragma: cache'); // This is to avoid to have Pragma: no-cache set by proxy or web server - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $delaycache).' GMT'); // This is to avoid to have Expires set by proxy or web server + header('Expires: '.gmdate('D, d M Y H:i:s', time() + (int) $delaycache).' GMT'); // This is to avoid to have Expires set by proxy or web server } else { // If any cache on files were disable by config file (for test purpose) header('Cache-Control: no-cache'); diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php index 462b2bbe030..a61c29f5b1b 100644 --- a/htdocs/website/samples/wrapper.php +++ b/htdocs/website/samples/wrapper.php @@ -39,7 +39,6 @@ $limit = GETPOSTINT('limit'); if ($limit <= 0 || $limit > 100) { $limit = 20; } -$cachedelay = GETPOSTINT('cachedelay'); // The delay in second of the cache // Parameters for RSS $rss = GETPOST('rss', 'aZ09'); @@ -130,12 +129,13 @@ if (GETPOSTISSET('type')) { $original_file = str_replace("../", "/", $original_file); // Cache or not -$cachestring = GETPOST("cache", 'aZ09'); // May be 1, or an int, or a hash +$cachestring = GETPOST("cache", 'aZ09'); // May be 1, or an int (delay in second of the cache if < 999999, or a timestamp), or a hash if ($cachestring || image_format_supported($original_file) >= 0) { - // Important: Following code is to avoid page request by browser and PHP CPU at - // each Dolibarr page access. - header('Cache-Control: max-age='.((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600').', public, must-revalidate'); + // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. + $delaycache = GETPOSTINT('cachedelay') ? GETPOSTINT('cachedelay') : ((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600'); + header('Cache-Control: max-age='.$delaycache.', public, must-revalidate'); header('Pragma: cache'); // This is to avoid having Pragma: no-cache + header('Expires: '.gmdate('D, d M Y H:i:s', time() + (int) $delaycache).' GMT'); // This is to avoid to have Expires set by proxy or web server } $refname = basename(dirname($original_file)."/");