From 62cf3cdab4cd1c926a9e243024eadbdc5144fe6c Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Wed, 13 Jul 2022 16:43:24 +0200 Subject: [PATCH 001/183] initializing public interface for user to book --- htdocs/public/bookcal/booking.php | 602 ++++++++++++++++++++++++++++++ htdocs/public/bookcal/index.php | 26 ++ 2 files changed, 628 insertions(+) create mode 100644 htdocs/public/bookcal/booking.php create mode 100644 htdocs/public/bookcal/index.php diff --git a/htdocs/public/bookcal/booking.php b/htdocs/public/bookcal/booking.php new file mode 100644 index 00000000000..3020799c91e --- /dev/null +++ b/htdocs/public/bookcal/booking.php @@ -0,0 +1,602 @@ + + * Copyright (C) 2001-2002 Jean-Louis Bergamo + * Copyright (C) 2006-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 J. Fernando Lagrange + * Copyright (C) 2018-2019 Frédéric France + * Copyright (C) 2018 Alexandre Spangaro + * Copyright (C) 2021 Waël Almoman + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/public/partnership/new.php + * \ingroup member + * \brief Example of form to add a new member + */ + +use Stripe\Event; + +if (!defined('NOLOGIN')) { + define("NOLOGIN", 1); // This means this output page does not require to be logged. +} +if (!defined('NOCSRFCHECK')) { + define("NOCSRFCHECK", 1); // We accept to go on this page from external web site. +} +if (!defined('NOIPCHECK')) { + define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip +} +if (!defined('NOBROWSERNOTIF')) { + define('NOBROWSERNOTIF', '1'); +} +if (!defined('NOIPCHECK')) { + define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip +} + +// For MultiCompany module. +// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. +$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); +if (is_numeric($entity)) { + define("DOLENTITY", $entity); +} + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php'; +require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership_type.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; + +// Init vars +$errmsg = ''; +$num = 0; +$error = 0; +$backtopage = GETPOST('backtopage', 'alpha'); +$action = GETPOST('action', 'aZ09'); + +// Load translation files +$langs->loadLangs(array("main", "members", "companies", "install", "other")); + + +// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context +$hookmanager->initHooks(array('publicnewpartnershipcard', 'globalcard')); + +$extrafields = new ExtraFields($db); + +$object = new Partnership($db); + +$user->loadDefaultValues(); + + +/** + * Show header for new partnership + * + * @param string $title Title + * @param string $head Head array + * @param int $disablejs More content into html header + * @param int $disablehead More content into html header + * @param array $arrayofjs Array of complementary js files + * @param array $arrayofcss Array of complementary css files + * @return void + */ +function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '') +{ + global $user, $conf, $langs, $mysoc; + + top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers + + print ''; + + // Define urllogo + $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png'; + + if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) { + $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small); + } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) { + $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo); + } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) { + $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg'; + } + + print '
'; + + // Output html code for logo + if ($urllogo) { + print '
'; + print '
'; + print ''; + print '
'; + if (empty($conf->global->MAIN_HIDE_POWERED_BY)) { + print '
'.$langs->trans("PoweredBy").'
'; + } + print '
'; + } + + if (!empty($conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION)) { + print '
'; + print ''; + print '
'; + } + + print '
'; + + print '
'; +} + +/** + * Show footer for new member + * + * @return void + */ +function llxFooterVierge() +{ + print '
'; + + printCommonFooter('public'); + + print "\n"; + print "\n"; +} + + + +/* + * Actions + */ +$parameters = array(); +// Note that $action and $object may have been modified by some hooks +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); +if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} + +// Action called when page is submitted +if (empty($reshook) && $action == 'add') { + $error = 0; + $urlback = ''; + + $db->begin(); + + /*if (GETPOST('typeid') <= 0) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."
\n"; + }*/ + if (!GETPOST('lastname')) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."
\n"; + } + if (!GETPOST('firstname')) { + $error++; + $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n"; + } + if (empty(GETPOST('email'))) { + $error++; + $errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."
\n"; + } elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) { + $langs->load('errors'); + $error++; + $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."
\n"; + } + + $public = GETPOSTISSET('public') ? 1 : 0; + + if (!$error) { + //$partnership = new Partnership($db); + $event = new Event($db); + + + // We try to find the thirdparty or the member + if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') { + $partnership->fk_member = 0; + } elseif (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'member') { + $partnership->fk_soc = 0; + } + + $partnership->statut = -1; + $partnership->firstname = GETPOST('firstname'); + $partnership->lastname = GETPOST('lastname'); + $partnership->address = GETPOST('address'); + $partnership->zip = GETPOST('zipcode'); + $partnership->town = GETPOST('town'); + $partnership->email = GETPOST('email'); + $partnership->country_id = GETPOST('country_id', 'int'); + $partnership->state_id = GETPOST('state_id', 'int'); + //$partnership->typeid = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int'); + $partnership->note_private = GETPOST('note_private'); + + // Fill array 'array_options' with data from add form + $extrafields->fetch_name_optionals_label($partnership->table_element); + $ret = $extrafields->setOptionalsFromPost(null, $partnership); + if ($ret < 0) { + $error++; + } + + $result = $partnership->create($user); + if ($result > 0) { + require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; + $object = $partnership; + + /* + $partnershipt = new PartnershipType($db); + $partnershipt->fetch($object->typeid); + + if ($object->email) { + $subject = ''; + $msg = ''; + + // Send subscription email + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + // Set output language + $outputlangs = new Translate('', $conf); + $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang); + // Load traductions files required by page + $outputlangs->loadLangs(array("main", "members")); + // Get email content from template + $arraydefaultmessage = null; + $labeltouse = $conf->global->PARTNERSHIP_EMAIL_TEMPLATE_AUTOREGISTER; + + if (!empty($labeltouse)) { + $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse); + } + + if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) { + $subject = $arraydefaultmessage->topic; + $msg = $arraydefaultmessage->content; + } + + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); + complete_substitutions_array($substitutionarray, $outputlangs, $object); + $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs); + $texttosend = make_substitutions(dol_concatdesc($msg, $partnershipt->getMailOnValid()), $substitutionarray, $outputlangs); + + if ($subjecttosend && $texttosend) { + $moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n"; + + $result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader); + } + } + */ + + // Send email to the foundation to say a new member subscribed with autosubscribe form + if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) && + !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) { + // Define link to login card + $appli = constant('DOL_APPLICATION_TITLE'); + if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { + $appli = $conf->global->MAIN_APPLICATION_TITLE; + if (preg_match('/\d\.\d/', $appli)) { + if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) { + $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core + } + } else { + $appli .= " ".DOL_VERSION; + } + } else { + $appli .= " ".DOL_VERSION; + } + + $to = $partnership->makeSubstitution(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')); + $from = getDolGlobalString('PARTNERSHIP_MAIL_FROM'); + $mailfile = new CMailFile( + '['.$appli.'] '.getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT', 'Partnership request'), + $to, + $from, + $partnership->makeSubstitution(getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL')), + array(), + array(), + array(), + "", + "", + 0, + -1 + ); + + if (!$mailfile->sendfile()) { + dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR); + } + } + + if (!empty($backtopage)) { + $urlback = $backtopage; + } elseif (!empty($conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION)) { + $urlback = $conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION; + // TODO Make replacement of __AMOUNT__, etc... + } else { + $urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken(); + } + + if (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) && $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE != '-1') { + if ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'all') { + $urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); + if (price2num(GETPOST('amount', 'alpha'))) { + $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); + } + if (GETPOST('email')) { + $urlback .= '&email='.urlencode(GETPOST('email')); + } + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { + $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); + } else { + $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); + } + } + } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paybox') { + $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); + if (price2num(GETPOST('amount', 'alpha'))) { + $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); + } + if (GETPOST('email')) { + $urlback .= '&email='.urlencode(GETPOST('email')); + } + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { + $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); + } else { + $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); + } + } + } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paypal') { + $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); + if (price2num(GETPOST('amount', 'alpha'))) { + $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); + } + if (GETPOST('email')) { + $urlback .= '&email='.urlencode(GETPOST('email')); + } + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { + $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); + } else { + $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); + } + } + } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'stripe') { + $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.$partnership->ref; + if (price2num(GETPOST('amount', 'alpha'))) { + $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); + } + if (GETPOST('email')) { + $urlback .= '&email='.urlencode(GETPOST('email')); + } + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { + if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { + $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); + } else { + $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); + } + } + } else { + dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment"); + exit; + } + } + + if (!empty($entity)) { + $urlback .= '&entity='.$entity; + } + dol_syslog("partnership ".$partnership->ref." was created, we redirect to ".$urlback); + } else { + $error++; + $errmsg .= join('
', $partnership->errors); + } + } + + if (!$error) { + $db->commit(); + + Header("Location: ".$urlback); + exit; + } else { + $db->rollback(); + } +} + +// Action called after a submitted was send and member created successfully +// If PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url. +// backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url. +if (empty($reshook) && $action == 'added') { + llxHeaderVierge($langs->trans("NewPartnershipForm")); + + // Si on a pas ete redirige + print '

