Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix warnings

Browse Source
This commit is contained in:
Laurent Destailleur
2023-11-27 13:26:44 +01:00
parent 06736918de
commit 1d589fd74e
45 changed files with 241 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/document.php
View File

@@ -185,7 +185,7 @@ if (preg_match('/\.(html|htm)$/i', $original_file)) {
if (isset($_GET["attachment"])) { if (isset($_GET["attachment"])) {
$attachment = GETPOST("attachment", 'alpha') ?true:false; $attachment = GETPOST("attachment", 'alpha') ?true:false;
} }
if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) { if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS')) {
$attachment = false; $attachment = false;
} }
@@ -311,7 +311,8 @@ header('Pragma: public');
$readfile = true; $readfile = true;
// on view document, can output images with good orientation according to exif infos // on view document, can output images with good orientation according to exif infos
if (!$attachment && !empty($conf->global->MAIN_USE_EXIF_ROTATION) && image_format_supported($fullpath_original_file_osencoded) == 1) { // TODO Why this on document.php and not in viewimage.php ?
if (!$attachment && getDolGlobalString('MAIN_USE_EXIF_ROTATION') && image_format_supported($fullpath_original_file_osencoded) == 1) {
$imgres = correctExifImageOrientation($fullpath_original_file_osencoded, null); $imgres = correctExifImageOrientation($fullpath_original_file_osencoded, null);
$readfile = !$imgres; $readfile = !$imgres;
} }

68
htdocs/index.php
View File

