From 0ab330102f20249aa4373e3496938a514a212185 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 16 Oct 2023 02:50:05 +0200 Subject: [PATCH] Fix phpcs --- htdocs/admin/modules.php | 3 +-- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/tpl/contacts.tpl.php | 4 ++-- htdocs/core/tpl/login.tpl.php | 4 ++-- htdocs/core/tpl/objectline_create.tpl.php | 8 ++++---- htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/core/tpl/passwordreset.tpl.php | 2 +- .../test/phpunit/functionnal/MyModuleFunctionalTest.php | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 2314007b8c9..6fcd335e3d5 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -1157,8 +1157,7 @@ if ($mode == 'marketplace') { - - * Copyright (C) 2013-2015 Laurent Destailleur * Copyright (C) 2015-2016 Charlie BENKE - * Copyright (C) 2021 Frédéric France + * Copyright (C) 2021 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 @@ -176,7 +176,7 @@ if ($permission) { -"; diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 975aa4d952f..4ab2d41045d 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -115,7 +115,7 @@ if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) { // For example $conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND = 'https://source.unsplash.com/random' ?> - global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file=logos/'.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>> @@ -247,7 +247,7 @@ if (!empty($captcha)) { -element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines ?> trans('SupplierRef'); ?> - trans('VAT'); ?> @@ -846,13 +846,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) { ?> console.log("Countries are both IN and states are same, so we revert I into CS in default_vat_code="+default_vat_code); new_default_vat_code = default_vat_code.replace(/^I\-/, 'C+S-'); -country_code == 'IN' && !empty($object->thirdparty) && $object->thirdparty->country_code == 'IN' && $mysoc->state_code != $object->thirdparty->state_code) { // We are in India and states differs, we revert the vat code "CS-x" into "I-x" ?> console.log("Countries are both IN and states differs, so we revert CS into I in default_vat_code="+default_vat_code); new_default_vat_code = default_vat_code.replace(/^C\+S\-/, 'I-'); - if (new_default_vat_code != default_vat_code && jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val()) { @@ -1195,7 +1195,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) { setforpredef(); - + }); /* Function to set fields visibility after selecting a free product */ diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 8c7e14509e0..695168e20e8 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -179,7 +179,7 @@ if (!empty($captcha)) { - -