'; + print '
'; + print $langs->trans("NewPartnershipbyWeb"); + print '
'; + + llxFooterVierge(); + + exit; +} + + + +/* + * View + */ + +$form = new Form($db); +$formcompany = new FormCompany($db); + +$extrafields->fetch_name_optionals_label($partnership->table_element); // fetch optionals attributes and labels + + +llxHeaderVierge($langs->trans("NewPartnershipRequest")); + + +print load_fiche_titre($langs->trans("NewPartnershipRequest"), '', '', 0, 0, 'center'); + + +print '
'; +print '
'; + +print '
'; +if (!empty($conf->global->PARTNERSHIP_NEWFORM_TEXT)) { + print $langs->trans($conf->global->PARTNERSHIP_NEWFORM_TEXT)."
\n"; +} else { + print $langs->trans("NewPartnershipRequestDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."
\n"; +} +print '
'; + +dol_htmloutput_errors($errmsg); + +// Print form +print '
'."\n"; +print ''; +print ''; +print ''; + +print '
'; + +print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; +//print $langs->trans("FieldsWithIsForPublic",'**').'
'; + +print dol_get_fiche_head(''); + +print ''; + + +print ''."\n"; + +// Type +/* +if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) { + $listoftype = $partnershipt->liste_array(); + $tmp = array_keys($listoftype); + $defaulttype = ''; + $isempty = 1; + if (count($listoftype) == 1) { + $defaulttype = $tmp[0]; + $isempty = 0; + } + print ''."\n"; +} else { + $partnershipt->fetch($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE); + print ''; +} +*/ + +$partnershiptype = new PartnershipType($db); +$listofpartnershipobj = $partnershiptype->fetchAll('', '', 1000); +$listofpartnership = array(); +foreach ($listofpartnershipobj as $partnershipobj) { + $listofpartnership[$partnershipobj->id] = $partnershipobj->label; +} + +if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) { + print ''."\n"; +} else { + print $listofpartnership[$conf->global->PARTNERSHIP_NEWFORM_FORCETYPE]; + print ''; +} + +// Company +print ''."\n"; +// Lastname +print ''."\n"; +// Firstname +print ''."\n"; +// EMail +print ''."\n"; +// Address +print ''."\n"; +// Zip / Town +print ''; +// Country +print ''; +// State +if (empty($conf->global->SOCIETE_DISABLE_STATE)) { + print ''; +} +// Logo +//print ''."\n"; +// Other attributes +$tpl_context = 'public'; // define template context to public +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; +// Comments +print ''; +print ''; +print ''; +print ''."\n"; + +print "
'.$langs->trans("Type").' *'; + print $form->selectarray("typeid", $partnershipt->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty); + print '
'.$langs->trans('PartnershipType').' *'."\n"; + print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOST('partnershiptype', 'int') : 'ifone', 1); + print '
'.$langs->trans("Company").' *'; +print img_picto('', 'company', 'class="pictofixedwidth"'); +print '
'.$langs->trans("Lastname").' *
'.$langs->trans("Firstname").' *
'.$langs->trans("Email").' *'; +//print img_picto('', 'email', 'class="pictofixedwidth"'); +print '
'.$langs->trans("Address").''."\n"; +print '
'.$langs->trans('Zip').' / '.$langs->trans('Town').''; +print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1); +print ' / '; +print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1); +print '
'.$langs->trans('Country').''; +print img_picto('', 'country', 'class="pictofixedwidth"'); +$country_id = GETPOST('country_id', 'int'); +if (!$country_id && !empty($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE)) { + $country_id = getCountry($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs); +} +if (!$country_id && !empty($conf->geoipmaxmind->enabled)) { + $country_code = dol_user_country(); + //print $country_code; + if ($country_code) { + $new_country_id = getCountry($country_code, 3, $db, $langs); + //print 'xxx'.$country_code.' - '.$new_country_id; + if ($new_country_id) { + $country_id = $new_country_id; + } + } +} +$country_code = getCountry($country_id, 2, $db, $langs); +print $form->select_country($country_id, 'country_id'); +print '
'.$langs->trans('State').''; + if ($country_code) { + print $formcompany->select_state(GETPOST("state_id"), $country_code); + } + print '
'.$langs->trans("URLPhoto").'
'.$langs->trans("Comments").'
\n"; + +print dol_get_fiche_end(); + +// Save +print '
'; +print ''; +if (!empty($backtopage)) { + print '     '; +} +print '
'; + + +print "
\n"; +print "
"; +print '
'; + + +llxFooterVierge(); + +$db->close(); diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php new file mode 100644 index 00000000000..4071c62de1f --- /dev/null +++ b/htdocs/public/bookcal/index.php @@ -0,0 +1,26 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/public/members/index.php + * \ingroup core + * \brief A redirect page to an error + */ + +require '../../master.inc.php'; + +header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); From a8e6725bca50d1869d2f9f52fb908141626d2e08 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 21 Jul 2022 14:21:22 +0200 Subject: [PATCH 002/183] bookcal loading ... --- htdocs/public/bookcal/booking.php | 847 ++++++++++++++++++------------ 1 file changed, 516 insertions(+), 331 deletions(-) diff --git a/htdocs/public/bookcal/booking.php b/htdocs/public/bookcal/booking.php index 3020799c91e..0d39ebb13ed 100644 --- a/htdocs/public/bookcal/booking.php +++ b/htdocs/public/bookcal/booking.php @@ -60,6 +60,22 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php'; require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; +require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; +require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; // Init vars $errmsg = ''; @@ -75,9 +91,15 @@ $langs->loadLangs(array("main", "members", "companies", "install", "other")); // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context $hookmanager->initHooks(array('publicnewpartnershipcard', 'globalcard')); + +$object = new ActionComm($db); +$cactioncomm = new CActionComm($db); +$contact = new Contact($db); +$formfile = new FormFile($db); +$formactions = new FormActions($db); $extrafields = new ExtraFields($db); -$object = new Partnership($db); + $user->loadDefaultValues(); @@ -153,7 +175,6 @@ function llxFooterVierge() } - /* * Actions */ @@ -196,27 +217,27 @@ if (empty($reshook) && $action == 'add') { if (!$error) { //$partnership = new Partnership($db); - $event = new Event($db); + $events = new Events($db); // We try to find the thirdparty or the member if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') { - $partnership->fk_member = 0; + $event->fk_member = 0; } elseif (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'member') { - $partnership->fk_soc = 0; + $event->fk_soc = 0; } - $partnership->statut = -1; - $partnership->firstname = GETPOST('firstname'); - $partnership->lastname = GETPOST('lastname'); - $partnership->address = GETPOST('address'); - $partnership->zip = GETPOST('zipcode'); - $partnership->town = GETPOST('town'); - $partnership->email = GETPOST('email'); - $partnership->country_id = GETPOST('country_id', 'int'); - $partnership->state_id = GETPOST('state_id', 'int'); + $events->statut = -1; + $events->firstname = GETPOST('firstname'); + $events->lastname = GETPOST('lastname'); + $events->address = GETPOST('address'); + $events->zip = GETPOST('zipcode'); + $events->town = GETPOST('town'); + $events->email = GETPOST('email'); + $events->country_id = GETPOST('country_id', 'int'); + $events->state_id = GETPOST('state_id', 'int'); //$partnership->typeid = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int'); - $partnership->note_private = GETPOST('note_private'); + $event->note_private = GETPOST('note_private'); // Fill array 'array_options' with data from add form $extrafields->fetch_name_optionals_label($partnership->table_element); @@ -225,186 +246,23 @@ if (empty($reshook) && $action == 'add') { $error++; } - $result = $partnership->create($user); - if ($result > 0) { - require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; - $object = $partnership; - - /* - $partnershipt = new PartnershipType($db); - $partnershipt->fetch($object->typeid); - - if ($object->email) { - $subject = ''; - $msg = ''; - - // Send subscription email - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; - $formmail = new FormMail($db); - // Set output language - $outputlangs = new Translate('', $conf); - $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang); - // Load traductions files required by page - $outputlangs->loadLangs(array("main", "members")); - // Get email content from template - $arraydefaultmessage = null; - $labeltouse = $conf->global->PARTNERSHIP_EMAIL_TEMPLATE_AUTOREGISTER; - - if (!empty($labeltouse)) { - $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse); - } - - if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) { - $subject = $arraydefaultmessage->topic; - $msg = $arraydefaultmessage->content; - } - - $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); - complete_substitutions_array($substitutionarray, $outputlangs, $object); - $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs); - $texttosend = make_substitutions(dol_concatdesc($msg, $partnershipt->getMailOnValid()), $substitutionarray, $outputlangs); - - if ($subjecttosend && $texttosend) { - $moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n"; - - $result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader); - } - } - */ - - // Send email to the foundation to say a new member subscribed with autosubscribe form - if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) && - !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) { - // Define link to login card - $appli = constant('DOL_APPLICATION_TITLE'); - if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { - $appli = $conf->global->MAIN_APPLICATION_TITLE; - if (preg_match('/\d\.\d/', $appli)) { - if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) { - $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core - } - } else { - $appli .= " ".DOL_VERSION; - } - } else { - $appli .= " ".DOL_VERSION; - } - - $to = $partnership->makeSubstitution(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')); - $from = getDolGlobalString('PARTNERSHIP_MAIL_FROM'); - $mailfile = new CMailFile( - '['.$appli.'] '.getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT', 'Partnership request'), - $to, - $from, - $partnership->makeSubstitution(getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL')), - array(), - array(), - array(), - "", - "", - 0, - -1 - ); - - if (!$mailfile->sendfile()) { - dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR); - } - } - - if (!empty($backtopage)) { - $urlback = $backtopage; - } elseif (!empty($conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION)) { - $urlback = $conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION; - // TODO Make replacement of __AMOUNT__, etc... + if (!$error) { + $result = $event->create($user); + if ($result > 0) { + $db->commit(); + $urlback = DOL_URL_ROOT.'/public/partnership/new.php?action=confirm&id='.$event->id; + header('Location: '.$urlback); + exit; } else { - $urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken(); + $db->rollback(); + $errmsg = $event->error; + $error++; } - - if (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) && $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE != '-1') { - if ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'all') { - $urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); - if (price2num(GETPOST('amount', 'alpha'))) { - $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); - } - if (GETPOST('email')) { - $urlback .= '&email='.urlencode(GETPOST('email')); - } - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { - $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); - } else { - $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); - } - } - } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paybox') { - $urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); - if (price2num(GETPOST('amount', 'alpha'))) { - $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); - } - if (GETPOST('email')) { - $urlback .= '&email='.urlencode(GETPOST('email')); - } - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { - $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); - } else { - $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); - } - } - } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paypal') { - $urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref); - if (price2num(GETPOST('amount', 'alpha'))) { - $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); - } - if (GETPOST('email')) { - $urlback .= '&email='.urlencode(GETPOST('email')); - } - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { - $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); - } else { - $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); - } - } - } elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'stripe') { - $urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.$partnership->ref; - if (price2num(GETPOST('amount', 'alpha'))) { - $urlback .= '&amount='.price2num(GETPOST('amount', 'alpha')); - } - if (GETPOST('email')) { - $urlback .= '&email='.urlencode(GETPOST('email')); - } - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) { - if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { - $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, 2)); - } else { - $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN); - } - } - } else { - dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment"); - exit; - } - } - - if (!empty($entity)) { - $urlback .= '&entity='.$entity; - } - dol_syslog("partnership ".$partnership->ref." was created, we redirect to ".$urlback); } else { $error++; - $errmsg .= join('
', $partnership->errors); + $errmsg .= join('
', $event->errors); } } - - if (!$error) { - $db->commit(); - - Header("Location: ".$urlback); - exit; - } else { - $db->rollback(); - } } // Action called after a submitted was send and member created successfully @@ -436,165 +294,492 @@ $formcompany = new FormCompany($db); $extrafields->fetch_name_optionals_label($partnership->table_element); // fetch optionals attributes and labels -llxHeaderVierge($langs->trans("NewPartnershipRequest")); +llxHeaderVierge($langs->trans("NewBookingRequest")); -print load_fiche_titre($langs->trans("NewPartnershipRequest"), '', '', 0, 0, 'center'); +print load_fiche_titre($langs->trans("NewBookingRequest"), '', '', 0, 0, 'center'); -print '
'; -print '
'; -print '
'; -if (!empty($conf->global->PARTNERSHIP_NEWFORM_TEXT)) { - print $langs->trans($conf->global->PARTNERSHIP_NEWFORM_TEXT)."
\n"; -} else { - print $langs->trans("NewPartnershipRequestDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."
\n"; -} -print '
'; +// View -dol_htmloutput_errors($errmsg); +// Add new Events form +$contact = new Contact($db); -// Print form -print '
'."\n"; -print ''; -print ''; -print ''; - -print '
'; - -print '
'.$langs->trans("FieldsWithAreMandatory", '*').'
'; -//print $langs->trans("FieldsWithIsForPublic",'**').'
'; - -print dol_get_fiche_head(''); - -print ''; - - -print ''."\n"; - -// Type -/* -if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) { - $listoftype = $partnershipt->liste_array(); - $tmp = array_keys($listoftype); - $defaulttype = ''; - $isempty = 1; - if (count($listoftype) == 1) { - $defaulttype = $tmp[0]; - $isempty = 0; - } - print ''."\n"; -} else { - $partnershipt->fetch($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE); - print ''; -} -*/ - -$partnershiptype = new PartnershipType($db); -$listofpartnershipobj = $partnershiptype->fetchAll('', '', 1000); -$listofpartnership = array(); -foreach ($listofpartnershipobj as $partnershipobj) { - $listofpartnership[$partnershipobj->id] = $partnershipobj->label; -} - -if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) { - print ''."\n"; -} else { - print $listofpartnership[$conf->global->PARTNERSHIP_NEWFORM_FORCETYPE]; - print ''; -} - -// Company -print ''."\n"; -// Lastname -print ''."\n"; -// Firstname -print ''."\n"; -// EMail -print ''."\n"; -// Address -print ''."\n"; -// Zip / Town -print ''; -// Country -print ''; -// State -if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print 'global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").''; -print dol_get_fiche_end(); + // Full day + print ''; } -print ''; + + print ''; + + $datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep)); +if (GETPOST('datep', 'int', 1)) { + $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 'tzuser'); +} + $datef = ($datef ? $datef : $object->datef); +if (GETPOST('datef', 'int', 1)) { + $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuser'); +} +if (empty($datef) && !empty($datep)) { + if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) { + $datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h'); + } +} + + // Date start + print ''; + + print ''; + + // Assigned to + print ''; + + // Done by +if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) { + print ''; +} + + // Location +if (empty($conf->global->AGENDA_DISABLE_LOCATION)) { + print ''; +} + + // Status + print ''; + print ''; + +if (!empty($conf->categorie->enabled)) { + // Categories + print '"; +} + + print '
'.$langs->trans("Type").' *'; - print $form->selectarray("typeid", $partnershipt->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty); - print '
'.$langs->trans('PartnershipType').' *'."\n"; - print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOST('partnershiptype', 'int') : 'ifone', 1); - print '
'.$langs->trans("Company").' *'; -print img_picto('', 'company', 'class="pictofixedwidth"'); -print '
'.$langs->trans("Lastname").' *
'.$langs->trans("Firstname").' *
'.$langs->trans("Email").' *'; -//print img_picto('', 'email', 'class="pictofixedwidth"'); -print '
'.$langs->trans("Address").''."\n"; -print '
'.$langs->trans('Zip').' / '.$langs->trans('Town').''; -print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1); -print ' / '; -print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1); -print '
'.$langs->trans('Country').''; -print img_picto('', 'country', 'class="pictofixedwidth"'); -$country_id = GETPOST('country_id', 'int'); -if (!$country_id && !empty($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE)) { - $country_id = getCountry($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs); -} -if (!$country_id && !empty($conf->geoipmaxmind->enabled)) { - $country_code = dol_user_country(); - //print $country_code; - if ($country_code) { - $new_country_id = getCountry($country_code, 3, $db, $langs); - //print 'xxx'.$country_code.' - '.$new_country_id; - if ($new_country_id) { - $country_id = $new_country_id; - } + $socpeopleassigned = GETPOST("socpeopleassigned", 'array'); +if (!empty($socpeopleassigned[0])) { + $result = $contact->fetch($socpeopleassigned[0]); + if ($result < 0) { + dol_print_error($db, $contact->error); } } -$country_code = getCountry($country_id, 2, $db, $langs); -print $form->select_country($country_id, 'country_id'); -print '
'.$langs->trans('State').''; - if ($country_code) { - print $formcompany->select_state(GETPOST("state_id"), $country_code); - } + + dol_set_focus("#label"); + +if (!empty($conf->use_javascript_ajax)) { + print "\n".''."\n"; +} + print ''; + print ''; + print ''; + print ''; + print ''; +if ($backtopage) { + print ''; +} +if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) { + print ''; +} + +if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') { + print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda'); +} else { + print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda'); +} + + print dol_get_fiche_head(); + + print ''; + + // Type of event +if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) { + print ''; } -// Logo -//print ''."\n"; -// Other attributes -$tpl_context = 'public'; // define template context to public -include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php'; -// Comments -print ''; -print ''; -print ''; -print ''."\n"; -print "
'.$langs->trans("Type").''; + $default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT); + print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"'); + print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot print '
'.$langs->trans("URLPhoto").'
'.$langs->trans("Comments").'
\n"; + // Title + print '
'.$langs->trans("Date").''; -// Save -print '
'; -print ''; -if (!empty($backtopage)) { - print '     '; + // Recurring event + $userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0); +if ($userepeatevent) { + // Repeat + //print '
'; + print '        
'; + print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"'); + print ''; + $selectedrecurrulefreq = 'no'; + $selectedrecurrulebymonthday = ''; + $selectedrecurrulebyday = ''; + if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) { + $selectedrecurrulefreq = $reg[1]; + } + if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) { + $selectedrecurrulebymonthday = $reg[1]; + } + if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) { + $selectedrecurrulebyday = $reg[1]; + } + print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly'); + // If recurrulefreq is MONTHLY + print ''; + // If recurrulefreq is WEEKLY + print ''; + print ''; + print '
'; + //print '
'; + /* + print ''.$langs->trans("DateActionStart").''; + print ' - '; + print ''.$langs->trans("DateActionEnd").''; + */ + print ''; +if (GETPOST("afaire") == 1) { + print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo" +} else { + print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); +} + print '     -     '; +if (GETPOST("afaire") == 1) { + print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel'); +} else { + print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel'); +} + print '
 
'.$langs->trans("ActionAffectedTo").''; + $listofuserid = array(); + $listofcontactid = array(); + $listofotherid = array(); + +if (empty($donotclearsession)) { + $assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id); + if ($assignedtouser) { + $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first + } + //$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init + $listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init + $_SESSION['assignedtouser'] = json_encode($listofuserid); +} else { + if (!empty($_SESSION['assignedtouser'])) { + $listofuserid = json_decode($_SESSION['assignedtouser'], true); + } + $firstelem = reset($listofuserid); + if (isset($listofuserid[$firstelem['id']])) { + $listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing + } +} + print '
'; + print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid); + print '
'; + print '
'.$langs->trans("ActionDoneBy").''; + print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1); + print '
'.$langs->trans("Location").'
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; + $percent = $complete !=='' ? $complete : -1; +if (GETPOSTISSET('status')) { + $percent = GETPOST('status'); +} elseif (GETPOSTISSET('percentage')) { + $percent = GETPOST('percentage', 'int'); +} else { + if ($complete == '0' || GETPOST("afaire") == 1) { + $percent = '0'; + } elseif ($complete == 100 || GETPOST("afaire") == 2) { + $percent = 100; + } +} + $formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200'); + print '
'.$langs->trans("Categories").''; + $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1); + print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0); + print "
'; -print "
\n"; -print "
"; -print '
'; + print '

'; + + + print ''; + +if (!empty($conf->societe->enabled)) { + // Related company + print ''; + + // Related contact + print ''; +} + + // Project +if (!empty($conf->project->enabled)) { + $langs->load("projects"); + + $projectid = GETPOST('projectid', 'int'); + + print ''; + + print ''; +} + + // Object linked +if (!empty($origin) && !empty($originid)) { + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + + $hasPermissionOnLinkedObject = 0; + if ($user->hasRight($origin, 'read')) { + $hasPermissionOnLinkedObject = 1; + } + //var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject); + + if (! in_array($origin, array('societe', 'project', 'task', 'user'))) { + // We do not use link for object that already contains a hard coded field to make links with agenda events + print ''; + print ''; + } +} + + $reg = array(); +if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) { + $object->datep = dol_mktime(0, 0, 0, $reg[2], $reg[3], $reg[1]); +} + + // Priority +if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) { + print ''; +} + + // Description + print ''; + + // Other attributes + $parameters = array(); + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; +if (empty($reshook)) { + print $object->showOptionals($extrafields, 'create', $parameters); +} + + print '
'.$langs->trans("ActionOnCompany").''; + if (GETPOST('socid', 'int') > 0) { + $societe = new Societe($db); + $societe->fetch(GETPOST('socid', 'int')); + print $societe->getNomUrl(1); + print ''; + } else { + $events = array(); + $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); + //For external user force the company to user company + if (!empty($user->socid)) { + print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company($user->socid, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300'); + } else { + print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300'); + } + } + print '
'.$langs->trans("ActionOnContact").''; + $preselectedids = GETPOST('socpeopleassigned', 'array'); + if (GETPOST('contactid', 'int')) { + $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int'); + } + if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int'); + print img_picto('', 'contact', 'class="paddingrightonly"'); + print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid'); + print '
'.$langs->trans("Project").''; + print img_picto('', 'project', 'class="pictofixedwidth"'); + print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx'); + + print ' '; + print ''; + $urloption = '?action=create&donotclearsession=1'; + $url = dol_buildpath('comm/action/card.php', 2).$urloption; + + // update task list + print "\n".''."\n"; + + print '
'.$langs->trans("Task").''; + print img_picto('', 'projecttask', 'class="paddingrightonly"'); + $projectsListId = false; + if (!empty($projectid)) { + $projectsListId = $projectid; + } + + $tid = GETPOSTISSET("projecttaskid") ? GETPOST("projecttaskid", 'int') : (GETPOSTISSET("taskid") ? GETPOST("taskid", 'int') : ''); + + $formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId); + print '
'.$langs->trans("LinkedObject").''; + if ($hasPermissionOnLinkedObject) { + print dolGetElementUrl($originid, $origin, 1); + print ''; + print ''; + print ''; + print ''; + } else { + print ''; + } + print '
'.$langs->trans("Priority").''; + print ''; + print '
'.$langs->trans("Description").''; + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; + $doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%'); + $doleditor->Create(); + print '
'; + + +if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) { + //checkbox create reminder + print '
'; + print '
'; + print '