@@ -48,7 +48,7 @@ if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--; if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
// Check if company name is defined (first install) // Check if company name is defined (first install)
if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM)) { if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || !getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {
header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete"); header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
exit; exit;
} }
@@ -80,8 +80,8 @@ if (!isset($form) || !is_object($form)) {
// Title // Title
$title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION; $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE; $title = $langs->trans("HomeArea").' - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
} }
llxHeader('', $title); llxHeader('', $title);
@@ -92,9 +92,9 @@ $resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (select
print load_fiche_titre(' ', $resultboxes['selectboxlist'], '', 0, '', 'titleforhome'); print load_fiche_titre(' ', $resultboxes['selectboxlist'], '', 0, '', 'titleforhome');
if (!empty($conf->global->MAIN_MOTD)) { if (getDolGlobalString('MAIN_MOTD')) {
$conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD); $conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);
if (!empty($conf->global->MAIN_MOTD)) { if (getDolGlobalString('MAIN_MOTD')) {
$substitutionarray = getCommonSubstitutionArray($langs); $substitutionarray = getCommonSubstitutionArray($langs);
complete_substitutions_array($substitutionarray, $langs); complete_substitutions_array($substitutionarray, $langs);
$texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs); $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
@@ -112,7 +112,7 @@ if (!empty($conf->global->MAIN_MOTD)) {
*/ */
// Security warning if install.lock file is missing or if conf file is writable // Security warning if install.lock file is missing or if conf file is writable
if (empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) { if (!getDolGlobalString('MAIN_REMOVE_INSTALL_WARNING')) {
$message = ''; $message = '';
// Check if install lock file is present // Check if install lock file is present
@@ -156,8 +156,8 @@ $boxstatFromHook = '';
$langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts')); $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
// Dolibarr Working Board with weather // Dolibarr Working Board with weather
if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
$showweather = (empty($conf->global->MAIN_DISABLE_METEO) || getDolGlobalInt('MAIN_DISABLE_METEO') == 2) ? 1 : 0; $showweather = (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_METEO') == 2) ? 1 : 0;
//Array that contains all WorkboardResponse classes to process them //Array that contains all WorkboardResponse classes to process them
$dashboardlines = array(); $dashboardlines = array();
@@ -166,28 +166,28 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
// Number of actions to do (late) // Number of actions to do (late)
if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'read')) { if (isModEnabled('agenda') && !getDolGlobalString('MAIN_DISABLE_BLOCK_AGENDA') && $user->hasRight('agenda', 'myactions', 'read')) {
include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
$board = new ActionComm($db); $board = new ActionComm($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of project opened // Number of project opened
if (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) { if (isModEnabled('project') && !getDolGlobalString('MAIN_DISABLE_BLOCK_PROJECT') && $user->hasRight('projet', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$board = new Project($db); $board = new Project($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of tasks to do (late) // Number of tasks to do (late)
if (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->hasRight('projet', 'lire')) { if (isModEnabled('project') && !getDolGlobalString('MAIN_DISABLE_BLOCK_PROJECT') && !getDolGlobalString('PROJECT_HIDE_TASKS') && $user->hasRight('projet', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
$board = new Task($db); $board = new Task($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of commercial customer proposals open (expired) // Number of commercial customer proposals open (expired)
if (isModEnabled('propal') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('propal', 'read')) { if (isModEnabled('propal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('propal', 'read')) {
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
$board = new Propal($db); $board = new Propal($db);
$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -196,7 +196,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of supplier proposals open (expired) // Number of supplier proposals open (expired)
if (isModEnabled('supplier_proposal') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('supplier_proposal', 'lire')) { if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
$langs->load("supplier_proposal"); $langs->load("supplier_proposal");
include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
$board = new SupplierProposal($db); $board = new SupplierProposal($db);
@@ -206,7 +206,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of sales orders // Number of sales orders
if (isModEnabled('commande') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('commande', 'lire')) { if (isModEnabled('commande') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$board = new Commande($db); $board = new Commande($db);
// Number of customer orders to be shipped (validated and in progress) // Number of customer orders to be shipped (validated and in progress)
@@ -220,7 +220,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of suppliers orders // Number of suppliers orders
if (isModEnabled('supplier_order') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'commande', 'lire')) { if (isModEnabled('supplier_order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
$board = new CommandeFournisseur($db); $board = new CommandeFournisseur($db);
$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -228,7 +228,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of contract / services enabled (delayed) // Number of contract / services enabled (delayed)
if (isModEnabled('contrat') && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->hasRight('contrat', 'lire')) { if (isModEnabled('contrat') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
$board = new Contrat($db); $board = new Contrat($db);
$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive"); $dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
@@ -237,7 +237,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of tickets open // Number of tickets open
if (isModEnabled('ticket') && empty($conf->global->MAIN_DISABLE_BLOCK_TICKET) && $user->hasRight('ticket', 'read')) { if (isModEnabled('ticket') && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php'; include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
$board = new Ticket($db); $board = new Ticket($db);
$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -246,21 +246,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of invoices customers (paid) // Number of invoices customers (paid)
if (isModEnabled('facture') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('facture', 'lire')) { if (isModEnabled('facture') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('facture', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$board = new Facture($db); $board = new Facture($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of supplier invoices (paid) // Number of supplier invoices (paid)
if (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'facture', 'lire')) { if (isModEnabled('supplier_invoice') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'facture', 'lire')) {
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$board = new FactureFournisseur($db); $board = new FactureFournisseur($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of transactions to conciliate // Number of transactions to conciliate
if (isModEnabled('banque') && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) { if (isModEnabled('banque') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$board = new Account($db); $board = new Account($db);
$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate $nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
@@ -271,8 +271,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
// Number of cheque to send // Number of cheque to send
if (isModEnabled('banque') && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) { if (isModEnabled('banque') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) { if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT')) {
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
$board = new RemiseCheque($db); $board = new RemiseCheque($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
@@ -290,7 +290,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of foundation members // Number of foundation members
if (isModEnabled('adherent') && empty($conf->global->MAIN_DISABLE_BLOCK_ADHERENT) && $user->hasRight('adherent', 'lire') && !$user->socid) { if (isModEnabled('adherent') && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$board = new Adherent($db); $board = new Adherent($db);
$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift'); $dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
@@ -298,21 +298,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
} }
// Number of expense reports to approve // Number of expense reports to approve
if (isModEnabled('expensereport') && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->hasRight('expensereport', 'approve')) { if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove'); $dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove');
} }
// Number of expense reports to pay // Number of expense reports to pay
if (isModEnabled('expensereport') && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->hasRight('expensereport', 'to_paid')) { if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay'); $dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay');
} }
// Number of holidays to approve // Number of holidays to approve
if (isModEnabled('holiday') && empty($conf->global->MAIN_DISABLE_BLOCK_HOLIDAY) && $user->hasRight('holiday', 'approve')) { if (isModEnabled('holiday') && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
$board = new Holiday($db); $board = new Holiday($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
@@ -471,7 +471,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$totalLateNumber = $totallate; $totalLateNumber = $totallate;
$totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0); $totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) { if (getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE')) {
$totallate = $totallatePercentage; $totallate = $totallatePercentage;
} }
@@ -484,7 +484,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
if ($totallate > 0) { if ($totallate > 0) {
$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv( $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv(
"NActionsLate", "NActionsLate",
$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '') $totallate.(getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? '%' : '')
).')'; ).')';
} else { } else {
$text = $langs->transnoentitiesnoconv("NoItemLate"); $text = $langs->transnoentitiesnoconv("NoItemLate");
@@ -509,7 +509,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$boards = array(); $boards = array();
// Scan $groupElement and save the one with 'stats' that must be used for the open objects dashboard // Scan $groupElement and save the one with 'stats' that must be used for the open objects dashboard
if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) { if (!getDolGlobalString('MAIN_DISABLE_NEW_OPENED_DASH_BOARD')) {
foreach ($groupElement['stats'] as $infoKey) { foreach ($groupElement['stats'] as $infoKey) {
if (!empty($valid_dashboardlines[$infoKey])) { if (!empty($valid_dashboardlines[$infoKey])) {
$boards[] = $valid_dashboardlines[$infoKey]; $boards[] = $valid_dashboardlines[$infoKey];
@@ -589,7 +589,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$openedDashBoard .= '<div class="inline-block nowraponall">'; $openedDashBoard .= '<div class="inline-block nowraponall">';
$openedDashBoard .= '<span class="classfortooltip'.($nbtodClass ? ' '.$nbtodClass : '').'" title="'.$labeltoshow.'">'; $openedDashBoard .= '<span class="classfortooltip'.($nbtodClass ? ' '.$nbtodClass : '').'" title="'.$labeltoshow.'">';
$openedDashBoard .= $board->nbtodo; $openedDashBoard .= $board->nbtodo;
if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) { if ($board->total > 0 && getDolGlobalString('MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX')) {
$openedDashBoard .= ' : '.price($board->total, 0, $langs, 1, -1, -1, $conf->currency); $openedDashBoard .= ' : '.price($board->total, 0, $langs, 1, -1, -1, $conf->currency);
} }
$openedDashBoard .= '</span>'; $openedDashBoard .= '</span>';
@@ -626,7 +626,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
if ($totallate > 0) { if ($totallate > 0) {
$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv( $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv(
"NActionsLate", "NActionsLate",
$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '') $totallate.(getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? '%' : '')
).')'; ).')';
} else { } else {
$text = $langs->transnoentitiesnoconv("NoItemLate"); $text = $langs->transnoentitiesnoconv("NoItemLate");
@@ -641,7 +641,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$weatherDashBoard .= ' <div class="info-box-content">'."\n"; $weatherDashBoard .= ' <div class="info-box-content">'."\n";
$weatherDashBoard .= ' <div class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</div>'."\n"; $weatherDashBoard .= ' <div class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</div>'."\n";
if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) { if ($totallatePercentage > 0 && getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE')) {
$weatherDashBoard .= ' <span class="info-box-number">'.$langs->transnoentitiesnoconv( $weatherDashBoard .= ' <span class="info-box-number">'.$langs->transnoentitiesnoconv(
"NActionsLate", "NActionsLate",
price($totallatePercentage).'%' price($totallatePercentage).'%'
@@ -699,7 +699,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$boxwork .= '<div class="boxstatscontent">'; $boxwork .= '<div class="boxstatscontent">';
$boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' <span>'.$board->label.'</span></span><br>'; $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' <span>'.$board->label.'</span></span><br>';
$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>'; $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) { if ($board->total > 0 && getDolGlobalString('MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX')) {
$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>'; $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
} }
$boxwork .= '</div>'; $boxwork .= '</div>';
@@ -827,7 +827,7 @@ function getWeatherStatus($totallate)
$offset = 0; $offset = 0;
$factor = 10; // By default $factor = 10; // By default
$used_conf = empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_LEVEL' : 'MAIN_METEO_PERCENTAGE_LEVEL'; $used_conf = !getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? 'MAIN_METEO_LEVEL' : 'MAIN_METEO_PERCENTAGE_LEVEL';
$weather->level = 0; $weather->level = 0;
$level0 = $offset; $level0 = $offset;

162
htdocs/main.inc.php
View File

@@ -361,7 +361,7 @@ require_once 'master.inc.php';
// include DOL_DOCUMENT_ROOT.'/core/lib/phpsessionindb.inc.php // include DOL_DOCUMENT_ROOT.'/core/lib/phpsessionindb.inc.php
// If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed. // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) { if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
$ok = 0; $ok = 0;
if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) { if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) {
$ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
@@ -377,11 +377,11 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
if (!$ok) { if (!$ok) {
if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) { if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
print 'Sorry, your application is offline.'."\n"; print 'Sorry, your application is offline.'."\n";
print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n"; print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
$nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken(); $nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n"; print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
} else { } else {
print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n"; print 'Sorry, your application is offline. Only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
$nexturl = DOL_URL_ROOT.'/'; $nexturl = DOL_URL_ROOT.'/';
print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n"; print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
} }
@@ -399,7 +399,7 @@ if (isModEnabled('debugbar') && !GETPOST('dol_use_jmobile') && empty($_SESSION['
include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php'; include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
$debugbar = new DolibarrDebugBar(); $debugbar = new DolibarrDebugBar();
$renderer = $debugbar->getRenderer(); $renderer = $debugbar->getRenderer();
if (empty($conf->global->MAIN_HTML_HEADER)) { if (!getDolGlobalString('MAIN_HTML_HEADER')) {
$conf->global->MAIN_HTML_HEADER = ''; $conf->global->MAIN_HTML_HEADER = '';
} }
$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead(); $conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
@@ -486,21 +486,21 @@ if (!defined('NOREQUIREAJAX')) {
} }
// If install or upgrade process not done or not completely finished, we call the install page. // If install or upgrade process not done or not completely finished, we call the install page.
if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED)) { if (getDolGlobalString('MAIN_NOT_INSTALLED') || getDolGlobalString('MAIN_NOT_UPGRADED')) {
dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING); dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
header("Location: ".DOL_URL_ROOT."/install/index.php"); header("Location: ".DOL_URL_ROOT."/install/index.php");
exit; exit;
} }
// If an upgrade process is required, we call the install page. // If an upgrade process is required, we call the install page.
if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION)) if ((getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) { || (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') && getDolGlobalString('MAIN_VERSION_LAST_INSTALL') && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
$versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE; $versiontocompare = !getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare); $dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION); $dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade); $rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
if ($rescomp > 0) { // Programs have a version higher than database. if ($rescomp > 0) { // Programs have a version higher than database.
if (empty($conf->global->MAIN_NO_UPGRADE_REDIRECT_ON_LEVEL_3_CHANGE) || $rescomp < 3) { if (!getDolGlobalString('MAIN_NO_UPGRADE_REDIRECT_ON_LEVEL_3_CHANGE') || $rescomp < 3) {
// We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades // We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install/upgrade page.", LOG_WARNING); dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install/upgrade page.", LOG_WARNING);
header("Location: ".DOL_URL_ROOT."/install/index.php"); header("Location: ".DOL_URL_ROOT."/install/index.php");
@@ -582,8 +582,8 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (POST method or GET with a sensible value for 'action' parameter) in main.inc.php. Token not provided.", LOG_WARNING); dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (POST method or GET with a sensible value for 'action' parameter) in main.inc.php. Token not provided.", LOG_WARNING);
print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n"; print "Access to this page this way (POST method or GET with a sensible value for 'action' parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0"; print "If you access your server behind a proxy using url rewriting and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
if (!empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) { if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
print " instead of ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN; print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
} }
print " into setup).\n"; print " into setup).\n";
} }
@@ -740,7 +740,7 @@ if (!defined('NOLOGIN')) {
} }
// Verification security graphic code // Verification security graphic code
if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam'])) { if ($test && GETPOST("username", "alpha", 2) && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA') && !isset($_SESSION['dol_bypass_antispam'])) {
$sessionkey = 'dol_antispam_value'; $sessionkey = 'dol_antispam_value';
$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml')))); $ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
@@ -809,7 +809,7 @@ if (!defined('NOLOGIN')) {
if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages. if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
$langs = new Translate("", $conf); $langs = new Translate("", $conf);
$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT)); $langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
if (defined('MAIN_LANG_DEFAULT')) { if (defined('MAIN_LANG_DEFAULT')) {
$langcode = constant('MAIN_LANG_DEFAULT'); $langcode = constant('MAIN_LANG_DEFAULT');
} }
@@ -1183,7 +1183,7 @@ if (!defined('NOLOGIN')) {
} }
// Change landing page if defined. // Change landing page if defined.
$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE); $landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (!getDolGlobalString('MAIN_LANDING_PAGE') ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
if (!empty($landingpage)) { // Example: /index.php if (!empty($landingpage)) { // Example: /index.php
$newpath = dol_buildpath($landingpage, 1); $newpath = dol_buildpath($landingpage, 1);
if ($_SERVER["PHP_SELF"] != $newpath) { // not already on landing page (avoid infinite loop) if ($_SERVER["PHP_SELF"] != $newpath) { // not already on landing page (avoid infinite loop)
@@ -1204,14 +1204,14 @@ if (!defined('NOLOGIN')) {
$user->rights->user->self->password = 1; $user->rights->user->self->password = 1;
//Required if advanced permissions are used with MAIN_USE_ADVANCED_PERMS //Required if advanced permissions are used with MAIN_USE_ADVANCED_PERMS
if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) { if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
if (empty($user->rights->user->user_advance)) { if (!$user->hasRight('user', 'user_advance')) {
$user->rights->user->user_advance = new stdClass(); // To avoid warnings $user->rights->user->user_advance = new stdClass(); // To avoid warnings
} }
if (empty($user->rights->user->self_advance)) { if (!$user->hasRight('user', 'self_advance')) {
$user->rights->user->self_advance = new stdClass(); // To avoid warnings $user->rights->user->self_advance = new stdClass(); // To avoid warnings
} }
if (empty($user->rights->user->group_advance)) { if (!$user->hasRight('user', 'group_advance')) {
$user->rights->user->group_advance = new stdClass(); // To avoid warnings $user->rights->user->group_advance = new stdClass(); // To avoid warnings
} }
@@ -1239,7 +1239,7 @@ if (!defined('NOLOGIN')) {
} }
// Replace conf->css by personalized value if theme not forced // Replace conf->css by personalized value if theme not forced
if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME)) { if (!getDolGlobalString('MAIN_FORCETHEME') && !empty($user->conf->MAIN_THEME)) {
$conf->theme = $user->conf->MAIN_THEME; $conf->theme = $user->conf->MAIN_THEME;
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";
} }
@@ -1267,7 +1267,7 @@ if (GETPOST('nojs', 'int')) { // If javascript was not disabled on URL
} }
// Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part) // Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part)
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER; $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
} }
@@ -1299,7 +1299,7 @@ if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400) || (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400 || (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400
|| !empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) || getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER'))
) { ) {
$conf->dol_optimize_smallscreen = 1; $conf->dol_optimize_smallscreen = 1;
@@ -1394,10 +1394,10 @@ $heightforframes = 50;
// Init menu manager // Init menu manager
if (!defined('NOREQUIREMENU')) { if (!defined('NOREQUIREMENU')) {
if (empty($user->socid)) { // If internal user or not defined if (empty($user->socid)) { // If internal user or not defined
$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED); $conf->standard_menu = (!getDolGlobalString('MAIN_MENU_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENU_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
} else { } else {
// If external user // If external user
$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED); $conf->standard_menu = (!getDolGlobalString('MAIN_MENUFRONT_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENUFRONT_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
} }
// Load the menu manager (only if not already done) // Load the menu manager (only if not already done)
@@ -1487,14 +1487,14 @@ if (!function_exists("llxHeader")) {
$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : ''); $tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
// If theme MD and classic layer, we open the menulayer by default. // If theme MD and classic layer, we open the menulayer by default.
if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
global $mainmenu; global $mainmenu;
if ($mainmenu != 'website') { if ($mainmenu != 'website') {
$tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default. $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
} }
} }
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) { if (getDolGlobalString('MAIN_OPTIMIZEFORCOLORBLIND')) {
$tmpcsstouse .= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND); $tmpcsstouse .= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
} }
@@ -1719,9 +1719,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<link rel="manifest" href="'.$manifest.'" />'."\n"; print '<link rel="manifest" href="'.$manifest.'" />'."\n";
} }
if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) { if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
// TODO: use auto theme color switch // TODO: use auto theme color switch
print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n"; print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
} }
// Auto refresh page // Auto refresh page
@@ -1731,13 +1731,13 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
// Displays title // Displays title
$appli = constant('DOL_APPLICATION_TITLE'); $appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$appli = $conf->global->MAIN_APPLICATION_TITLE; $appli = $conf->global->MAIN_APPLICATION_TITLE;
} }
print '<title>'; print '<title>';
$titletoshow = ''; $titletoshow = '';
if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) { if ($title && getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
$titletoshow = dol_htmlentities($title); $titletoshow = dol_htmlentities($title);
} elseif ($title) { } elseif ($title) {
$titletoshow = dol_htmlentities($appli.' - '.$title); $titletoshow = dol_htmlentities($appli.' - '.$title);
@@ -1791,7 +1791,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
$themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int');
} }
if (!empty($conf->global->MAIN_ENABLE_FONT_ROBOTO)) { if (getDolGlobalString('MAIN_ENABLE_FONT_ROBOTO')) {
print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n"; print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";
print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n"; print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n";
} }
@@ -1799,7 +1799,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) { if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n"; print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
$jquerytheme = 'base'; $jquerytheme = 'base';
if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) { if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
} }
if (constant('JS_JQUERY_UI')) { if (constant('JS_JQUERY_UI')) {
@@ -1810,8 +1810,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!defined('DISABLE_JQUERY_JNOTIFY')) { if (!defined('DISABLE_JQUERY_JNOTIFY')) {
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
} }
if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) { // jQuery plugin "mutiselect", "multiple-select", "select2"... if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) { // jQuery plugin "mutiselect", "multiple-select", "select2"...
$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT; $tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
} }
} }
@@ -1838,7 +1838,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit; //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) { if (getDolGlobalString('MAIN_FIX_FLASH_ON_CHROME')) {
print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n"; print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
} }
@@ -1904,7 +1904,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} }
// jQuery jnotify // jQuery jnotify
if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) { if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} }
// Table drag and drop lines // Table drag and drop lines
@@ -1912,12 +1912,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} }
// Chart // Chart
if (empty($disableforlogin) && (empty($conf->global->MAIN_JS_GRAPH) || getDolGlobalString('MAIN_JS_GRAPH') == 'chart') && !defined('DISABLE_JS_GRAPH')) { if (empty($disableforlogin) && (!getDolGlobalString('MAIN_JS_GRAPH') || getDolGlobalString('MAIN_JS_GRAPH') == 'chart') && !defined('DISABLE_JS_GRAPH')) {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} }
// jQuery jeditable for Edit In Place features // jQuery jeditable for Edit In Place features
if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) { if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !defined('DISABLE_JQUERY_JEDITABLE')) {
print '<!-- JS to manage editInPlace feature -->'."\n"; print '<!-- JS to manage editInPlace feature -->'."\n";
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1936,13 +1936,13 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} }
// jQuery Timepicker // jQuery Timepicker
if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) { if (getDolGlobalString('MAIN_USE_JQUERY_TIMEPICKER') || defined('REQUIRE_JQUERY_TIMEPICKER')) {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
} }
if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) { if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {
// jQuery plugin "mutiselect", "multiple-select", "select2", ... // jQuery plugin "mutiselect", "multiple-select", "select2", ...
$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT; $tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
} }
if (!defined('DISABLE_MULTISELECT')) { // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool if (!defined('DISABLE_MULTISELECT')) { // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
@@ -1952,7 +1952,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!$disablejs && !empty($conf->use_javascript_ajax)) { if (!$disablejs && !empty($conf->use_javascript_ajax)) {
// CKEditor // CKEditor
if (empty($disableforlogin) && (isModEnabled('fckeditor') && (empty($conf->global->FCKEDITOR_EDITORNAME) || getDolGlobalString('FCKEDITOR_EDITORNAME') == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) { if (empty($disableforlogin) && (isModEnabled('fckeditor') && (!getDolGlobalString('FCKEDITOR_EDITORNAME') || getDolGlobalString('FCKEDITOR_EDITORNAME') == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
print '<!-- Includes JS for CKEditor -->'."\n"; print '<!-- Includes JS for CKEditor -->'."\n";
$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/'; $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
$jsckeditor = 'ckeditor.js'; $jsckeditor = 'ckeditor.js';
@@ -1980,7 +1980,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages). // Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN')) { if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN')) {
$enablebrowsernotif = false; $enablebrowsernotif = false;
if (isModEnabled('agenda') && !empty($conf->global->AGENDA_REMINDER_BROWSER)) { if (isModEnabled('agenda') && getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
$enablebrowsernotif = true; $enablebrowsernotif = true;
} }
if ($conf->browser->layout == 'phone') { if ($conf->browser->layout == 'phone') {
@@ -2027,7 +2027,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} }
//If you want to load custom javascript file from your selected theme directory //If you want to load custom javascript file from your selected theme directory
if (!empty($conf->global->ALLOW_THEME_JS)) { if (getDolGlobalString('ALLOW_THEME_JS')) {
$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0); $theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
if (file_exists($theme_js)) { if (file_exists($theme_js)) {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -2037,8 +2037,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!empty($head)) { if (!empty($head)) {
print $head."\n"; print $head."\n";
} }
if (!empty($conf->global->MAIN_HTML_HEADER)) { if (getDolGlobalString('MAIN_HTML_HEADER')) {
print $conf->global->MAIN_HTML_HEADER."\n"; print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
} }
$parameters = array(); $parameters = array();
@@ -2102,14 +2102,14 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
print '<header id="id-top" class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible. print '<header id="id-top" class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
// Show menu entries // Show menu entries
print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n"; print '<div id="tmenu_tooltip'.(!getDolGlobalString('MAIN_MENU_INVERT') ? '' : 'invert').'" class="tmenu">'."\n";
$menumanager->atarget = $target; $menumanager->atarget = $target;
$menumanager->showmenu('top', array('searchform'=>$searchform)); // This contains a \n $menumanager->showmenu('top', array('searchform'=>$searchform)); // This contains a \n
print "</div>\n"; print "</div>\n";
// Define link to login card // Define link to login card
$appli = constant('DOL_APPLICATION_TITLE'); $appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$appli = $conf->global->MAIN_APPLICATION_TITLE; $appli = $conf->global->MAIN_APPLICATION_TITLE;
if (preg_match('/\d\.\d/', $appli)) { if (preg_match('/\d\.\d/', $appli)) {
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -2128,7 +2128,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$logouttext = ''; $logouttext = '';
$logouthtmltext = ''; $logouthtmltext = '';
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
//$logouthtmltext=$appli.'<br>'; //$logouthtmltext=$appli.'<br>';
$stringforfirstkey = $langs->trans("KeyboardShortcut"); $stringforfirstkey = $langs->trans("KeyboardShortcut");
if ($conf->browser->name == 'chrome') { if ($conf->browser->name == 'chrome') {
@@ -2176,7 +2176,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
// Link to print main content area // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_PRINT_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]); $qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
if (isset($_POST) && is_array($_POST)) { if (isset($_POST) && is_array($_POST)) {
@@ -2195,7 +2195,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
// Link to Dolibarr wiki pages // Link to Dolibarr wiki pages
if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_HELP_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$langs->load("help"); $langs->load("help");
$helpbaseurl = ''; $helpbaseurl = '';
@@ -2241,13 +2241,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
// Version // Version
if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) { if (getDolGlobalString('MAIN_SHOWDATABASENAMEINHELPPAGESLINK')) {
$langs->load('admin'); $langs->load('admin');
$appli .= '<br>'.$langs->trans("Database").': '.$db->database_name; $appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
} }
} }
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>'; $text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2); $toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
} }
@@ -2265,12 +2265,12 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$mode = -1; $mode = -1;
$toprightmenu .= '<div class="inline-block login_block_elem login_block_elem_name nowrap centpercent" style="padding: 0px;">'; $toprightmenu .= '<div class="inline-block login_block_elem login_block_elem_name nowrap centpercent" style="padding: 0px;">';
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { if (getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
// Add search dropdown // Add search dropdown
$toprightmenu .= top_menu_search(); $toprightmenu .= top_menu_search();
} }
if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
// Add search dropdown // Add search dropdown
$toprightmenu .= top_menu_quickadd(); $toprightmenu .= top_menu_quickadd();
} }
@@ -2386,7 +2386,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>'; $dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]); $dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) { if (getDolGlobalString('MAIN_MODULE_MULTICOMPANY')) {
$dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')'; $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
} }
$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)'); $dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
@@ -2454,7 +2454,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
// Define version to show // Define version to show
$appli = constant('DOL_APPLICATION_TITLE'); $appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$appli = $conf->global->MAIN_APPLICATION_TITLE; $appli = $conf->global->MAIN_APPLICATION_TITLE;
if (preg_match('/\d\.\d/', $appli)) { if (preg_match('/\d\.\d/', $appli)) {
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -2467,7 +2467,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$appli .= " ".DOL_VERSION; $appli .= " ".DOL_VERSION;
} }
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$btnUser = '<!-- div for user link --> $btnUser = '<!-- div for user link -->
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block"> <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown"> <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
@@ -2729,7 +2729,7 @@ function printDropdownQuickadd()
"title" => "NewSupplierOrderShort@orders", "title" => "NewSupplierOrderShort@orders",
"name" => "SupplierOrder@orders", "name" => "SupplierOrder@orders",
"picto" => "supplier_order", "picto" => "supplier_order",
"activation" => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "commande", "write")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_invoice", "write")), // vs hooking "activation" => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "commande", "write")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_invoice", "write")), // vs hooking
"position" => 80, "position" => 80,
), ),
array( array(
@@ -2737,7 +2737,7 @@ function printDropdownQuickadd()
"title" => "NewBill@bills", "title" => "NewBill@bills",
"name" => "SupplierBill@bills", "name" => "SupplierBill@bills",
"picto" => "supplier_invoice", "picto" => "supplier_invoice",
"activation" => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "facture", "write")) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "write")), // vs hooking "activation" => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "facture", "write")) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "write")), // vs hooking
"position" => 90, "position" => 90,
), ),
array( array(
@@ -2839,7 +2839,7 @@ function top_menu_bookmark()
$html = ''; $html = '';
// Define $bookmarks // Define $bookmarks
if (!isModEnabled('bookmark') || empty($user->rights->bookmark->lire)) { if (!isModEnabled('bookmark') || !$user->hasRight('bookmark', 'lire')) {
return $html; return $html;
} }
@@ -2858,7 +2858,7 @@ function top_menu_bookmark()
include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php'; include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
$langs->load("bookmarks"); $langs->load("bookmarks");
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">'; $html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';
$html .= printDropdownBookmarksList(); $html .= printDropdownBookmarksList();
$html .= '</div>'; $html .= '</div>';
@@ -3113,7 +3113,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
$form = new Form($db); $form = new Form($db);
} }
$selected = -1; $selected = -1;
if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { if (!getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ? // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
if ($conf->browser->layout == 'phone') { if ($conf->browser->layout == 'phone') {
$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
@@ -3123,7 +3123,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
$arrayresult = array(); $arrayresult = array();
include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This make initHooks('searchform') then set $arrayresult include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This make initHooks('searchform') then set $arrayresult
if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) { if ($conf->use_javascript_ajax && !getDolGlobalString('MAIN_USE_OLD_SEARCH_FORM')) {
// accesskey is for Windows or Linux: ALT + key for chrome, ALT + SHIFT + KEY for firefox // accesskey is for Windows or Linux: ALT + key for chrome, ALT + SHIFT + KEY for firefox
// accesskey is for Mac: CTRL + key for all browsers // accesskey is for Mac: CTRL + key for all browsers
$stringforfirstkey = $langs->trans("KeyboardShortcut"); $stringforfirstkey = $langs->trans("KeyboardShortcut");
@@ -3135,7 +3135,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
$stringforfirstkey .= ' CTL +'; $stringforfirstkey .= ' CTL +';
} }
$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1, $stringforfirstkey.' s'); $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1, $stringforfirstkey.' s');
} else { } else {
if (is_array($arrayresult)) { if (is_array($arrayresult)) {
foreach ($arrayresult as $key => $val) { foreach ($arrayresult as $key => $val) {
@@ -3154,10 +3154,10 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
} }
// Force special value for $searchform for text browsers or very old search form // Force special value for $searchform for text browsers or very old search form
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) { if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') || empty($conf->use_javascript_ajax)) {
$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1'; $urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>'; $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
} elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) { } elseif ($conf->use_javascript_ajax && getDolGlobalString('MAIN_USE_OLD_SEARCH_FORM')) {
$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>'; $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
$searchform .= '<script> $searchform .= '<script>
jQuery(document).ready(function () { jQuery(document).ready(function () {
@@ -3191,7 +3191,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
// Left column // Left column
print '<!-- Begin left menu -->'."\n"; print '<!-- Begin left menu -->'."\n";
print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n"; print '<div class="vmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Left menu"').'>'."\n\n";
// Show left menu with other forms // Show left menu with other forms
$menumanager->menu_array = $menu_array_before; $menumanager->menu_array = $menu_array_before;
@@ -3204,7 +3204,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n"; print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
// Version // Version
if (!empty($conf->global->MAIN_SHOW_VERSION)) { // Version is already on help picto and on login page. if (getDolGlobalString('MAIN_SHOW_VERSION')) { // Version is already on help picto and on login page.
$doliurl = 'https://www.dolibarr.org'; $doliurl = 'https://www.dolibarr.org';
//local communities //local communities
if (preg_match('/fr/i', $langs->defaultlang)) { if (preg_match('/fr/i', $langs->defaultlang)) {
@@ -3224,7 +3224,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
} }
$appli = constant('DOL_APPLICATION_TITLE'); $appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) { if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = ''; $appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
if (preg_match('/\d\.\d/', $appli)) { if (preg_match('/\d\.\d/', $appli)) {
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) { if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -3252,7 +3252,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
} }
// Link to bugtrack // Link to bugtrack
if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) { if (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK')) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
if (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') == 'github') { if (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') == 'github') {
@@ -3290,7 +3290,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
$bugbaseurl .= urlencode("\n"); $bugbaseurl .= urlencode("\n");
$bugbaseurl .= urlencode("## Report\n"); $bugbaseurl .= urlencode("## Report\n");
} elseif (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) { } elseif (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK')) {
$bugbaseurl = $conf->global->MAIN_BUGTRACK_ENABLELINK; $bugbaseurl = $conf->global->MAIN_BUGTRACK_ENABLELINK;
} else { } else {
$bugbaseurl = ""; $bugbaseurl = "";
@@ -3358,12 +3358,12 @@ function main_area($title = '')
$reshook = $hookmanager->executeHooks('printMainArea', $parameters); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('printMainArea', $parameters); // Note that $action and $object may have been modified by some hooks
print $hookmanager->resPrint; print $hookmanager->resPrint;
if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) { if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode'); print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
} }
// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT // Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) { if (getDolGlobalString('SHOW_SOCINFO_ON_PRINT') && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
$parameters = array(); $parameters = array();
$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters); $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
if (empty($reshook)) { if (empty($reshook)) {
@@ -3372,19 +3372,19 @@ function main_area($title = '')
print '<table class="centpercent div-table-responsive">'."\n"; print '<table class="centpercent div-table-responsive">'."\n";
print '<tbody>'; print '<tbody>';
print '<tr><td rowspan="0" class="width20p">'; print '<tr><td rowspan="0" class="width20p">';
if ($conf->global->MAIN_SHOW_LOGO && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($conf->global->MAIN_INFO_SOCIETE_LOGO)) { if ($conf->global->MAIN_SHOW_LOGO && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && getDolGlobalString('MAIN_INFO_SOCIETE_LOGO')) {
print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">'; print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
} }
print '</td><td rowspan="0" class="width50p"></td></tr>'."\n"; print '</td><td rowspan="0" class="width50p"></td></tr>'."\n";
print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n"; print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n"; print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) { if (getDolGlobalString('MAIN_INFO_SOCIETE_TEL')) {
print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>'; print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
} }
if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) { if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>'; print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
} }
if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) { if (getDolGlobalString('MAIN_INFO_SOCIETE_WEB')) {
print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>'; print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
} }
print '</tbody>'; print '</tbody>';
@@ -3581,7 +3581,7 @@ if (!function_exists("llxFooter")) {
} }
// Core error message // Core error message
if (!empty($conf->global->MAIN_CORE_ERROR)) { if (getDolGlobalString('MAIN_CORE_ERROR')) {
// Ajax version // Ajax version
if ($conf->use_javascript_ajax) { if ($conf->use_javascript_ajax) {
$title = img_warning().' '.$langs->trans('CoreErrorTitle'); $title = img_warning().' '.$langs->trans('CoreErrorTitle');
@@ -3667,7 +3667,7 @@ if (!function_exists("llxFooter")) {
//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'; //print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id); // Do not use dol_hash(), must not change if salt changes. $hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id); // Do not use dol_hash(), must not change if salt changes.
if (empty($conf->global->MAIN_FIRST_PING_OK_DATE) if (!getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled')) || (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
|| $forceping) { || $forceping) {
// No ping done if we are into an alpha version // No ping done if we are into an alpha version
@@ -3676,14 +3676,14 @@ if (!function_exists("llxFooter")) {
} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping) { // Cookie is set when we uncheck the checkbox in the installation wizard. } elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping) { // Cookie is set when we uncheck the checkbox in the installation wizard.
// MAIN_LAST_PING_KO_DATE // MAIN_LAST_PING_KO_DATE
// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent (this month) // Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent (this month)
if (!empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) { if (getDolGlobalString('MAIN_LAST_PING_KO_DATE') && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. An error already occured this month, we will try later. -->\n"; print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. An error already occured this month, we will try later. -->\n";
} else { } else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
print "\n".'<!-- Includes JS for Ping of Dolibarr forceping='.$forceping.' MAIN_FIRST_PING_OK_DATE='.getDolGlobalString("MAIN_FIRST_PING_OK_DATE").' MAIN_FIRST_PING_OK_ID='.getDolGlobalString("MAIN_FIRST_PING_OK_ID").' MAIN_LAST_PING_KO_DATE='.getDolGlobalString("MAIN_LAST_PING_KO_DATE").' -->'."\n"; print "\n".'<!-- Includes JS for Ping of Dolibarr forceping='.$forceping.' MAIN_FIRST_PING_OK_DATE='.getDolGlobalString("MAIN_FIRST_PING_OK_DATE").' MAIN_FIRST_PING_OK_ID='.getDolGlobalString("MAIN_FIRST_PING_OK_ID").' MAIN_LAST_PING_KO_DATE='.getDolGlobalString("MAIN_LAST_PING_KO_DATE").' -->'."\n";
print "\n<!-- JS CODE TO ENABLE the anonymous Ping -->\n"; print "\n<!-- JS CODE TO ENABLE the anonymous Ping -->\n";
$url_for_ping = (empty($conf->global->MAIN_URL_FOR_PING) ? "https://ping.dolibarr.org/" : $conf->global->MAIN_URL_FOR_PING); $url_for_ping = (!getDolGlobalString('MAIN_URL_FOR_PING') ? "https://ping.dolibarr.org/" : $conf->global->MAIN_URL_FOR_PING);
// Try to guess the distrib used // Try to guess the distrib used
$distrib = 'standard'; $distrib = 'standard';
if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') { if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') {

32
htdocs/reception/card.php
View File

@@ -1438,8 +1438,8 @@ if ($action == 'create') {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref customer reception // Ref customer reception
$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
// Thirdparty // Thirdparty
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
@@ -1532,7 +1532,7 @@ if ($action == 'create') {
// Weight // Weight
print '<tr><td>'; print '<tr><td>';
print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->reception->creer); print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->hasRight('reception', 'creer'));
print '</td><td colspan="3">'; print '</td><td colspan="3">';
if ($action == 'edittrueWeight') { if ($action == 'edittrueWeight') {
@@ -1563,13 +1563,13 @@ if ($action == 'create') {
print '</td></tr>'; print '</td></tr>';
// Width // Width
print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer).'</td><td colspan="3">'; print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer); print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('reception', 'creer'));
print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : ''; print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
print '</td></tr>'; print '</td></tr>';
// Height // Height
print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->reception->creer).'</td><td colspan="3">'; print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
if ($action == 'edittrueHeight') { if ($action == 'edittrueHeight') {
print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input name="action" value="settrueHeight" type="hidden">'; print '<input name="action" value="settrueHeight" type="hidden">';
@@ -1588,8 +1588,8 @@ if ($action == 'create') {
print '</td></tr>'; print '</td></tr>';
// Depth // Depth
print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer).'</td><td colspan="3">'; print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer); print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('reception', 'creer'));
print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : ''; print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
print '</td></tr>'; print '</td></tr>';
@@ -1671,8 +1671,8 @@ if ($action == 'create') {
print '</tr>'; print '</tr>';
// Tracking Number // Tracking Number
print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->reception->creer).'</td><td colspan="3">'; print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->reception->creer, 'safehtmlstring', $object->tracking_number); print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->hasRight('reception', 'creer'), 'safehtmlstring', $object->tracking_number);
print '</td></tr>'; print '</td></tr>';
// Incoterms // Incoterms
@@ -1681,7 +1681,7 @@ if ($action == 'create') {
print '<table width="100%" class="nobordernopadding"><tr><td>'; print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('IncotermLabel'); print $langs->trans('IncotermLabel');
print '<td><td class="right">'; print '<td><td class="right">';
if ($user->rights->reception->creer) { if ($user->hasRight('reception', 'creer')) {
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>'; print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
} else { } else {
print '&nbsp;'; print '&nbsp;';
@@ -2131,28 +2131,28 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if (empty($reshook)) { if (empty($reshook)) {
if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0) { if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0) {
if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate))) { || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate'))) {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid&token='.newToken().'">'.$langs->trans("Validate").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid&token='.newToken().'">'.$langs->trans("Validate").'</a>';
} else { } else {
print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
} }
} }
// Back to draft // Back to draft
if ($object->statut == Reception::STATUS_VALIDATED && $user->rights->reception->creer) { if ($object->statut == Reception::STATUS_VALIDATED && $user->hasRight('reception', 'creer')) {
print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('SetToDraft').'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('SetToDraft').'</a></div>';
} }
// TODO add alternative status // TODO add alternative status
// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order) // 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer) { if ($object->statut == Reception::STATUS_CLOSED && $user->hasRight('reception', 'creer')) {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
} }
// Send // Send
if (empty($user->socid)) { if (empty($user->socid)) {
if ($object->statut > 0) { if ($object->statut > 0) {
if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->rights->reception->reception_advance->send) { if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('reception', 'reception_advance', 'send')) {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
} else { } else {
print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>'; print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';

12
htdocs/reception/class/reception.class.php
View File

@@ -169,7 +169,7 @@ class Reception extends CommonObject
if (getDolGlobalString('RECEPTION_ADDON_NUMBER')) { if (getDolGlobalString('RECEPTION_ADDON_NUMBER')) {
$mybool = false; $mybool = false;
$file = $conf->global->RECEPTION_ADDON_NUMBER.".php"; $file = getDolGlobalString('RECEPTION_ADDON_NUMBER') . ".php";
$classname = $conf->global->RECEPTION_ADDON_NUMBER; $classname = $conf->global->RECEPTION_ADDON_NUMBER;
// Include file with class // Include file with class
@@ -505,8 +505,8 @@ class Reception extends CommonObject
return 0; return 0;
} }
if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)))) { || (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate')))) {
$this->error = 'Permission denied'; $this->error = 'Permission denied';
dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
return -1; return -1;
@@ -1420,7 +1420,7 @@ class Reception extends CommonObject
public function setDeliveryDate($user, $delivery_date) public function setDeliveryDate($user, $delivery_date)
{ {
// phpcs:enable // phpcs:enable
if ($user->rights->reception->creer) { if ($user->hasRight('reception', 'creer')) {
$sql = "UPDATE ".MAIN_DB_PREFIX."reception"; $sql = "UPDATE ".MAIN_DB_PREFIX."reception";
$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null'); $sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
$sql .= " WHERE rowid = ".((int) $this->id); $sql .= " WHERE rowid = ".((int) $this->id);
@@ -1853,8 +1853,8 @@ class Reception extends CommonObject
return 0; return 0;
} }
if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)))) { || (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate')))) {
$this->error = 'Permission denied'; $this->error = 'Permission denied';
return -1; return -1;
} }

12
htdocs/reception/class/receptionstats.class.php
View File

@@ -70,7 +70,7 @@ class ReceptionStats extends Stats
//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity; //$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
$this->where .= " AND c.entity IN (".getEntity('reception').")"; $this->where .= " AND c.entity IN (".getEntity('reception').")";
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
} }
if ($this->socid) { if ($this->socid) {
@@ -94,7 +94,7 @@ class ReceptionStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb"; $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -118,7 +118,7 @@ class ReceptionStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")"; $sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE ".$this->where; $sql .= " WHERE ".$this->where;
@@ -141,7 +141,7 @@ class ReceptionStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, SUM(c.".$this->field.")"; $sql = "SELECT date_format(c.date_valid,'%m') as dm, SUM(c.".$this->field.")";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -165,7 +165,7 @@ class ReceptionStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%m') as dm, AVG(c.".$this->field.")"; $sql = "SELECT date_format(c.date_valid,'%m') as dm, AVG(c.".$this->field.")";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; $sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -187,7 +187,7 @@ class ReceptionStats extends Stats
$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg"; $sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
if (empty($user->rights->societe->client->voir) && !$this->socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE ".$this->where; $sql .= " WHERE ".$this->where;

10
htdocs/reception/contact.php
View File

@@ -98,7 +98,7 @@ if (isModEnabled("reception")) {
* Actions * Actions
*/ */
if ($action == 'addcontact' && $user->rights->reception->creer) { if ($action == 'addcontact' && $user->hasRight('reception', 'creer')) {
if ($result > 0 && $id > 0) { if ($result > 0 && $id > 0) {
$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -118,10 +118,10 @@ if ($action == 'addcontact' && $user->rights->reception->creer) {
} }
setEventMessages($mesg, $mesgs, 'errors'); setEventMessages($mesg, $mesgs, 'errors');
} }
} elseif ($action == 'swapstatut' && $user->rights->reception->creer) { } elseif ($action == 'swapstatut' && $user->hasRight('reception', 'creer')) {
// bascule du statut d'un contact // bascule du statut d'un contact
$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int')); $result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
} elseif ($action == 'deletecontact' && $user->rights->reception->creer) { } elseif ($action == 'deletecontact' && $user->hasRight('reception', 'creer')) {
// Efface un contact // Efface un contact
$result = $objectsrc->delete_contact(GETPOST("lineid", 'int')); $result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
@@ -161,8 +161,8 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref customer reception // Ref customer reception
$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
// Thirdparty // Thirdparty
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
// Project // Project

4
htdocs/reception/dispatch.php
View File

@@ -352,8 +352,8 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref customer reception // Ref customer reception
$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
// Thirdparty // Thirdparty
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);

4
htdocs/reception/document.php
View File

@@ -149,8 +149,8 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref customer reception // Ref customer reception
$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
// Thirdparty // Thirdparty
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);

10
htdocs/reception/index.php
View File

@@ -88,7 +88,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
if (empty($user->rights->societe->client->voir) && !$socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
$sql .= $clause." sc.fk_user = ".((int) $user->id); $sql .= $clause." sc.fk_user = ".((int) $user->id);
$clause = " AND "; $clause = " AND ";
@@ -152,11 +152,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
if (empty($user->rights->societe->client->voir) && !$socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
} }
$sql .= " WHERE e.entity IN (".getEntity('reception').")"; $sql .= " WHERE e.entity IN (".getEntity('reception').")";
if (empty($user->rights->societe->client->voir) && !$socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " AND sc.fk_user = ".((int) $user->id); $sql .= " AND sc.fk_user = ".((int) $user->id);
} }
$sql .= " AND e.fk_statut = 1"; $sql .= " AND e.fk_statut = 1";
@@ -213,7 +213,7 @@ if ($resql) {
$sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid"; $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,"; $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
$sql .= " ".MAIN_DB_PREFIX."societe as s"; $sql .= " ".MAIN_DB_PREFIX."societe as s";
if (empty($user->rights->societe->client->voir) && !$socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE c.fk_soc = s.rowid"; $sql .= " WHERE c.fk_soc = s.rowid";
@@ -222,7 +222,7 @@ $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".Comma
if ($socid > 0) { if ($socid > 0) {
$sql .= " AND c.fk_soc = ".((int) $socid); $sql .= " AND c.fk_soc = ".((int) $socid);
} }
if (empty($user->rights->societe->client->voir) && !$socid) { if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
} }
$sql .= " ORDER BY c.rowid ASC"; $sql .= " ORDER BY c.rowid ASC";

6
htdocs/reception/list.php
View File

@@ -613,7 +613,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_ty
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
if (empty($user->rights->societe->client->voir) && !$socid) { // Internal user with no permission to see all if (!$user->hasRight('societe', 'client', 'voir') && !$socid) { // Internal user with no permission to see all
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
// Add joins from hooks // Add joins from hooks
@@ -621,7 +621,7 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint; $sql .= $hookmanager->resPrint;
$sql .= " WHERE e.entity IN (".getEntity('reception').")"; $sql .= " WHERE e.entity IN (".getEntity('reception').")";
if (empty($user->rights->societe->client->voir) && !$socid) { // Internal user with no permission to see all if (!$user->hasRight('societe', 'client', 'voir') && !$socid) { // Internal user with no permission to see all
$sql .= " AND e.fk_soc = sc.fk_soc"; $sql .= " AND e.fk_soc = sc.fk_soc";
$sql .= " AND sc.fk_user = ".((int) $user->id); $sql .= " AND sc.fk_user = ".((int) $user->id);
} }
@@ -837,7 +837,7 @@ $arrayofmassactions = array(
// 'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"), // 'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
); );
if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->rights->supplier_invoice->creer) { if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')) {
$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisReceptions"); $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisReceptions");
} }
if ($massaction == 'createbills') { if ($massaction == 'createbills') {

6
htdocs/reception/note.php
View File

@@ -89,7 +89,7 @@ if ($origin == 'reception') {
} else { } else {
if ($origin == 'supplierorder' || $origin == 'order_supplier') { if ($origin == 'supplierorder' || $origin == 'order_supplier') {
$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande'); $result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande');
} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) { } elseif (!$user->hasRight($origin, 'lire') && !$user->hasRight($origin, 'read')) {
accessforbidden(); accessforbidden();
} }
} }
@@ -127,8 +127,8 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref customer reception // Ref customer reception
$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
// Thirdparty // Thirdparty
$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1); $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
// Project // Project

