From 6f3cbe69e8731a5d0f8fbe7b0d3b1c1592486c3c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2020 19:40:58 +0100 Subject: [PATCH] Fix phpcs --- htdocs/core/class/html.form.class.php | 5 +++-- htdocs/core/lib/website2.lib.php | 17 ----------------- htdocs/societe/card.php | 16 ++++++++-------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 09cac93b0b2..4d1c573eedc 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -325,13 +325,14 @@ class Form * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...) * @return string HTML code for the edit of alternative language */ - public function widgetForTranslation($htmlname, $object, $perm, $typeofdata = 'string') { + public function widgetForTranslation($fieldname, $object, $perm, $typeofdata = 'string') + { global $conf, $langs; $result = ''; if (! empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) { - $result ='
'; + $result ='
'; $s=picto_from_langcode($conf->global->PDF_USE_ALSO_LANGUAGE_CODE); $result .= $s; diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index 9748632fb3f..0a80048cb5a 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -522,20 +522,3 @@ function showWebsiteTemplates(Website $website) print ''; } - - -/** - * Return HTML content to add structured data for an article, news or Blog Post. - * - * @return string HTML content - */ -function getRSSForBlogPosts() -{ - global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers. - - - - return $out; -} - - diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index d8c9ec9da70..22da0cd0545 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1258,7 +1258,7 @@ else { // Supplier print ''; - print ''.$form->editfieldkey('Vendor', 'fournisseur', '', $object, $permissiontoadd, 'string', '', 1).''; + print ''.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).''; $default = -1; if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1; print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ?GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0)); @@ -1270,7 +1270,7 @@ else print ''; if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire)) { - print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, $permissiontoadd); + print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0); } print ''; if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire)) @@ -1288,21 +1288,21 @@ else } // Status - print ''.$form->editfieldkey('Status', 'status', '', $object, $permissiontoadd).''; + print ''.$form->editfieldkey('Status', 'status', '', $object, 0).''; print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1); print ''; // Barcode if (!empty($conf->barcode->enabled)) { - print ''.$form->editfieldkey('Gencod', 'barcode', '', $object, $permissiontoadd).''; + print ''.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).''; print ''; print ''; } // Address print ''; - print $form->editfieldkey('Address', 'address', '', $object, $permissiontoadd); + print $form->editfieldkey('Address', 'address', '', $object, 0); print ''; print '