'; + + print ''; + + print "\n".''."\n"; +} + + print dol_get_fiche_end(); + + print $form->buttonsSaveCancel("Add"); + + print ""; llxFooterVierge(); From 1f864f5dd4782f9e5dee744a4886f24ad89ae414 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 18 Aug 2022 08:38:54 +0200 Subject: [PATCH 003/183] template 01 corrected and re-exported --- .../websites/website_template-style01.jpg | Bin 0 -> 20970 bytes .../websites/website_template-style01.zip | Bin 0 -> 12929 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.jpg create mode 100644 htdocs/install/doctemplates/websites/website_template-style01.zip diff --git a/htdocs/install/doctemplates/websites/website_template-style01.jpg b/htdocs/install/doctemplates/websites/website_template-style01.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5464bf5dd5d84809f8a943fa1f528290e1297537 GIT binary patch literal 20970 zcmeFZ1#o0bvKZQ895M5VS!&UUVZ=OQW@ct)W@e@lGcz+YGiyc+BkzW@FF z?eB1eU8kcfsWPi7@|;symE9jJA3Fdf2@!D-00;;G0P_0+e7pk)1#PTs?Ts89j0}nN z-H6O>jZEn5jST)Ieyjrm0pR~uAbuApC`c$MSQuz%7+6GDxZf8d1_Bbo?+*qV7AguV z78(g278V`}6)_Pp6_Az|$jikmCuarnKdRuP4}c5}Y6$TK41^c}iVOmV4DvAm!2dl0 zP*AWx2J`m<1q}fS1`Y!X^05Yh{u`rM_wUUAW({Kl#I(pYV#BL2{|{snTAEq}!^Q_| zZBRUoQvE*wZtTAQD%PO-iQZ^urleHI!q14(+vJD6i91%?;?IAS1T#B6Z)=AvOZ>6( z!o&RmIJQVg09(Csxr?=$>sC;W19p-hgFgaMbRb2`a!y3m|FJayayDf2nAaZbDrLOD zcf~_ZrsR0Y2I}_v>p#i;U-W<189-cxGVVXc(ggrexE-FG*CfJ1{<*7|e4b;{->P}s z%69-Djz5}X?3VUVgq5oPSq^0MREXr8ccpd)C;%ksjyGLsouW320qcpNa27i8pQY(E z8;`eHt}RO=T>%Kkh2Nw_-A!`G-qq^58r6kfeon25k_ke9KMp|r_IULuHnsm2$3yOPH7 ze{q^V7)t%e!5|Em@ao$(F-U#Kpg-xGf5YfV)L)UfFDS2;QQDeXa2?`m^kG#$FrnO> zimk!DXv+a8d1H%eE4j%vy#Vt^%n!@A+$1 zFkBq{xwwQKYwfOnX{&HHjKz9x<2*EHADEDw$F_Etqvt(f(6cSiribhr(ZxM7bC3`4JJ0(-p{lX~Iv_a(N zAa*%r|7(!Hflnm`fqzuP4~22Z|T|KVbY{(tp$!ytjw+OLjp1Av2JMQKB@+Su&b#tkh(?FK{ILjnQM!jXb@Xr>f zc3DTg4w!68ga7oZ_>=#is>mfPs#um<{1g+4Gk*kVeYJbN;`hAY8@v+6I|_qEe&CdVjJ0F7p3pjrb*_q@5p1Mp^&wR*v_6 z?A`V3Rp*_%X($l=NrejP^4iG4Iz99t@X;w*$MZ5jFLJxz`;*IbxIDccRE0CgQ?+iB zong>vR?Ua?Hy+4n^rq{i602&z;1q~euLy71!kVV(l z$(fjhk?9M&fFmX||5r9S`P>>(K}9>?KjS(O6u<}ISt2G{XC0KPSj(hLkD7cERL#wM zB>=0MV4d9_ZP0a#MU9S4tT@U;UW|!{N9`?$j;<1L858<|ra5m}@$9@_~4 z^YU{uhMTAHqE)n?-y=YUs){{P2SyI!DH`L6E3AK!61WzGixYcbQ&SK9z?Nzpn!1xv z59R3#bvZqmcUY_G89x}(i}xdL`SmV&K4w3?Av56h9Afn3>?N4maJ#i_{Tieq^8zp&PSfZ5g+mw~lN^;nD~# zYd3NYkk%kjq((k|k6Ey?8&tBa{Jf|tNyIOW7M!zu)1;wt09VB;%sYp*UovV~cgN~d zWL#!ZdKp!LAC~oo8~)5|)q9uM|mc!DC!p1!iWddUnPc?#>y`vD4K) z+2?indd`DjQm*M2YgKGRC6Dzb1Oo0}VW*z)>@FZ!^8>)30Y;z|$MMG8rsF(1b;1)q zdjT2VK$nJsSu=~w@OaorcXh3nNZIkEYC5V5Y()70sC#z1;7&EDpts_-_;;ve+PhfA-_VN90S2tm67*1Eqdvjs}7n_?*ync50-(6Jo@VpD)!RTt{2MIb-J|00X2&>%9w65OQ!dHU`w*6D?~q&wlL z;(Rphg>$l-4-vaK4_^iYI}E$R(u<$d+S|1eLG12}eCYsvvrZd~IRs3h?A#hoM-jCb^(Iw0sQJv8=`jJk_nk(zvJ+b?pj+ml3I( znnmX+D=C?=zduFekqZrWv1@l{)txyin}lE6C)%;Qf4lWU$)U4x9~&1f3jwHe2|E

By7XsB!O#Bi^UI-t&$S8{7`?MY(j*kjg# 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 literal 0 HcmV?d00001 diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip new file mode 100644 index 0000000000000000000000000000000000000000..52a4501cb7aef1048b70a0f95a29cdb8380a89c8 GIT binary patch literal 12929 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%0A3ygS=#5r^(@g*?uq57s5zX%ze>v%Xl*}B-G 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 JeiZ})`hSTB(vScE literal 0 HcmV?d00001 From 864367de16b923e4ffeeba55c074db3ba8014b9d Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 18 Aug 2022 08:41:53 +0200 Subject: [PATCH 004/183] removing useless push --- htdocs/public/bookcal/index.php | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 htdocs/public/bookcal/index.php diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php deleted file mode 100644 index 4071c62de1f..00000000000 --- a/htdocs/public/bookcal/index.php +++ /dev/null @@ -1,26 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/public/members/index.php - * \ingroup core - * \brief A redirect page to an error - */ - -require '../../master.inc.php'; - -header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); From 2b4278ded2e0f01c15ac98495203198eac7dbac5 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Thu, 18 Aug 2022 08:42:47 +0200 Subject: [PATCH 005/183] moving useless files --- htdocs/public/bookcal/booking.php | 787 ------------------------------ 1 file changed, 787 deletions(-) delete mode 100644 htdocs/public/bookcal/booking.php diff --git a/htdocs/public/bookcal/booking.php b/htdocs/public/bookcal/booking.php deleted file mode 100644 index 0d39ebb13ed..00000000000 --- a/htdocs/public/bookcal/booking.php +++ /dev/null @@ -1,787 +0,0 @@ - - * Copyright (C) 2001-2002 Jean-Louis Bergamo - * Copyright (C) 2006-2013 Laurent Destailleur - * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2012 J. Fernando Lagrange - * Copyright (C) 2018-2019 Frédéric France - * Copyright (C) 2018 Alexandre Spangaro - * Copyright (C) 2021 Waël Almoman - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/public/partnership/new.php - * \ingroup member - * \brief Example of form to add a new member - */ - -use Stripe\Event; - -if (!defined('NOLOGIN')) { - define("NOLOGIN", 1); // This means this output page does not require to be logged. -} -if (!defined('NOCSRFCHECK')) { - define("NOCSRFCHECK", 1); // We accept to go on this page from external web site. -} -if (!defined('NOIPCHECK')) { - define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip -} -if (!defined('NOBROWSERNOTIF')) { - define('NOBROWSERNOTIF', '1'); -} -if (!defined('NOIPCHECK')) { - define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip -} - -// For MultiCompany module. -// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retrieve from object ref and not from url. -$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); -if (is_numeric($entity)) { - define("DOLENTITY", $entity); -} - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php'; -require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership_type.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; -require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; -require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; -require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; -require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; - -// Init vars -$errmsg = ''; -$num = 0; -$error = 0; -$backtopage = GETPOST('backtopage', 'alpha'); -$action = GETPOST('action', 'aZ09'); - -// Load translation files -$langs->loadLangs(array("main", "members", "companies", "install", "other")); - - -// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context -$hookmanager->initHooks(array('publicnewpartnershipcard', 'globalcard')); - - -$object = new ActionComm($db); -$cactioncomm = new CActionComm($db); -$contact = new Contact($db); -$formfile = new FormFile($db); -$formactions = new FormActions($db); -$extrafields = new ExtraFields($db); - - - -$user->loadDefaultValues(); - - -/** - * Show header for new partnership - * - * @param string $title Title - * @param string $head Head array - * @param int $disablejs More content into html header - * @param int $disablehead More content into html header - * @param array $arrayofjs Array of complementary js files - * @param array $arrayofcss Array of complementary css files - * @return void - */ -function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '') -{ - global $user, $conf, $langs, $mysoc; - - top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers - - print ''; - - // Define urllogo - $urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png'; - - if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) { - $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small); - } elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) { - $urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.$mysoc->logo); - } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) { - $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg'; - } - - print '