2
htdocs/reception/stats/index.php
View File

@@ -71,7 +71,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
// $data = array(array('Lib',val1,val2,val3),...) // $data = array(array('Lib',val1,val2,val3),...)
if (empty($user->rights->societe->client->voir) || $user->socid) { if (!$user->hasRight('societe', 'client', 'voir') || $user->socid) {
$filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png'; $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
} else { } else {
$filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png'; $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';

2
htdocs/reception/tpl/linkedobjectblock.tpl.php
View File

@@ -59,7 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
<td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td> <td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td>
<td class="linkedcol-date"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td> <td class="linkedcol-date"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
<td class="linkedcol-amount right"><?php <td class="linkedcol-amount right"><?php
if ($user->rights->reception->lire) { if ($user->hasRight('reception', 'lire')) {
$total = $total + $objectlink->total_ht; $total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht); echo price($objectlink->total_ht);
} ?></td> } ?></td>

8
htdocs/recruitment/admin/setup.php
View File

@@ -298,10 +298,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
$module = new $file($db); $module = new $file($db);
// Show modules according to features level // Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
continue; continue;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
continue; continue;
} }
@@ -436,10 +436,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
$module = new $classname($db); $module = new $classname($db);
$modulequalified = 1; $modulequalified = 1;
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
$modulequalified = 0; $modulequalified = 0;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
$modulequalified = 0; $modulequalified = 0;
} }

8
htdocs/recruitment/admin/setup_candidatures.php
View File

@@ -296,10 +296,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
$module = new $file($db); $module = new $file($db);
// Show modules according to features level // Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
continue; continue;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
continue; continue;
} }
@@ -434,10 +434,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
$module = new $classname($db); $module = new $classname($db);
$modulequalified = 1; $modulequalified = 1;
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
$modulequalified = 0; $modulequalified = 0;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
$modulequalified = 0; $modulequalified = 0;
} }

2
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@@ -951,7 +951,7 @@ class RecruitmentCandidature extends CommonObject
if (getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON')) { if (getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON')) {
$mybool = false; $mybool = false;
$file = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON.".php"; $file = getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON') . ".php";
$classname = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON; $classname = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON;
// Include file with class // Include file with class

2
htdocs/recruitment/class/recruitmentjobposition.class.php
View File

@@ -1008,7 +1008,7 @@ class RecruitmentJobPosition extends CommonObject
if (getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON')) { if (getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON')) {
$mybool = false; $mybool = false;
$file = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON.".php"; $file = getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON') . ".php";
$classname = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON; $classname = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON;
// Include file with class // Include file with class

2
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@@ -324,7 +324,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
if (!empty($conf->mycompany->multidir_output[$object->entity])) { if (!empty($conf->mycompany->multidir_output[$object->entity])) {
$logodir = $conf->mycompany->multidir_output[$object->entity]; $logodir = $conf->mycompany->multidir_output[$object->entity];
} }
$pagecount = $pdf->setSourceFile($logodir.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND); $pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
$tplidx = $pdf->importPage(1); $tplidx = $pdf->importPage(1);
} }