'; - - // Output html code for logo - if ($urllogo) { - print '
'; - print '
'; - print ''; - print '
'; - if (empty($conf->global->MAIN_HIDE_POWERED_BY)) { - print '
'.$langs->trans("PoweredBy").'
'; - } - print '
'; - } - - if (!empty($conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION)) { - print '
'; - print ''; - print '
'; - } - - print '
'; - - print '
'; -} - -/** - * Show footer for new member - * - * @return void - */ -function llxFooterVierge() -{ - print '
'; - - printCommonFooter('public'); - - print "\n"; - print "\n"; -} - - -/* - * Actions - */ -$parameters = array(); -// Note that $action and $object may have been modified by some hooks -$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); -if ($reshook < 0) { - setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); -} - -// Action called when page is submitted -if (empty($reshook) && $action == 'add') { - $error = 0; - $urlback = ''; - - $db->begin(); - - /*if (GETPOST('typeid') <= 0) { - $error++; - $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."
\n"; - }*/ - if (!GETPOST('lastname')) { - $error++; - $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."
\n"; - } - if (!GETPOST('firstname')) { - $error++; - $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."
\n"; - } - if (empty(GETPOST('email'))) { - $error++; - $errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."
\n"; - } elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) { - $langs->load('errors'); - $error++; - $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."
\n"; - } - - $public = GETPOSTISSET('public') ? 1 : 0; - - if (!$error) { - //$partnership = new Partnership($db); - $events = new Events($db); - - - // We try to find the thirdparty or the member - if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') { - $event->fk_member = 0; - } elseif (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'member') { - $event->fk_soc = 0; - } - - $events->statut = -1; - $events->firstname = GETPOST('firstname'); - $events->lastname = GETPOST('lastname'); - $events->address = GETPOST('address'); - $events->zip = GETPOST('zipcode'); - $events->town = GETPOST('town'); - $events->email = GETPOST('email'); - $events->country_id = GETPOST('country_id', 'int'); - $events->state_id = GETPOST('state_id', 'int'); - //$partnership->typeid = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int'); - $event->note_private = GETPOST('note_private'); - - // Fill array 'array_options' with data from add form - $extrafields->fetch_name_optionals_label($partnership->table_element); - $ret = $extrafields->setOptionalsFromPost(null, $partnership); - if ($ret < 0) { - $error++; - } - - if (!$error) { - $result = $event->create($user); - if ($result > 0) { - $db->commit(); - $urlback = DOL_URL_ROOT.'/public/partnership/new.php?action=confirm&id='.$event->id; - header('Location: '.$urlback); - exit; - } else { - $db->rollback(); - $errmsg = $event->error; - $error++; - } - } else { - $error++; - $errmsg .= join('
', $event->errors); - } - } -} - -// Action called after a submitted was send and member created successfully -// If PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url. -// backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url. -if (empty($reshook) && $action == 'added') { - llxHeaderVierge($langs->trans("NewPartnershipForm")); - - // Si on a pas ete redirige - print '

'; - print '
'; - print $langs->trans("NewPartnershipbyWeb"); - print '
'; - - llxFooterVierge(); - - exit; -} - - - -/* - * View - */ - -$form = new Form($db); -$formcompany = new FormCompany($db); - -$extrafields->fetch_name_optionals_label($partnership->table_element); // fetch optionals attributes and labels - - -llxHeaderVierge($langs->trans("NewBookingRequest")); - - -print load_fiche_titre($langs->trans("NewBookingRequest"), '', '', 0, 0, 'center'); - - - -// View - -// Add new Events form -$contact = new Contact($db); - - $socpeopleassigned = GETPOST("socpeopleassigned", 'array'); -if (!empty($socpeopleassigned[0])) { - $result = $contact->fetch($socpeopleassigned[0]); - if ($result < 0) { - dol_print_error($db, $contact->error); - } -} - - dol_set_focus("#label"); - -if (!empty($conf->use_javascript_ajax)) { - print "\n".''."\n"; -} - print '
'; - print ''; - print ''; - print ''; - print ''; -if ($backtopage) { - print ''; -} -if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) { - print ''; -} - -if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') { - print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda'); -} else { - print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda'); -} - - print dol_get_fiche_head(); - - print ''; - - // Type of event -if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) { - print ''; -} - - // Title - print 'global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").''; - - // Full day - print ''; -} - - print ''; - - $datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep)); -if (GETPOST('datep', 'int', 1)) { - $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 'tzuser'); -} - $datef = ($datef ? $datef : $object->datef); -if (GETPOST('datef', 'int', 1)) { - $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuser'); -} -if (empty($datef) && !empty($datep)) { - if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) { - $datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h'); - } -} - - // Date start - print ''; - - print ''; - - // Assigned to - print ''; - - // Done by -if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) { - print ''; -} - - // Location -if (empty($conf->global->AGENDA_DISABLE_LOCATION)) { - print ''; -} - - // Status - print ''; - print ''; - -if (!empty($conf->categorie->enabled)) { - // Categories - print '"; -} - - print '
'.$langs->trans("Type").''; - $default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT); - print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"'); - print $formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot - print '
'.$langs->trans("Date").''; - - // Recurring event - $userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0); -if ($userepeatevent) { - // Repeat - //print '
'; - print '        
'; - print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"'); - print ''; - $selectedrecurrulefreq = 'no'; - $selectedrecurrulebymonthday = ''; - $selectedrecurrulebyday = ''; - if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) { - $selectedrecurrulefreq = $reg[1]; - } - if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) { - $selectedrecurrulebymonthday = $reg[1]; - } - if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) { - $selectedrecurrulebyday = $reg[1]; - } - print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly'); - // If recurrulefreq is MONTHLY - print ''; - // If recurrulefreq is WEEKLY - print ''; - print ''; - print '
'; - //print '
'; - /* - print ''.$langs->trans("DateActionStart").''; - print ' - '; - print ''.$langs->trans("DateActionEnd").''; - */ - print ''; -if (GETPOST("afaire") == 1) { - print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo" -} else { - print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); -} - print '     -     '; -if (GETPOST("afaire") == 1) { - print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel'); -} else { - print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel'); -} - print '
 
'.$langs->trans("ActionAffectedTo").''; - $listofuserid = array(); - $listofcontactid = array(); - $listofotherid = array(); - -if (empty($donotclearsession)) { - $assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id); - if ($assignedtouser) { - $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first - } - //$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init - $listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init - $_SESSION['assignedtouser'] = json_encode($listofuserid); -} else { - if (!empty($_SESSION['assignedtouser'])) { - $listofuserid = json_decode($_SESSION['assignedtouser'], true); - } - $firstelem = reset($listofuserid); - if (isset($listofuserid[$firstelem['id']])) { - $listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing - } -} - print '
'; - print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid); - print '
'; - print '
'.$langs->trans("ActionDoneBy").''; - print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1); - print '
'.$langs->trans("Location").'
'.$langs->trans("Status").' / '.$langs->trans("Percentage").''; - $percent = $complete !=='' ? $complete : -1; -if (GETPOSTISSET('status')) { - $percent = GETPOST('status'); -} elseif (GETPOSTISSET('percentage')) { - $percent = GETPOST('percentage', 'int'); -} else { - if ($complete == '0' || GETPOST("afaire") == 1) { - $percent = '0'; - } elseif ($complete == 100 || GETPOST("afaire") == 2) { - $percent = 100; - } -} - $formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200'); - print '
'.$langs->trans("Categories").''; - $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1); - print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0); - print "
'; - - - print '

'; - - - print ''; - -if (!empty($conf->societe->enabled)) { - // Related company - print ''; - - // Related contact - print ''; -} - - // Project -if (!empty($conf->project->enabled)) { - $langs->load("projects"); - - $projectid = GETPOST('projectid', 'int'); - - print ''; - - print ''; -} - - // Object linked -if (!empty($origin) && !empty($originid)) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - - $hasPermissionOnLinkedObject = 0; - if ($user->hasRight($origin, 'read')) { - $hasPermissionOnLinkedObject = 1; - } - //var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject); - - if (! in_array($origin, array('societe', 'project', 'task', 'user'))) { - // We do not use link for object that already contains a hard coded field to make links with agenda events - print ''; - print ''; - } -} - - $reg = array(); -if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) { - $object->datep = dol_mktime(0, 0, 0, $reg[2], $reg[3], $reg[1]); -} - - // Priority -if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) { - print ''; -} - - // Description - print ''; - - // Other attributes - $parameters = array(); - $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; -if (empty($reshook)) { - print $object->showOptionals($extrafields, 'create', $parameters); -} - - print '
'.$langs->trans("ActionOnCompany").''; - if (GETPOST('socid', 'int') > 0) { - $societe = new Societe($db); - $societe->fetch(GETPOST('socid', 'int')); - print $societe->getNomUrl(1); - print ''; - } else { - $events = array(); - $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); - //For external user force the company to user company - if (!empty($user->socid)) { - print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company($user->socid, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300'); - } else { - print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300'); - } - } - print '
'.$langs->trans("ActionOnContact").''; - $preselectedids = GETPOST('socpeopleassigned', 'array'); - if (GETPOST('contactid', 'int')) { - $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int'); - } - if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int'); - print img_picto('', 'contact', 'class="paddingrightonly"'); - print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid'); - print '
'.$langs->trans("Project").''; - print img_picto('', 'project', 'class="pictofixedwidth"'); - print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx'); - - print ' '; - print ''; - $urloption = '?action=create&donotclearsession=1'; - $url = dol_buildpath('comm/action/card.php', 2).$urloption; - - // update task list - print "\n".''."\n"; - - print '
'.$langs->trans("Task").''; - print img_picto('', 'projecttask', 'class="paddingrightonly"'); - $projectsListId = false; - if (!empty($projectid)) { - $projectsListId = $projectid; - } - - $tid = GETPOSTISSET("projecttaskid") ? GETPOST("projecttaskid", 'int') : (GETPOSTISSET("taskid") ? GETPOST("taskid", 'int') : ''); - - $formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId); - print '
'.$langs->trans("LinkedObject").''; - if ($hasPermissionOnLinkedObject) { - print dolGetElementUrl($originid, $origin, 1); - print ''; - print ''; - print ''; - print ''; - } else { - print ''; - } - print '
'.$langs->trans("Priority").''; - print ''; - print '
'.$langs->trans("Description").''; - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%'); - $doleditor->Create(); - print '
'; - - -if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) { - //checkbox create reminder - print '
'; - print '
'; - print '