8
htdocs/recruitment/index.php
View File

@@ -337,11 +337,11 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications"; $sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s"; $sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) { if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")"; $sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) { if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
} }
if ($socid) { if ($socid) {
@@ -408,11 +408,11 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status"; $sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc"; $sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) { if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")"; $sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) { if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
} }
if ($socid) { if ($socid) {

2
htdocs/resource/agenda.php
View File

@@ -88,7 +88,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
$result = restrictedArea($user, 'resource', $object->id, 'resource'); $result = restrictedArea($user, 'resource', $object->id, 'resource');
// Security check // Security check
if (!$user->rights->resource->read) { if (!$user->hasRight('resource', 'read')) {
accessforbidden(); accessforbidden();
} }

10
htdocs/resource/card.php
View File

@@ -89,7 +89,7 @@ if (empty($reshook)) {
$action = ''; $action = '';
} }
if ($action == 'add' && $user->rights->resource->write) { if ($action == 'add' && $user->hasRight('resource', 'write')) {
if (!$cancel) { if (!$cancel) {
$error = ''; $error = '';
@@ -126,7 +126,7 @@ if (empty($reshook)) {
} }
} }
if ($action == 'update' && !$cancel && $user->rights->resource->write) { if ($action == 'update' && !$cancel && $user->hasRight('resource', 'write')) {
$error = 0; $error = 0;
if (empty($ref)) { if (empty($ref)) {
@@ -167,7 +167,7 @@ if (empty($reshook)) {
} }
} }
if ($action == 'confirm_delete_resource' && $user->rights->resource->delete && $confirm === 'yes') { if ($action == 'confirm_delete_resource' && $user->hasRight('resource', 'delete') && $confirm === 'yes') {
$res = $object->fetch($id); $res = $object->fetch($id);
if ($res > 0) { if ($res > 0) {
$result = $object->delete($id); $result = $object->delete($id);
@@ -206,7 +206,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
} }
if ($action == 'create' || $action == 'edit') { if ($action == 'create' || $action == 'edit') {
if (!$user->rights->resource->write) { if (!$user->hasRight('resource', 'write')) {
accessforbidden('', 0, 1); accessforbidden('', 0, 1);
} }
@@ -341,7 +341,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
if (empty($reshook)) { if (empty($reshook)) {
if ($action != "create" && $action != "edit") { if ($action != "create" && $action != "edit") {
// Edit resource // Edit resource
if ($user->rights->resource->write) { if ($user->hasRight('resource', 'write')) {
print '<div class="inline-block divButAction">'; print '<div class="inline-block divButAction">';
print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans('Modify').'</a>'; print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans('Modify').'</a>';
print '</div>'; print '</div>';

8
htdocs/resource/contact.php
View File

@@ -53,7 +53,7 @@ if ($user->socid) {
$result = restrictedArea($user, 'resource', $object->id, 'resource'); $result = restrictedArea($user, 'resource', $object->id, 'resource');
// Security check // Security check
if (!$user->rights->resource->read) { if (!$user->hasRight('resource', 'read')) {
accessforbidden(); accessforbidden();
} }
@@ -64,7 +64,7 @@ if (!$user->rights->resource->read) {
*/ */
// Add a new contact // Add a new contact
if ($action == 'addcontact' && $user->rights->resource->write) { if ($action == 'addcontact' && $user->hasRight('resource', 'write')) {
if ($result > 0 && $id > 0) { if ($result > 0 && $id > 0) {
$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -84,10 +84,10 @@ if ($action == 'addcontact' && $user->rights->resource->write) {
setEventMessages($mesg, null, 'errors'); setEventMessages($mesg, null, 'errors');
} }
} elseif ($action == 'swapstatut' && $user->rights->resource->write) { } elseif ($action == 'swapstatut' && $user->hasRight('resource', 'write')) {
// Toggle the status of a contact // Toggle the status of a contact
$result = $object->swapContactStatus(GETPOST('ligne', 'int')); $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
} elseif ($action == 'deletecontact' && $user->rights->resource->write) { } elseif ($action == 'deletecontact' && $user->hasRight('resource', 'write')) {
// Erase a contact // Erase a contact
$result = $object->delete_contact(GETPOST('lineid', 'int')); $result = $object->delete_contact(GETPOST('lineid', 'int'));

6
htdocs/resource/element_resource.php
View File

@@ -80,7 +80,7 @@ if ($socid > 0) { // Special for thirdparty
$element = 'societe'; $element = 'societe';
} }
if (!$user->rights->resource->read) { if (!$user->hasRight('resource', 'read')) {
accessforbidden(); accessforbidden();
} }
@@ -193,7 +193,7 @@ if (empty($reshook)) {
} }
// Update ressource // Update ressource
if ($action == 'update_linked_resource' && $user->rights->resource->write && !GETPOST('cancel', 'alpha')) { if ($action == 'update_linked_resource' && $user->hasRight('resource', 'write') && !GETPOST('cancel', 'alpha')) {
$res = $object->fetch_element_resource($lineid); $res = $object->fetch_element_resource($lineid);
if ($res) { if ($res) {
$object->busy = $busy; $object->busy = $busy;
@@ -272,7 +272,7 @@ if (empty($reshook)) {
} }
// Delete a resource linked to an element // Delete a resource linked to an element
if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->delete && $confirm === 'yes') { if ($action == 'confirm_delete_linked_resource' && $user->hasRight('resource', 'delete') && $confirm === 'yes') {
$result = $object->delete_resource($lineid, $element); $result = $object->delete_resource($lineid, $element);
if ($result >= 0) { if ($result >= 0) {

4
htdocs/resource/list.php
View File

@@ -113,7 +113,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$filter = array(); $filter = array();
} }
if (empty($user->rights->resource->read)) { if (!$user->hasRight('resource', 'read')) {
accessforbidden(); accessforbidden();
} }
@@ -217,7 +217,7 @@ if ($ret == -1) {
exit; exit;
} else { } else {
$newcardbutton = ''; $newcardbutton = '';
if ($user->rights->resource->write) { if ($user->hasRight('resource', 'write')) {
$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create'); $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
} }

12
htdocs/salaries/virement_request.php
View File

@@ -91,10 +91,10 @@ if ($id > 0 || !empty($ref)) {
// Check current user can read this salary // Check current user can read this salary
$canread = 0; $canread = 0;
if (!empty($user->rights->salaries->readall)) { if ($user->hasRight('salaries', 'readall')) {
$canread = 1; $canread = 1;
} }
if (!empty($user->rights->salaries->read) && $object->fk_user > 0 && in_array($object->fk_user, $childids)) { if ($user->hasRight('salaries', 'read') && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
$canread = 1; $canread = 1;
} }
if (!$canread) { if (!$canread) {
@@ -133,13 +133,13 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
*/ */
// Link to a project // Link to a project
if ($action == 'classin' && $user->rights->banque->modifier) { if ($action == 'classin' && $user->hasRight('banque', 'modifier')) {
$object->fetch($id); $object->fetch($id);
$object->setProject($projectid); $object->setProject($projectid);
} }
// set label // set label
if ($action == 'setlabel' && $user->rights->salaries->write) { if ($action == 'setlabel' && $user->hasRight('salaries', 'write')) {
$object->fetch($id); $object->fetch($id);
$object->label = $label; $object->label = $label;
$object->update($user); $object->update($user);
@@ -217,7 +217,7 @@ $userstatic->fetch($object->fk_user);
// Label // Label
if ($action != 'editlabel') { if ($action != 'editlabel') {
$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->hasRight('salaries', 'write'), 'string', '', 0, 1);
$morehtmlref .= $object->label; $morehtmlref .= $object->label;
} else { } else {
$morehtmlref .= $langs->trans('Label').' :&nbsp;'; $morehtmlref .= $langs->trans('Label').' :&nbsp;';
@@ -317,7 +317,7 @@ if (isModEnabled("banque")) {
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('DefaultBankAccount'); print $langs->trans('DefaultBankAccount');
print '<td>'; print '<td>';
if ($action != 'editbankaccount' && $user->rights->salaries->write) { if ($action != 'editbankaccount' && $user->hasRight('salaries', 'write')) {
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>'; print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
} }
print '</tr></table>'; print '</tr></table>';

8
htdocs/societe/admin/societe.php
View File

@@ -394,10 +394,10 @@ foreach ($dirsociete as $dirroot) {
$modCodeTiers = new $file; $modCodeTiers = new $file;
// Show modules according to features level // Show modules according to features level
if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($modCodeTiers->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
continue; continue;
} }
if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($modCodeTiers->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
continue; continue;
} }
@@ -570,9 +570,9 @@ foreach ($dirsociete as $dirroot) {
$modulequalified = 1; $modulequalified = 1;
if (!empty($module->version)) { if (!empty($module->version)) {
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
$modulequalified = 0; $modulequalified = 0;
} elseif ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { } elseif ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
$modulequalified = 0; $modulequalified = 0;
} }
} }

4
htdocs/takepos/admin/setup.php
View File

@@ -172,10 +172,10 @@ foreach ($dirmodels as $reldir) {
$module = new $file; $module = new $file;
// Show modules according to features level // Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
continue; continue;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
continue; continue;
} }

4
htdocs/takepos/admin/terminal.php
View File

@@ -382,10 +382,10 @@ if (getDolGlobalString('TAKEPOS_ADDON') == "terminal") {
$module = new $classname($db); $module = new $classname($db);
// Show modules according to features level // Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) { if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
continue; continue;
} }
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) { if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
continue; continue;
} }

2
htdocs/takepos/ajax/ajax.php
View File

@@ -150,7 +150,7 @@ if ($action == 'getProducts') {
// Define $filteroncategids, the filter on category ID if there is a Root category defined. // Define $filteroncategids, the filter on category ID if there is a Root category defined.
$filteroncategids = ''; $filteroncategids = '';
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { // A root category is defined, we must filter on products inside this category tree if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) { // A root category is defined, we must filter on products inside this category tree
$object = new Categorie($db); $object = new Categorie($db);
//$result = $object->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID); //$result = $object->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);
$arrayofcateg = $object->get_full_arbo('product', $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 1); $arrayofcateg = $object->get_full_arbo('product', $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 1);

2
htdocs/takepos/index.php
View File

@@ -1238,7 +1238,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
} }
if (count($maincategories) == 0) { if (count($maincategories) == 0) {
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
$tmpcategory = new Categorie($db); $tmpcategory = new Categorie($db);
$tmpcategory->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID); $tmpcategory->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);
setEventMessages($langs->trans("TakeposNeedsAtLeastOnSubCategoryIntoParentCategory", $tmpcategory->label), null, 'errors'); setEventMessages($langs->trans("TakeposNeedsAtLeastOnSubCategoryIntoParentCategory", $tmpcategory->label), null, 'errors');

10
htdocs/takepos/invoice.php
View File

@@ -534,9 +534,9 @@ if (empty($reshook)) {
} else { } else {
$prod->load_stock('warehouseopen'); $prod->load_stock('warehouseopen');
$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"]; $constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
if ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch!="") if ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch!="")
if (is_object($prod->stock_warehouse[$conf->global->$constantforkey]) && count($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch)) { if (is_object($prod->stock_warehouse[getDolGlobalString($constantforkey)]) && count($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch)) {
foreach ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch as $dbatch) { foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) {
$nbofsuggested++; $nbofsuggested++;
} }
} }
@@ -550,7 +550,7 @@ if (empty($reshook)) {
if ($nbofsuggested>0) { if ($nbofsuggested>0) {
echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>"; echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>";
foreach ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch as $dbatch) { // $dbatch is instance of Productbatch foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) { // $dbatch is instance of Productbatch
$batchStock = + $dbatch->qty; // To get a numeric $batchStock = + $dbatch->qty; // To get a numeric
$deliverableQty = min($quantityToBeDelivered, $batchStock); $deliverableQty = min($quantityToBeDelivered, $batchStock);
print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>'; print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
@@ -1026,7 +1026,7 @@ if (empty($reshook)) {
$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1)">'.$langs->trans('GiftReceipt').'</button>'; $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1)">'.$langs->trans('GiftReceipt').'</button>';
} }
} }
if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) { if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && getDolGlobalInt('TAKEPOS_EMAIL_TEMPLATE_INVOICE') > 0) {
$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.')">'.$langs->trans('SendTicket').'</button>'; $sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.')">'.$langs->trans('SendTicket').'</button>';
} }

4
htdocs/takepos/phone.php
View File

@@ -158,12 +158,12 @@ if ($action == "productinfo") {
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
$categorie = new Categorie($db); $categorie = new Categorie($db);
$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1); $categories = $categorie->get_full_arbo('product', ((getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
// Search root category to know its level // Search root category to know its level
//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0; //$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
$levelofrootcategory = 0; $levelofrootcategory = 0;
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
foreach ($categories as $key => $categorycursor) { foreach ($categories as $key => $categorycursor) {
if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) { if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
$levelofrootcategory = $categorycursor['level']; $levelofrootcategory = $categorycursor['level'];

2
htdocs/takepos/public/auto_order.php
View File

@@ -34,7 +34,7 @@ if (!defined('NOBROWSERNOTIF')) {
// Load Dolibarr environment // Load Dolibarr environment
require '../../main.inc.php'; require '../../main.inc.php';
if (!$conf->global->TAKEPOS_AUTO_ORDER) { if (!getDolGlobalString('TAKEPOS_AUTO_ORDER')) {
accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access
} }

4
htdocs/takepos/public/menu.php
View File

@@ -59,9 +59,9 @@ if (!$conf->global->TAKEPOS_QR_MENU) {
<?php <?php
$categorie = new Categorie($db); $categorie = new Categorie($db);
$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1); $categories = $categorie->get_full_arbo('product', ((getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
$levelofrootcategory = 0; $levelofrootcategory = 0;
if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) { if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
foreach ($categories as $key => $categorycursor) { foreach ($categories as $key => $categorycursor) {
if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) { if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
$levelofrootcategory = $categorycursor['level']; $levelofrootcategory = $categorycursor['level'];

2
htdocs/theme/eldy/manifest.json.php
View File

@@ -22,7 +22,7 @@
/** /**
* \file htdocs/theme/eldy/manifest.json.php * \file htdocs/theme/eldy/manifest.json.php
* \brief File for The Web App * \brief File for The Web App (PWA)
*/ */
if (!defined('NOREQUIREUSER')) { if (!defined('NOREQUIREUSER')) {

2
htdocs/theme/md/manifest.json.php
View File

@@ -22,7 +22,7 @@
/** /**
* \file htdocs/theme/md/manifest.json.php * \file htdocs/theme/md/manifest.json.php
* \brief File for The Web App * \brief File for The Web App (PWA)
*/ */
if (!defined('NOREQUIREUSER')) { if (!defined('NOREQUIREUSER')) {

6
htdocs/viewimage.php
View File

@@ -254,9 +254,9 @@ $fullpath_original_file = $check_access['original_file']; // $fullpath_origi
if (!empty($hashp)) { if (!empty($hashp)) {
$accessallowed = 1; // When using hashp, link is public so we force $accessallowed $accessallowed = 1; // When using hashp, link is public so we force $accessallowed
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} elseif (isset($_GET["publictakepos"])) { } elseif (GETPOSTINT("publictakepos")) {
if (!empty($conf->global->TAKEPOS_AUTO_ORDER)) { if (getDolGlobalString('TAKEPOS_AUTO_ORDER') && in_array($modulepart, array('product', 'category'))) {
$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable $accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories
} }
} else { } else {
// Basic protection (against external users only) // Basic protection (against external users only)

4
scripts/emailings/mailing-send.php
View File

@@ -150,9 +150,9 @@ if ($resql) {
$sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag"; $sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id); $sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id);
if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && empty($max)) { if (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && empty($max)) {
$sql2 .= " LIMIT " . getDolGlobalString('MAILING_LIMIT_SENDBYCLI'); $sql2 .= " LIMIT " . getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
} elseif ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && $max > 0) { } elseif (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && $max > 0) {
$sql2 .= " LIMIT ".min($conf->global->MAILING_LIMIT_SENDBYCLI, $max); $sql2 .= " LIMIT ".min($conf->global->MAILING_LIMIT_SENDBYCLI, $max);
} elseif ($max > 0) { } elseif ($max > 0) {
$sql2 .= " LIMIT ".((int) $max); $sql2 .= " LIMIT ".((int) $max);

6
test/phpunit/AdherentTest.php
View File

@@ -87,14 +87,14 @@ class AdherentTest extends PHPUnit\Framework\TestCase
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite. $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
if (!empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { if (getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {
print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n"; print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
die(1); die(1);
} }
if (!empty($conf->global->MAIN_MODULE_LDAP)) { if (getDolGlobalString('MAIN_MODULE_LDAP')) {
print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1); print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
} }
if (!empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { if (getDolGlobalString('MAIN_MODULE_MAILMANSPIP')) {
print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(1); print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(1);
} }

4
test/phpunit/ExportTest.php
View File

@@ -163,7 +163,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
$model='csvutf8'; $model='csvutf8';
$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ','; $conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE; print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
// Creation of class to export using model ExportXXX // Creation of class to export using model ExportXXX
$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
@@ -252,7 +252,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
$model='csviso'; $model='csviso';
$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ','; $conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE; print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
// Creation of class to export using model ExportXXX // Creation of class to export using model ExportXXX
$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";

2
test/phpunit/PricesTest.php
View File

@@ -39,7 +39,7 @@ if (empty($user->id)) {
} }
$conf->global->MAIN_DISABLE_ALL_MAILS=1; $conf->global->MAIN_DISABLE_ALL_MAILS=1;
if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) { if (getDolGlobalString('MAIN_ROUNDING_RULE_TOT')) {
print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n"; print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
exit(1); exit(1);
} }

4
test/phpunit/SocieteTest.php
View File

@@ -86,10 +86,10 @@ class SocieteTest extends PHPUnit\Framework\TestCase
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') {
print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(1); print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '" . getDolGlobalString('SOCIETE_CODECLIENT_ADDON')."'.\n"; die(1);
} }
if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) { if (getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(1); print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(1);
} }

2
test/phpunit/SupplierProposalTest.php
View File

@@ -88,7 +88,7 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
$db->begin(); // This is to have all actions inside a transaction even if test launched without suite. $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) { if (!getDolGlobalString('MAIN_MODULE_SUPPLIERPROPOSAL')) {
print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(1); print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(1);
} }

2
test/phpunit/UserTest.php
View File

@@ -84,7 +84,7 @@ class UserTest extends PHPUnit\Framework\TestCase
{ {
global $conf,$user,$langs,$db; global $conf,$user,$langs,$db;
if (!empty($conf->global->MAIN_MODULE_LDAP)) { if (getDolGlobalString('MAIN_MODULE_LDAP')) {
print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1); print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
} }