'; - - print ''; - - print "\n".''."\n"; -} - - print dol_get_fiche_end(); - - print $form->buttonsSaveCancel("Add"); - - print "
"; - - -llxFooterVierge(); - -$db->close(); From 8da9d58b9f630aed68be98e771209bb2dc6db4e5 Mon Sep 17 00:00:00 2001 From: Quatadah Nasdami Date: Mon, 22 Aug 2022 15:48:12 +0200 Subject: [PATCH 006/183] sending mail is now managed in template 01 --- .../websites/website_template-style01.zip | Bin 12929 -> 13388 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip index 52a4501cb7aef1048b70a0f95a29cdb8380a89c8..7bca0dd1e21ef3ae5e6a4a6c0ba02f2808c961e9 100644 GIT binary patch delta 7077 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 delta 6758 zcmaJ`1yEhfvOTy5cReRSa1VNdy9WydcPBUm+c-gj9Uz1RcM>c(1lJ(J-8Hxc*H3u= zz5DO2UvH|q)}GqkYr3YYt5#3VMiZtDL%sP6yKHP8(qw^&+l#`RJSuXZ$*QL zhZ}^5;h&WF>F!(?lq1>uM5?Z?z7bcbP!^|Qs>YI-qh5 z+l;0V^2%(4(nt=E0;b#yxcV#{lbwG+l(*@=6Onn0tsV!w&P0CBL zD<~T3c0%pmQ=m}NFgC$x+}bZ zF|IRf9iY)T`gBjTvUzgmy+%Jy`;UU1*p6W=8kQS|A`)OaTTa%&-S>KE=6!e@!@IIr zNw-u*toaYh!xW5(^{<L_BEzO9b@WH z`&JjodbI%)gEHMlaR`E#y3|{>ZaYalNZCr(*w(wChH@OM)sUL~;)dj0Txm*s{mb6- z?$vVQ4Sgt^v~5lI&&8$@&uruH(>}M^=@wmyQqjDI4{{?hPU2ybOdtYzBqaiy1FjT3 zu$cBFZtCfCs)c6V z{^!8baSQw;Bgc-Af!s5zNvra?7rr~9U0Ihs=jP=ueS9^pLz(J4m?YRGU+L+eLv1o| zQWQ|A*%!4L2G1ERLxEaq>^TW43H00`^!R9ReZ1%%eN4Y+yWe3sX~q-_x*I)D&fw@nd06v;_`~!khiH|seS$8y<&UukKx~YD$s}#79nV) z$`dwW>cELWg&#2KV_np66BRiS!?PSkm3rr> z(OHW*iQE8|D+{bEE+f{^#;o2^3DYlCq;9Lz863>7j=qwBei{2__!=)fAIgHd50uJ#qTIOBiu+1=@ z9Oio~a){8brZuDLSNd{iCNLppHi&}&WF|HgY}p3?LMA5cNgIwaZR@RS{!nt8E6Ott z8Z}Quk2Ai5;`KI=wrmLmfsrO1PKKuo$0AlG(~pJ__nr5}MgJv3o*Vmb%h3tt4>e9~2i@89Q*jp##dQ_$cCvBc!Z9Orf zW^m>gPcPyM#?e^ik2aK|vXE_5Ox&L@e@jSh`WyyuoP`N)AkWZZOp_)JcP-dTc%q}> z!#kSBVG0|JnZ`19!a7Y~b-n_85T}TLnh5Ha?J;20hiMyo(ENt0tRrnNr0t6};T&1t zMq%DzY;q8dLh39zD_*iI+Q7@#@~5u`I9vv)HZ!R3YZdR@_%L&P!~ z8aLEb$ND`o`r1&xmFSLP;f(NyqNfvyeijCP=47>p>waaE#pC73`H2B2-HvxSl78YQ zzu^(f2U}E1?uze653APCDs5rKSg*(;jYYM5g;_w|UN{&f9#@?UTOwX&2$-uU8Z%zg zOmKeG9<_9M-}wU&QO;C)>V{SyvY#&cWO8&24^3BRuxI zva`Rx(ku?$diCQVPr!4|W>%h%W6lmtvI5C_mtsD$!{m(*;3TVefIjIFPwtN%ERL_t znQPAjR?%7^Vh6QWMrC=Y<-F!&LFfA(9#s+dKVMlNs1}RxMGee z7BsR+C&?;>Mmlt=`2BebZMmYK>OQ?ZN-ph7rs%4v?=i6bAvZKalB^@|eHp0Wn z8q+Av5<*Z#hZtCiJ|w}D`t~0SbiG0}FVum@=5inBA4s~aT6b+-a8)a3fK%~S#y?Wy z{%Qj$*;u0crPY@+vUM?_w*A!`Ha(SfsSXpySiI*v^fkJ107?#ZmuuP%ZZ4Q_CJeD7 z7mEq~m~XT$QmKKE#j73Tqieg6Mf7GuzhB*k%Qbgi+BXiR|A_eY$G`YcNaW5CxA}bD zqG0-U@?yHagJr87UB~&Hid8M2YC~=Y_UxK&J43}M1Pm-_h<8(+e^!Y1tOu|scxIxg z)3kGeo*2{Kh5rM=BWCl7RrAE88_l&=U{j2z_#AB{isaajPuqUy3Fo?d#fqA22W*35 zeC5?W$d=;icOlTPyVkW};v>FEIc|HB%FBi6Hs6)Y-tTaPKZ!Pfy|1=VSbHt#LF=jI zZBim`|3rXL%$}M|ZG?6pi9Z=I9!w#1WN{MD`>O2+Z-=&>u`Za_enG^7=!9l}nCwoo(Nt~kzQ#K$0w@E>PA~Dz20bL@p|5#CmF(p-3KUn@ zzWc#mh#i9m!UmX3(@w zqL-wQ!ldSWRTijF{ak7-Jo4OvRMu1MWW=?QVTf1-9+`Q)B#0EZXtX*#AK<}tP(+>;#D(2~iHxXgQic9r&cPo?fOX4Fj zKvF}*aIf#@Otb_1moqj5X~(Q|iJx~4%{l^o1d^6AFkz|aOSU~muR6b->#=+Ie``wA zKbjJ@MEVNvkBU6zpKwKj1A&y_K_D^^td)ZTNR3r+Xs5vmJ&$un`5?u|y2KL)(F6;K z6Tg7#TqXJNid1!bcCyR2;H9pVzJK!Yp|1!Fu~7EB3t=m2pf!g-r6?rP0a3sU;1Sh5 zz*7s6Eh>r}LT`J!RsL2K`Mu)XzV0{)=3?F;Pt+v`s@(Q#H~mG2uBu{NwWHf(_GQUj z;90o;LYv(UPEprscIU-hrL;7I_;lYZhZFoHs76|^RFko;mWp*#)yMH@LJPS7rtMg! zsBL(k`*`pZpMm|U?M8-LsvmycmSZBBI==~ZeVwc)M6ya5UJ&ybm}9V&4}}DsD)Hi& zDYl7c(;3vv_$T|dJ{c|letTZ|q2)?tfRk3zg78_ti61QOq`EaQJ@{L$4?bS z?=&ZHB#FEy0`62~P@KIxU3cUVrf$6U=BlGm7RG+&hms}&gv}GRw{F@f5>Z|tBi|PX zw`wy-4+Uf278p%rqJ^x08GoxRm1udC=%5!^i0;Y@8I8~=5YwP_kIlZ5GCMNzaldu) zbRtygT4j#tt!kBxptW(v*!muEAK7&7XRDv4Y_gN=wCASe93R}(rNJf6*e#OfD;rzU z3o#RipkfdJqFOm0pTut?{H7pGg;QV77-EE1XY9vSEA~Ng$=jyR4o+$FLtKc+*-Ph4 zGj+^MJW;l_K~-Y{3E5IHB0=CpZhIyjDrdPwM0eJ@TpU?j zRn?g)gG6nBxozxU^9CxvvU`ko(F-@DD9;ey=WZhgcpKbe;is~tkcs&X-I5B-iAPt* zHdn{4vaTWd%>MQlCM`tc(n77<47$(cl6K4+I)E>YBIJfn|K6`osQTa8YosAM*ZN!25+yeBcS~4^Zsk`P^xu}`007jF%s_T~xYWTAF)A^~+kz4i8er{!9 zH*V;dNT)&#lyz=*G1YlTLlu)`$aHSs4VrnO zf^T(e$CiHZx0-=9(^&s085lD->JjU~YmX(A34y@@e@aM{M#Q@b6$Dy`fP(?w55>XyF_B( z3{c@*rAMccgNr1dVNg6N=axQpmRawi3izqc27H-7TktwUebb!%0@*UZ%n->LvC93r zo3FdMCZyK(Tt~*GeTFf~swSYNd`W{F3yLu%`oJ!c%#_XP%Tnz{4G< zVgD>CQMpGL{t%JVs{cg&!qLZX{JYOLy_a;dTmh`MHGu7%&)W%`>Otkban}55R^X=M zIly&WI9)ntF(~VXV$*<9wHK873)WZ1c#gd-bh&=xRPrsc<&M{`A$n#HqjL7ps-s^O z6;i~*9X1(L`nt5|?$oq^g^7q1hIeM!^`?C7U~N13a}U4Na}UIJK?(ci#)=IvhPNH5 za-d+lTFvLvVoi&pESKa>4zn7l5zvvEafIi`K8BJg zk3+v6BWM=5SmfNMNGG={FC(A*K5I**fduzdzNe}X@wJLWf@xa95xTGxXMpDnCgLcr zsg_1`{22isg7?#`*=wPk%jIvUcP0(uBDvemRjafMe!z?ZARrQ%Zm6nr3#_W|!O#|J zu1a0W9I%zo-9>sBT0uwbR-{?X~tuUWd>Nhb={e&Gvg>h;%cR?ypK zoin^kHsOf<7&uwX_v`5ad%F_}Jkoo2@r^)XKHMQhPt?$}L&G~EmH|NAfdQFH{*8u( z>3a`W`V&U4khoZDWO|d$GAkbB>hBsuoiUAqk^$w5Jkl}iVDYY?Wovu9)blic>RHzX zeP?{-RcR~gNQQz5Pr(?@l7yjIC-6;-KFOL$@O*9o8eUj723V7CXx)Q_RywZ_r@IH7 zP7`Ad=(E0pMN`~|)d5ka7Lkp)QW9y^lnb9)m{Hds?H+CbQ^YG~_97*y;@<2O^*c2yyxX_^ zN>cDb*}2lB?Lrl}$SEsrBTH1gK;-V)Oet}8i<3qotR^#dS`?l~Xs^WxWqYD6+u_O1 z6`L|%o!Z)hyFP<{&IE2(^cZ*W-%3Q1tm2dwq-hx1gGCc$4m7i@*4_*@tfm`V63ESb zZq0>n%CW=#^xTtVj=5O2dqr}#X~1*9Q4~}EdcJ$Pyw3rs>r!;L8GG{0_O~)S^n>hM z9tPHgN+tf0QU14Y_$Fkc*pMk+@>8T~QW8L#et%?>6hdZJ$iSu&{+dLfq@y7mWU zleLRwYOoaz!beR3R;UG;blXUWBLe)cFnZcI{-1kk&#Geb%O8TRfEE8_4mr;p)I})B?P;hpDiZh5v*DAT*ydpmI2+ zFzXt2gPqLitS)i%s~?*%c|(U=%Ire~)+Cu|(%|n4ZDVoj_8*XU-zSt=(lQ*n5+auo zPvLkB@?N5|yraDlqOu~5eQJTx(&tuEPH)g$Hg*8{$PsVm6jrF&mR~(*iFTiBIY{r7 zY*5ZI9PXk_-T7Tp_Dj;GQWH-lGoX1h`Fu2s*zs&xvS_j>$U9sD>v|RnO#Mz4eevm_axMNh#gu^=?=sx%z%p=T2B_wun+?? zrD+}QcV0ZXx%G+kRcE;cLamj&u^kC) z-xO(==aw0^tW1Gl2R9BnCy4B_!T8^J!O`?H$qd|SL7(yZ)wMQWam$UiLpNLXGAoq( zse6geUs1%f5eE*~as9YIe;O???@6bf**&ior=!FEk+O~0ozT0776)2eE>wu9zVYK! ztEb+5@})=?vbs`t*nI>7^lBj7$4*9kk?1pY0L9-j5#A9T@MHprtcN@HVq#2;+j zk9f~U_lVEfxgJrEo%azF*+m|4l3nbd699S+0h&LG3Ud4vj^RN`(LWf$gZ;HCNnij6 zOq0AkY)ihYs*x$?S5F!z+-%=E$g6R2AUh2|$155s$s2Caot^)6~Q6`9t4G z`hUYg`{Xcyf*j_+iTQXC+rL{R2F{|6qSl9|~LIeELXw z_Uui#-ot<62P1s2zg7Va>?zmN$19TKB8TIHng8!Dl8YRk3IZ#GP}%h!%hC8iv{ uZ%juluuSg95fH4Gn_Tc2>wlPRT>dM~U$^roAr)2_HP18Tz=v=U=zjnSKRu=Z From 2b9350cd098a4259ae4b30c04fead80a547f1731 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:51:13 +0200 Subject: [PATCH 007/183] Update productcustomerprice.class.php fetchAll --- htdocs/product/class/productcustomerprice.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index ed003d85667..ff000462567 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -356,7 +356,7 @@ class Productcustomerprice extends CommonObject * @param array $filter Filter for select * @return int <0 if KO, >0 if OK */ - public function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array()) + public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array()) { // phpcs:enable global $langs; @@ -421,7 +421,7 @@ class Productcustomerprice extends CommonObject $sql .= $this->db->plimit($limit + 1, $offset); } - dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); + dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { $this->lines = array(); @@ -832,7 +832,7 @@ class Productcustomerprice extends CommonObject 't.fk_product' => $this->fk_product, 't.fk_soc' => $obj->rowid ); - $result = $prodsocprice->fetch_all('', '', 0, 0, $filter); + $result = $prodsocprice->fetchAll('', '', 0, 0, $filter); if ($result < 0) { $error++; $this->error = $prodsocprice->error; From e96eee56b0e3cc2c50408072fd7c1c4d4d496acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 10 Sep 2022 13:55:40 +0200 Subject: [PATCH 008/183] sample deprecated function --- htdocs/commande/card.php | 2 +- htdocs/core/class/commonobject.class.php | 2 -- .../class/productcustomerprice.class.php | 22 ++++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index d6a4aead2ec..adc4b5b04aa 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -789,7 +789,7 @@ if (empty($reshook)) { $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result >= 0) { if (count($prodcustprice->lines) > 0) { $pu_ht = price($prodcustprice->lines[0]->price); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 8be014b8959..05a828417b8 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1534,7 +1534,6 @@ abstract class CommonObject } } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** * Return array with list of possible values for type of contacts * @@ -1548,7 +1547,6 @@ abstract class CommonObject */ public function listeTypeContacts($source = 'internal', $option = 0, $activeonly = 0, $code = '', $element = '', $excludeelement = '') { - // phpcs:enable global $langs, $conf; $langs->loadLangs(array('bills', 'contracts', 'interventions', 'orders', 'projects', 'propal', 'ticket', 'agenda')); diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index ff000462567..197816f48ca 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -354,11 +354,31 @@ class Productcustomerprice extends CommonObject * @param int $limit page * @param int $offset offset * @param array $filter Filter for select + * @deprecated since dolibarr v17 use fetchAll * @return int <0 if KO, >0 if OK */ + public function fetch_all($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array()) + { + // phpcs:enable + + dol_syslog(get_class($this)."::fetch_all is deprecated, use fetchAll instead", LOG_NOTICE); + + return $this->fetchAll($sortorder, $sortfield, $limit, $offset, $filter); + } + + /** + * Load all customer prices in memory from database + * + * @param string $sortorder order + * @param string $sortfield field + * @param int $limit page + * @param int $offset offset + * @param array $filter Filter for select + * @return int <0 if KO, >0 if OK + * @since dolibarr v17 + */ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array()) { - // phpcs:enable global $langs; if (empty($sortfield)) { From 705b436494fcd84f5ee3480fbeee6d0a17b76a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 10 Sep 2022 14:03:47 +0200 Subject: [PATCH 009/183] replace other deprecated --- htdocs/comm/propal/card.php | 2 +- htdocs/comm/propal/class/propal.class.php | 2 +- htdocs/contrat/card.php | 2 +- htdocs/core/lib/pdf.lib.php | 2 +- htdocs/cron/class/cronjob.class.php | 2 +- htdocs/product/ajax/products.php | 2 +- htdocs/product/card.php | 2 +- htdocs/product/class/api_products.class.php | 2 +- htdocs/product/class/product.class.php | 2 +- htdocs/product/price.php | 4 ++-- htdocs/resource/class/dolresource.class.php | 2 +- htdocs/resource/list.php | 2 +- htdocs/societe/price.php | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index c4f620f6686..7b491e71a23 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1027,7 +1027,7 @@ if (empty($reshook)) { $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { // If there is some prices specific to the customer if (count($prodcustprice->lines) > 0) { diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 4c4a0a6c19a..8101177f412 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1412,7 +1412,7 @@ class Propal extends CommonObject } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { $prodcustprice = new Productcustomerprice($this->db); $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $objsoc->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { // If there is some prices specific to the customer if (count($prodcustprice->lines) > 0) { diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 9cbe8b5c686..6dbc879d4e3 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -498,7 +498,7 @@ if (empty($reshook)) { $filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { $pu_ht = price($prodcustprice->lines[0]->price); diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 3b0c2250c49..016d9ea99e3 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1567,7 +1567,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $productCustomerPriceStatic = new Productcustomerprice($db); $filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid); - $nbCustomerPrices = $productCustomerPriceStatic->fetch_all('', '', 1, 0, $filter); + $nbCustomerPrices = $productCustomerPriceStatic->fetchAll('', '', 1, 0, $filter); if ($nbCustomerPrices > 0) { $productCustomerPrice = $productCustomerPriceStatic->lines[0]; diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 033e6512bd8..7fb3539eb91 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -576,7 +576,7 @@ class Cronjob extends CommonObject $sql .= " WHERE ".implode(' AND ', $sqlwhere); } - dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); + dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { $num = $this->db->num_rows($resql); diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index 0e606932ce2..e2768ba8ccb 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -190,7 +190,7 @@ if ($action == 'fetch' && !empty($id)) { $filter = array('t.fk_product' => $object->id, 't.fk_soc' => $socid); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { $found = true; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 17387e3948d..7d542316ccc 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1035,7 +1035,7 @@ if (empty($reshook)) { $filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { $pu_ht = price($prodcustprice->lines [0]->price); diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php index 1c17deae602..91a55b4ca30 100644 --- a/htdocs/product/class/api_products.class.php +++ b/htdocs/product/class/api_products.class.php @@ -670,7 +670,7 @@ class Products extends DolibarrApi if ($thirdparty_id) { $filter['t.fk_soc'] .= $thirdparty_id; } - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); } if (empty($prodcustprice->lines)) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 360709dc5a0..925ac9dbbce 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1850,7 +1850,7 @@ class Product extends CommonObject $filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id); - $result = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $result = $prodcustprice->fetchAll('', '', 0, 0, $filter); if ($result) { if (count($prodcustprice->lines) > 0) { $pu_ht = price($prodcustprice->lines[0]->price); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 341b8a56e62..19d2f388ce6 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -2213,10 +2213,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Count total nb of records $nbtotalofrecords = ''; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { - $nbtotalofrecords = $prodcustprice->fetch_all($sortorder, $sortfield, 0, 0, $filter); + $nbtotalofrecords = $prodcustprice->fetchAll($sortorder, $sortfield, 0, 0, $filter); } - $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); + $result = $prodcustprice->fetchAll($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); if ($result < 0) { setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors'); } diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 46371fead0f..3e1a2615cd9 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -527,7 +527,7 @@ class Dolresource extends CommonObject if ($limit) { $sql .= $this->db->plimit($limit, $offset); } - dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG); + dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); $this->lines = array(); $resql = $this->db->query($sql); diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 1ef64555133..d67f55f51f2 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -168,7 +168,7 @@ if ($search_type != '') { } // Including the previous script generate the correct SQL filter for all the extrafields -// we are playing with the behaviour of the Dolresource::fetch_all() by generating a fake +// we are playing with the behaviour of the Dolresource::fetchAll() by generating a fake // extrafields filter key to make it works $filter['ef.resource'] = $sql; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index a9f17f4b50a..12d7a7d62fb 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -532,10 +532,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { // Count total nb of records $nbtotalofrecords = ''; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { - $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter); + $nbtotalofrecords = $prodcustprice->fetchAll('', '', 0, 0, $filter); } - $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); + $result = $prodcustprice->fetchAll($sortorder, $sortfield, $conf->liste_limit, $offset, $filter); if ($result < 0) { setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors'); } From edef39bed984a9c01848593e3a5e0d03dffff9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 14 Sep 2022 09:01:56 +0200 Subject: [PATCH 010/183] strftime is deprecated in php8.1 --- .../prelevement/class/bonprelevement.class.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index d87317e2420..9a1789dd49b 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -419,8 +419,8 @@ class BonPrelevement extends CommonObject } else { $paiement = new Paiement($this->db); } - $paiement->datepaye = $date; - $paiement->amounts = $cursoramounts; // Array with detail of dispatching of payments for each invoice + $paiement->datepaye = $date; + $paiement->amounts = $cursoramounts; // Array with detail of dispatching of payments for each invoice if ($this->type == 'bank-transfer') { $paiement->paiementid = 2; @@ -766,8 +766,8 @@ class BonPrelevement extends CommonObject $datetimeprev = $executiondate; } - $month = strftime("%m", $datetimeprev); - $year = strftime("%Y", $datetimeprev); + $month = date("%m", $datetimeprev); + $year = date("%Y", $datetimeprev); $this->invoice_in_error = array(); $this->thirdparty_in_error = array(); @@ -1746,8 +1746,8 @@ class BonPrelevement extends CommonObject // Date d'echeance C1 fputs($this->file, " "); - fputs($this->file, strftime("%d%m", $this->date_echeance)); - fputs($this->file, substr(strftime("%y", $this->date_echeance), 1)); + fputs($this->file, date("%d%m", $this->date_echeance)); + fputs($this->file, substr(date("%y", $this->date_echeance), 1)); // Raison Sociale Destinataire C2 @@ -1972,8 +1972,8 @@ class BonPrelevement extends CommonObject // Date d'echeance C1 fputs($this->file, " "); - fputs($this->file, strftime("%d%m", $this->date_echeance)); - fputs($this->file, substr(strftime("%y", $this->date_echeance), 1)); + fputs($this->file, date("%d%m", $this->date_echeance)); + fputs($this->file, substr(date("%y", $this->date_echeance), 1)); // Raison Sociale C2 From 9f7c17333b62af9e07360472b59591716e0686ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 21 Sep 2022 08:44:15 +0200 Subject: [PATCH 011/183] Update bonprelevement.class.php --- .../prelevement/class/bonprelevement.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 9a1789dd49b..464051926f2 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -22,9 +22,9 @@ */ /** - * \file htdocs/compta/prelevement/class/bonprelevement.class.php - * \ingroup prelevement - * \brief File of withdrawal receipts class + * \file htdocs/compta/prelevement/class/bonprelevement.class.php + * \ingroup prelevement + * \brief File of withdrawal receipts class */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; @@ -760,14 +760,14 @@ class BonPrelevement extends CommonObject $error = 0; - $datetimeprev = time(); + $datetimeprev = dol_now('gmt'); //Choice the date of the execution direct debit if (!empty($executiondate)) { $datetimeprev = $executiondate; } - $month = date("%m", $datetimeprev); - $year = date("%Y", $datetimeprev); + $month = dol_print_date("%m", $datetimeprev, 'gmt'); + $year = dol_print_date("%Y", $datetimeprev, 'gmt'); $this->invoice_in_error = array(); $this->thirdparty_in_error = array(); From 744d1b0218f3fc318f51d4bdfaba0644fb67a619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 21 Sep 2022 21:52:39 +0200 Subject: [PATCH 012/183] Update bonprelevement.class.php --- htdocs/compta/prelevement/class/bonprelevement.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 464051926f2..a0beccfaff1 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1746,8 +1746,8 @@ class BonPrelevement extends CommonObject // Date d'echeance C1 fputs($this->file, " "); - fputs($this->file, date("%d%m", $this->date_echeance)); - fputs($this->file, substr(date("%y", $this->date_echeance), 1)); + fputs($this->file, dol_print_date("%d%m", $this->date_echeance, 'gmt')); + fputs($this->file, substr(dol_print_date("%y", $this->date_echeance, 'gmt'), 1)); // Raison Sociale Destinataire C2 @@ -1972,8 +1972,8 @@ class BonPrelevement extends CommonObject // Date d'echeance C1 fputs($this->file, " "); - fputs($this->file, date("%d%m", $this->date_echeance)); - fputs($this->file, substr(date("%y", $this->date_echeance), 1)); + fputs($this->file, dol_print_date("%d%m", $this->date_echeance, 'gmt')); + fputs($this->file, substr(dol_print_date("%y", $this->date_echeance, 'gmt'), 1)); // Raison Sociale C2 From 1ab58434c2198713f6b2eafc1c2dfc013e736ae7 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 17:41:42 +0200 Subject: [PATCH 013/183] update code toward php8 compliance --- htdocs/accountancy/admin/fiscalyear_card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index d798b6baa5f..89ed7b538ba 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -35,7 +35,7 @@ $langs->loadLangs(array("admin", "compta")); if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->fiscalyear->write)) { +if (!$user->hasRight('accounting', 'fiscalyear', 'write')) { accessforbidden(); } From 608dda677aa77865ff617256bc077b931c8b27e2 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 17:44:29 +0200 Subject: [PATCH 014/183] update code toward php8 compliance --- htdocs/accountancy/admin/fiscalyear.php | 2 +- htdocs/accountancy/admin/fiscalyear_info.php | 2 +- htdocs/accountancy/admin/productaccount.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 301a3def70e..27226d388f6 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -53,7 +53,7 @@ $langs->loadLangs(array("admin", "compta")); if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->fiscalyear->write)) { // If we can read accounting records, we should be able to see fiscal year. +if (!$user->hasRight('accounting', 'fiscalyear', 'write')) { // If we can read accounting records, we should be able to see fiscal year. accessforbidden(); } diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php index 1cc6fcba958..bb265c89ecf 100644 --- a/htdocs/accountancy/admin/fiscalyear_info.php +++ b/htdocs/accountancy/admin/fiscalyear_info.php @@ -34,7 +34,7 @@ $langs->loadLangs(array("admin", "compta")); if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->fiscalyear->write)) { +if (!$user->hasRight('accounting', 'fiscalyear', 'write')) { accessforbidden(); } diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 9f86922aa5c..018a0cfd5e8 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -45,7 +45,7 @@ $langs->loadLangs(array("companies", "compta", "accountancy", "products")); if (!isModEnabled('accounting')) { accessforbidden(); } -if (empty($user->rights->accounting->bind->write)) { +if (!$user->hasRight('accounting', 'bind', 'write')) { accessforbidden(); } From c0ca27547027c7c5f9f963fe339cb6165bf88d59 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 17:51:43 +0200 Subject: [PATCH 015/183] update code toward php8 compliance --- htdocs/accountancy/bookkeeping/balance.php | 2 +- htdocs/accountancy/bookkeeping/card.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index cb479a1dc59..d2b1aaa3348 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -150,7 +150,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index e120606b927..692d70f4b68 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -86,7 +86,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index c374f5ba9fe..442a70600e5 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -155,7 +155,7 @@ $hookmanager->initHooks(array('bookkeepinglist')); $formaccounting = new FormAccounting($db); $form = new Form($db); -if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export) { +if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->hasRight('accounting', 'mouvements', 'export')) { if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start')) { $query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; $query .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1"; @@ -221,7 +221,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } @@ -434,7 +434,7 @@ if (empty($reshook)) { $param .= '&search_import_key='.urlencode($search_import_key); } - //if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) { + //if ($action == 'delbookkeepingyearconfirm' && !$user->hasRight('accounting', 'mouvements', 'supprimer_tous')) { // $delmonth = GETPOST('delmonth', 'int'); // $delyear = GETPOST('delyear', 'int'); // if ($delyear == -1) { @@ -486,7 +486,7 @@ if (empty($reshook)) { $uploaddir = $conf->societe->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; - if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->rights->accounting->mouvements->supprimer) { + if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->hasRight('accounting', 'mouvements', 'supprimer')) { $nbok = 0; foreach ($toselect as $toselectid) { $result = $object->fetch($toselectid); @@ -522,7 +522,7 @@ if (empty($reshook)) { } // others mass actions - if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) { + if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) { if ($massaction == 'lettering') { $lettering = new Lettering($db); $nb_lettering = $lettering->bookkeepingLetteringAll($toselect); @@ -652,7 +652,7 @@ if (!empty($sortfield)) { // Export into a file with format defined into setup (FEC, CSV, ...) // Must be after definition of $sql -if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->export) { +if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements', 'export')) { // TODO Replace the fetchAll to get all ->line followed by call to ->export(). It consumes too much memory on large export. // Replace this with the query($sql) and loop on each line to export them. $result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter, 'AND', (empty($conf->global->ACCOUNTING_REEXPORT) ? 0 : 1)); @@ -852,7 +852,7 @@ if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting- $arrayofmassactions['preunlettering'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('Unlettering'); } */ -if ($user->rights->accounting->mouvements->supprimer) { +if ($user->hasRight('accounting', 'mouvements', 'supprimer')) { $arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); } if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunlettering', 'predeletebookkeepingwriting'))) { @@ -888,8 +888,8 @@ if (empty($reshook)) { } $newcardbutton .= ''.$langs->trans("IncludeDocsAlreadyExported").''; - if (!empty($user->rights->accounting->mouvements->export)) { - $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file&token='.newToken().($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export); + if ($user->hasRight('accounting', 'mouvements', 'export')) { + $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file&token='.newToken().($param ? '&'.$param : ''), $user->hasRight('accounting', 'mouvements', 'export')); } $newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); @@ -900,7 +900,7 @@ if (empty($reshook)) { if (!empty($socid)) { $url .= '&socid='.$socid; } - $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer); + $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->hasRight('accounting', 'mouvements', 'creer')); } print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1); From 7d018797d07466baae7d35a23eef81bb7d87d438 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 17:55:06 +0200 Subject: [PATCH 016/183] update code toward php8 compliance --- htdocs/accountancy/bookkeeping/listbyaccount.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index e417f21832c..063f5e95ba8 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -194,7 +194,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } @@ -401,7 +401,7 @@ if (empty($reshook)) { $uploaddir = $conf->societe->dir_output; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; - if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->rights->accounting->mouvements->supprimer) { + if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && !$user->hasRight('accounting', 'mouvements', 'supprimer')) { $nbok = 0; foreach ($toselect as $toselectid) { $result = $object->fetch($toselectid); @@ -437,7 +437,7 @@ if (empty($reshook)) { } // others mass actions - if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) { + if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) { if ($massaction == 'lettering') { $lettering = new Lettering($db); $nb_lettering = $lettering->bookkeepingLetteringAll($toselect); @@ -579,11 +579,11 @@ print $formconfirm; // List of mass actions available $arrayofmassactions = array(); -if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) { +if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->hasRight('accounting', 'mouvements', 'creer')) { $arrayofmassactions['lettering'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('Lettering'); $arrayofmassactions['preunlettering'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('Unlettering'); } -if ($user->rights->accounting->mouvements->supprimer) { +if ($user->hasRight('accounting', 'mouvements', 'supprimer')) { $arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete"); } if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunlettering', 'predeletebookkeepingwriting'))) { From 7732fabd80c706802b7cf7035754f1e5cc480f06 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 18:00:07 +0200 Subject: [PATCH 017/183] update code toward php8 compliance --- htdocs/accountancy/closure/index.php | 2 +- htdocs/accountancy/customer/card.php | 4 ++-- htdocs/accountancy/customer/index.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index da4f5eecd25..c1dc454b675 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -64,7 +64,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->fiscalyear->write)) { +if (!$user->hasRight('accounting', 'fiscalyear', 'write')) { accessforbidden(); } diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 0b3435ecb92..e867070ed2d 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -44,7 +44,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } @@ -54,7 +54,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { * Actions */ -if ($action == 'ventil' && $user->rights->accounting->bind->write) { +if ($action == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) { if (!$cancel) { if ($codeventil < 0) { $codeventil = 0; diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 472dce11e37..13aa7883222 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -47,7 +47,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->bind->write)) { +if ($user->hasRight('accounting', 'bind', 'write')) { accessforbidden(); } @@ -84,7 +84,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } @@ -93,7 +93,7 @@ if (empty($user->rights->accounting->mouvements->lire)) { * Actions */ -if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) { +if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('accounting', 'bind', 'write')) { // Clean database by removing binding done on non existing or no more existing accounts $db->begin(); $sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd"; From f2e7e0b2100a8afdac23137cfab555b60fff0d08 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 18:02:48 +0200 Subject: [PATCH 018/183] update code toward php8 compliance --- htdocs/accountancy/customer/lines.php | 4 ++-- htdocs/accountancy/customer/list.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 469f29ad3c7..65d7ee0bbeb 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -91,7 +91,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } @@ -126,7 +126,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' $search_tvaintra = ''; } -if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) { +if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) { $error = 0; if (!(GETPOST('account_parent', 'int') >= 0)) { diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 4038bb4b5bc..9dfd94d5729 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -110,7 +110,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if (empty($user->rights->accounting->mouvements->lire)) { +if (!$user->hasRight('accounting', 'mouvements', 'lire')) { accessforbidden(); } From 52b973209ec2ac5c989f25aea572db433840ada3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sun, 25 Sep 2022 19:06:55 +0200 Subject: [PATCH 019/183] fix Test differs --- htdocs/accountancy/customer/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 13aa7883222..079e05c406b 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -47,7 +47,7 @@ if (!isModEnabled('accounting')) { if ($user->socid > 0) { accessforbidden(); } -if ($user->hasRight('accounting', 'bind', 'write')) { +if (!$user->hasRight('accounting', 'bind', 'write')) { accessforbidden(); } From 9772bbeff3107d6dc0ab89629f97a8865056f4cf Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 21:58:40 +0200 Subject: [PATCH 020/183] Use isModEnabled --- htdocs/comm/mailing/card.php | 8 ++++---- htdocs/compta/facture/card.php | 2 +- htdocs/core/class/html.formmail.class.php | 6 +++--- htdocs/core/lib/oauth.lib.php | 2 +- htdocs/core/lib/payments.lib.php | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index e59389a87b7..2372f24a929 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -227,13 +227,13 @@ if (empty($reshook)) { $substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid; $onlinepaymentenabled = 0; - if (!empty($conf->paypal->enabled)) { + if (isModEnabled('paypal')) { $onlinepaymentenabled++; } - if (!empty($conf->paybox->enabled)) { + if (isModEnabled('paybox')) { $onlinepaymentenabled++; } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { $onlinepaymentenabled++; } if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) { @@ -263,7 +263,7 @@ if (empty($reshook)) { $substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = ''.$langs->trans('BlankSubscriptionForm'). ''; } /* For backward compatibility, deprecated */ - if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) { + if (isModEnabled('paypal') && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) { $substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2); if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 0fe82b9e7f1..1465b60b2f6 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -5802,7 +5802,7 @@ if ($action == 'create') { // Show online payment link - $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)); + $useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox')); if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) { print '
'."\n"; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index a2abdbb7cc6..ad25db01fa6 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1619,13 +1619,13 @@ class FormMail extends Form //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing $onlinepaymentenabled = 0; - if (!empty($conf->paypal->enabled)) { + if (isModEnabled('paypal')) { $onlinepaymentenabled++; } - if (!empty($conf->paybox->enabled)) { + if (isModEnabled('paybox')) { $onlinepaymentenabled++; } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { $onlinepaymentenabled++; } if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) { diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php index d48775fe84e..83359ef1c65 100644 --- a/htdocs/core/lib/oauth.lib.php +++ b/htdocs/core/lib/oauth.lib.php @@ -27,7 +27,7 @@ $supportedoauth2array = array( 'OAUTH_GOOGLE_NAME'=>array('callbackfile' => 'google', 'picto' => 'google', 'urlforapp' => 'OAUTH_GOOGLE_DESC', 'name'=>'Google', 'urlforcredentials'=>'https://console.developers.google.com/', 'availablescopes'=> 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print,admin_directory_user,gmail_full'), ); -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { $supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array('callbackfile' => 'stripetest', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeTest', 'urlforcredentials'=>'', 'availablescopes'=>'read_write'); $supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array('callbackfile' => 'stripelive', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeLive', 'urlforcredentials'=>'', 'availablescopes'=>'read_write'); } diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php index 19a251d1b38..44691f7c2c4 100644 --- a/htdocs/core/lib/payments.lib.php +++ b/htdocs/core/lib/payments.lib.php @@ -150,15 +150,15 @@ function getValidOnlinePaymentMethods($paymentmethod = '') $validpaymentmethod = array(); - if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) { $langs->load("paypal"); $validpaymentmethod['paypal'] = 'valid'; } - if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) { $langs->load("paybox"); $validpaymentmethod['paybox'] = 'valid'; } - if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) { $langs->load("stripe"); $validpaymentmethod['stripe'] = 'valid'; } From da55ed782c1faed7bd3eac12402728fdcf1f107d Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 21:58:56 +0200 Subject: [PATCH 021/183] Use isModEnabled --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 6 +++--- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 6 +++--- htdocs/don/card.php | 2 +- htdocs/partnership/admin/website.php | 6 +++--- htdocs/public/eventorganization/subscriptionok.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index ee4e43bb444..168e293cc90 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1180,13 +1180,13 @@ class pdf_crabe extends ModelePDFFactures if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') { $useonlinepayment = 0; if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) { - if (!empty($conf->paypal->enabled)) { + if (isModEnabled('paypal')) { $useonlinepayment++; } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { $useonlinepayment++; } - if (!empty($conf->paybox->enabled)) { + if (isModEnabled('paybox')) { $useonlinepayment++; } } diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 1efca9070d0..5da53c41121 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -1290,13 +1290,13 @@ class pdf_sponge extends ModelePDFFactures if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') { $useonlinepayment = 0; if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) { - if (!empty($conf->paypal->enabled)) { + if (isModEnabled('paypal')) { $useonlinepayment++; } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { $useonlinepayment++; } - if (!empty($conf->paybox->enabled)) { + if (isModEnabled('paybox')) { $useonlinepayment++; } } diff --git a/htdocs/don/card.php b/htdocs/don/card.php index ae73fdfd15a..7c18073907e 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -914,7 +914,7 @@ if (!empty($id) && $action != 'edit') { $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); // Show online payment link - $useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled)); + $useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox')); if ($useonlinepayment) { //$object->statut != Facture::STATUS_DRAFT && print '
'."\n"; diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php index b3bccf9fa00..bb86f95269b 100644 --- a/htdocs/partnership/admin/website.php +++ b/htdocs/partnership/admin/website.php @@ -189,13 +189,13 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) { $listofval = array(); $listofval['-1'] = $langs->trans('No'); $listofval['all'] = $langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')'; - if (!empty($conf->paybox->enabled)) { + if (isModEnabled('paybox')) { $listofval['paybox'] = 'Paybox'; } - if (!empty($conf->paypal->enabled)) { + if (isModEnabled('paypal')) { $listofval['paypal'] = 'PayPal'; } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { $listofval['stripe'] = 'Stripe'; } print $form->selectarray("PARTNERSHIP_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) ? $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE : ''), 0); diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php index 745c9885647..043e0e8d021 100644 --- a/htdocs/public/eventorganization/subscriptionok.php +++ b/htdocs/public/eventorganization/subscriptionok.php @@ -53,7 +53,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; } From a7a39cba97b278314dabdbc6abfe7b1cdd1428bb Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 21:59:46 +0200 Subject: [PATCH 022/183] Use isModEnabled --- htdocs/public/payment/newpayment.php | 24 ++++++++++++------------ htdocs/public/payment/paymentko.php | 14 +++++++------- htdocs/public/payment/paymentok.php | 16 ++++++++-------- htdocs/societe/paymentmodes.php | 18 +++++++++--------- htdocs/stripe/admin/stripe.php | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 9d5fb5f122f..d3b08e9672b 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -247,7 +247,7 @@ $urlko = preg_replace('/&$/', '', $urlko); // Remove last & // Make special controls -if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) { +if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) { require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; @@ -273,10 +273,10 @@ if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypa return -1; } } -if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled)) { +if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) { // No specific test for the moment } -if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled)) { +if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) { require_once DOL_DOCUMENT_ROOT.'/stripe/config.php'; // This include also /stripe/lib/stripe.lib.php, /includes/stripe/stripe-php/init.php, ... } @@ -481,7 +481,7 @@ if ($action == 'dopayment') { // Called when choosing Stripe mode. // When using the old Charge API architecture, this code is called after clicking the 'dopayment' with the Charge API architecture. // When using the PaymentIntent API architecture, the Stripe customer was already created when creating PaymentIntent when showing payment page, and the payment is already ok when action=charge. -if ($action == 'charge' && !empty($conf->stripe->enabled)) { +if ($action == 'charge' && isModEnabled('stripe')) { $amountstripe = $amount; // Correct the amount according to unit of currency @@ -844,10 +844,10 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r // Show sandbox warning -if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) { // We can force sand box with param 'forcesandbox' +if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal') && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) { // We can force sand box with param 'forcesandbox' dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning'); } -if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) { +if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) { dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); } @@ -911,14 +911,14 @@ if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) { print ''."\n"; print ''."\n"; // Additionnal information for each payment system -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { print ''."\n"; print ''."\n"; } -if (!empty($conf->paybox->enabled)) { +if (isModEnabled('paybox')) { print ''."\n"; } -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { print ''."\n"; } print ''."\n"; @@ -2043,7 +2043,7 @@ if ($action != 'dopayment') { 'paymentmethod' => $paymentmethod ]; $reshook = $hookmanager->executeHooks('doAddButton', $parameters, $object, $action); - if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) { print '
'; print '
'; print ''.$langs->trans("CreditOrDebitCard").''; @@ -2062,7 +2062,7 @@ if ($action != 'dopayment') { '; } - if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) { print '
'; print ''; print '
'; @@ -2083,7 +2083,7 @@ if ($action != 'dopayment') { '; } - if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) { + if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) { if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) { $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral'; } diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index 5bf9b6115ed..29adb2947d0 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -51,14 +51,14 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; } $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe")); -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { $PAYPALTOKEN = GETPOST('TOKEN'); if (empty($PAYPALTOKEN)) { $PAYPALTOKEN = GETPOST('token'); @@ -68,9 +68,9 @@ if (!empty($conf->paypal->enabled)) { $PAYPALPAYERID = GETPOST('PayerID'); } } -if (!empty($conf->paybox->enabled)) { +if (isModEnabled('paybox')) { } -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { } $FULLTAG = GETPOST('FULLTAG'); @@ -96,13 +96,13 @@ if (empty($paymentmethod)) { $validpaymentmethod = array(); -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { $validpaymentmethod['paypal'] = 'paypal'; } -if (!empty($conf->paybox->enabled)) { +if (isModEnabled('paybox')) { $validpaymentmethod['paybox'] = 'paybox'; } -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { $validpaymentmethod['stripe'] = 'stripe'; } diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index b8e4e9d4e19..4d1336351b3 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -57,7 +57,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php'; require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php'; -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; } @@ -65,7 +65,7 @@ if (!empty($conf->paypal->enabled)) { $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal")); // Clean parameters -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { $PAYPAL_API_USER = ""; if (!empty($conf->global->PAYPAL_API_USER)) { $PAYPAL_API_USER = $conf->global->PAYPAL_API_USER; @@ -127,13 +127,13 @@ dol_syslog("***** paymentok.php is called paymentmethod=".$paymentmethod." FULLT $validpaymentmethod = array(); -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { $validpaymentmethod['paypal'] = 'paypal'; } -if (!empty($conf->paybox->enabled)) { +if (isModEnabled('paybox')) { $validpaymentmethod['paybox'] = 'paybox'; } -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { $validpaymentmethod['stripe'] = 'stripe'; } @@ -236,7 +236,7 @@ if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) { print '


'; -if (!empty($conf->paypal->enabled)) { +if (isModEnabled('paypal')) { if ($paymentmethod == 'paypal') { // We call this page only if payment is ok on payment system if ($PAYPALTOKEN) { // Get on url call @@ -316,14 +316,14 @@ if (!empty($conf->paypal->enabled)) { } } -if (!empty($conf->paybox->enabled)) { +if (isModEnabled('paybox')) { if ($paymentmethod == 'paybox') { // TODO Add a check to validate that payment is ok. $ispaymentok = true; // We call this page only if payment is ok on payment system } } -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { if ($paymentmethod == 'stripe') { // TODO Add a check to validate that payment is ok. We can request Stripe with payment_intent and payment_intent_client_secret $ispaymentok = true; // We call this page only if payment is ok on payment system diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php index 6110fc7a5e5..2ba271cd936 100644 --- a/htdocs/societe/paymentmodes.php +++ b/htdocs/societe/paymentmodes.php @@ -84,7 +84,7 @@ $permissiontoadd = $user->rights->societe->creer; // Used by the include of acti $permissiontoaddupdatepaymentinformation = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $permissiontoadd) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->societe->thirdparty_paymentinformation_advance->write))); -if (!empty($conf->stripe->enabled)) { +if (isModEnabled('stripe')) { $service = 'StripeTest'; $servicestatus = 0; if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) { @@ -493,7 +493,7 @@ if (empty($reshook)) { $id = $savid; // Action for stripe - if (!empty($conf->stripe->enabled) && class_exists('Stripe')) { + if (isModEnabled('stripe') && class_exists('Stripe')) { if ($action == 'synccustomertostripe') { if ($object->client == 0) { $error++; @@ -782,11 +782,11 @@ llxHeader('', $title, $help_url); $head = societe_prepare_head($object); // Show sandbox warning -/*if (!empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))) // We can force sand box with param 'forcesandbox' +/*if (isModEnabled('paypal') && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))) // We can force sand box with param 'forcesandbox' { dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning'); }*/ -if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { +if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); } @@ -885,13 +885,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts'); } - if (!empty($conf->stripe->enabled)) { + if (isModEnabled('stripe')) { // Stripe customer key 'cu_....' stored into llx_societe_account print ''; print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontoaddupdatepaymentinformation, 'string', '', 0, 2, 'socid'); print ''; print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontoaddupdatepaymentinformation, 'string', '', null, null, '', 2, '', 'socid'); - if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account') { + if (isModEnabled('stripe') && $stripecu && $action != 'editkey_account') { $connect = ''; if (!empty($stripeacc)) { $connect = $stripeacc.'/'; @@ -947,7 +947,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' } } - if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { + if (isModEnabled('stripe') && !empty($conf->stripeconnect->enabled) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) { $stripesupplieracc = $stripe->getStripeAccount($service, $object->id); // Get Stripe OAuth connect account (no network access here) // Stripe customer key 'cu_....' stored into llx_societe_account @@ -955,7 +955,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' print $form->editfieldkey("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontoaddupdatepaymentinformation, 'string', '', 0, 2, 'socid'); print ''; print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontoaddupdatepaymentinformation, 'string', '', null, null, '', 2, '', 'socid'); - if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier') { + if (isModEnabled('stripe') && $stripesupplieracc && $action != 'editkey_account_supplier') { $connect = ''; $url = 'https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc; @@ -1338,7 +1338,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' } // List of Stripe connect accounts - if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc)) { + if (isModEnabled('stripe') && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc)) { print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s'); $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc)); print ''."\n"; diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 33536271115..6cbefc14185 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -399,7 +399,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { // TODO Not used by current code if (!empty($site_account)) { \Stripe\Stripe::setApiKey($site_account); } - if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { + if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); From abcd68071e52ab5d8a9528cb0acc3831401bdf10 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 22:00:20 +0200 Subject: [PATCH 023/183] Use isModEnabled --- htdocs/stripe/charge.php | 4 ++-- htdocs/stripe/class/actions_stripe.class.php | 2 +- htdocs/stripe/payout.php | 2 +- htdocs/stripe/transaction.php | 2 +- htdocs/takepos/admin/terminal.php | 6 +++--- htdocs/takepos/pay.php | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index 522445334eb..f598275177e 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -68,7 +68,7 @@ $stripe = new Stripe($db); llxHeader('', $langs->trans("StripeChargeList")); -if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { +if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); @@ -225,7 +225,7 @@ if (!$rowid) { // Stripe customer print "'; - if (!empty($conf->stripe->enabled) && !empty($conf->global->STRIPE_CARD_PRESENT)) { + if (isModEnabled('stripe') && !empty($conf->global->STRIPE_CARD_PRESENT)) { print ''; // Force Stripe Terminal print '
"; - if (!empty($conf->stripe->enabled) && !empty($stripeacc)) { + if (isModEnabled('stripe') && !empty($stripeacc)) { $connect = $stripeacc.'/'; } $url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer; diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 0d8b5e03435..8e5cd833a71 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -71,7 +71,7 @@ class ActionsStripeconnect { global $db, $conf, $user, $langs, $form; - if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { + if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); } else { diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php index 81baa5db4ac..1965c8ab73d 100644 --- a/htdocs/stripe/payout.php +++ b/htdocs/stripe/payout.php @@ -72,7 +72,7 @@ $stripe = new Stripe($db); llxHeader('', $langs->trans("StripePayoutList")); -if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { +if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index c36c061b91e..29eec246af8 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -71,7 +71,7 @@ $stripe = new Stripe($db); llxHeader('', $langs->trans("StripeTransactionList")); -if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { +if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index eb43455216c..9cd1a5fd5f0 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -79,7 +79,7 @@ if (GETPOST('action', 'alpha') == 'set') { $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity); $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity); - if (!empty($conf->stripe->enabled) && !empty($conf->global->STRIPE_CARD_PRESENT)) { + if (isModEnabled('stripe') && !empty($conf->global->STRIPE_CARD_PRESENT)) { $res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$terminaltouse, GETPOST('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity); } if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) { @@ -189,7 +189,7 @@ if (isModEnabled("banque")) { } print '
'.$langs->trans("CashDeskBankAccountForStripeTerminal").''; $service = 'StripeTest'; @@ -201,7 +201,7 @@ if (isModEnabled("banque")) { global $stripearrayofkeysbyenv; $site_account = $stripearrayofkeysbyenv[$servicestatus]['secret_key']; \Stripe\Stripe::setApiKey($site_account); - if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { + if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { $service = 'StripeTest'; $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index 1222ccd1786..affcfaa50de 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -80,7 +80,7 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); stripe->enabled)) { +if (isModEnabled('stripe')) { $service = 'StripeTest'; $servicestatus = 0; if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) { @@ -130,7 +130,7 @@ function fetchConnectionToken() { stripe->enabled) && isset($keyforstripeterminalbank) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { +if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) { dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning', 1); } @@ -535,7 +535,7 @@ $action_buttons = array( ), ); $numpad = $conf->global->TAKEPOS_NUMPAD; -if (!empty($conf->stripe->enabled) && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) { +if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) { print ''; dol_htmloutput_mesg($langs->trans('ConnectingToStripeTerminal', 'Stripe'), '', 'warning', 1); print ''; @@ -646,7 +646,7 @@ while ($i < count($arrayOfValidPaymentModes)) { $i = $i + 1; } -if (!empty($conf->stripe->enabled) && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) { +if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) { $keyforstripeterminalbank = "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$_SESSION["takeposterminal"]; print ''; if (!empty($conf->global->$keyforstripeterminalbank)) { From ef94f2af70a40e8d5d3f4c059a20ade6b75ef8fd Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 22:45:10 +0200 Subject: [PATCH 024/183] Use isModEnabled --- htdocs/comm/propal/card.php | 4 ++-- htdocs/comm/propal/list.php | 4 ++-- htdocs/commande/list.php | 14 +++++++------- htdocs/compta/facture/list.php | 8 ++++---- htdocs/contrat/card.php | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 3c478ff5a2c..44f7e00bdce 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -64,7 +64,7 @@ $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'pro if (!empty($conf->incoterm->enabled)) { $langs->load('incoterm'); } -if (!empty($conf->margin->enabled)) { +if (isModEnabled('margin')) { $langs->load('margins'); } @@ -2737,7 +2737,7 @@ if ($action == 'create') { print '
'; // Margin Infos - if (!empty($conf->margin->enabled)) { + if (isModEnabled('margin')) { $formmargin->displayMarginInfos($object); } diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 5b678a0f7ac..76c4a42ddce 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -536,7 +536,7 @@ $formother = new FormOther($db); $formfile = new FormFile($db); $formpropal = new FormPropal($db); $formmargin = null; -if (!empty($conf->margin->enabled)) { +if (isModEnabled('margin')) { $formmargin = new FormMargin($db); } $companystatic = new Societe($db); @@ -1573,7 +1573,7 @@ if ($resql) { $typenArray = null; $with_margin_info = false; - if (!empty($conf->margin->enabled) && ( + if (isModEnabled('margin') && ( !empty($arrayfields['total_pa']['checked']) || !empty($arrayfields['total_margin']['checked']) || !empty($arrayfields['total_margin_rate']['checked']) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 5cde78cd09f..58a6ce70f0f 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -if (!empty($conf->margin->enabled)) { +if (isModEnabled('margin')) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; } require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; @@ -199,10 +199,10 @@ $arrayfields = array( 'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1), 'position'=>110), 'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115), 'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116), - 'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)), - 'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)), - 'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)), - 'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)), + 'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)), + 'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)), + 'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)), + 'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)), 'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120), 'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125), 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130), @@ -778,7 +778,7 @@ $form = new Form($db); $formother = new FormOther($db); $formfile = new FormFile($db); $formmargin = null; -if (!empty($conf->margin->enabled)) { +if (isModEnabled('margin')) { $formmargin = new FormMargin($db); } $companystatic = new Societe($db); @@ -1850,7 +1850,7 @@ if ($resql) { $i = 0; $with_margin_info = false; - if (!empty($conf->margin->enabled) && ( + if (isModEnabled('margin') && ( !empty($arrayfields['total_pa']['checked']) || !empty($arrayfields['total_margin']['checked']) || !empty($arrayfields['total_margin_rate']['checked']) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index ddfe7e5429f..1d6dbd9f03b 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -245,10 +245,10 @@ $arrayfields = array( 'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>292), 'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>295), 'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>296), // Not enabled by default because slow - 'total_pa' => array('label' => ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)), - 'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)), - 'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)), - 'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)), + 'total_pa' => array('label' => ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) ? 0 : 1)), + 'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) ? 0 : 1)), + 'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)), + 'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)), 'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500), 'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>502), 'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))), diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 3509134c70f..b452b20154a 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1476,7 +1476,7 @@ if ($action == 'create') { $productstatic = new Product($db); $usemargins = 0; - if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) { + if (isModEnabled('margin') && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) { $usemargins = 1; } @@ -1522,7 +1522,7 @@ if ($action == 'create') { print ''.$langs->trans("Unit").''; } print ''.$langs->trans("ReductionShort").''; - if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { + if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { print ''.$langs->trans("BuyingPrice").''; } print ' '; @@ -1592,7 +1592,7 @@ if ($action == 'create') { } // Margin - if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { + if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { print ''.price($objp->pa_ht).''; } @@ -1749,7 +1749,7 @@ if ($action == 'create') { print ''; $colspan = 6; - if (!empty($conf->margin->enabled) && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { + if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) { $colspan++; } if (!empty($conf->global->PRODUCT_USE_UNITS)) { @@ -2237,7 +2237,7 @@ $db->close(); ?> margin->enabled) && $action == 'editline') { +if (isModEnabled('margin') && $action == 'editline') { // TODO Why this ? To manage margin on contracts ? ?>