From d5a4a98c22dfba45884c809ece786530c8a4806c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Jul 2015 14:56:43 +0200 Subject: [PATCH] FIX #3138 - Too much visible thing when access is denied on public pages --- htdocs/langs/en_US/errors.lang | 2 +- htdocs/public/agenda/agendaexport.php | 2 +- htdocs/public/donations/donateurs_code.php | 2 +- htdocs/public/members/new.php | 2 +- htdocs/public/members/public_card.php | 2 +- htdocs/public/members/public_list.php | 2 +- htdocs/public/paybox/newpayment.php | 2 +- htdocs/public/paybox/paymentko.php | 2 +- htdocs/public/paybox/paymentok.php | 2 +- htdocs/public/paypal/newpayment.php | 2 +- htdocs/public/paypal/paymentko.php | 2 +- htdocs/public/paypal/paymentok.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 8b935e8cc18..0e554c278ce 100755 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=%s is assigned to another third ErrorFailedToSendPassword=Failed to send password ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. ErrorPasswordDiffers=Passwords differs, please type them again. -ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. +ErrorForbidden=Access denied.
You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user. ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php index 3d5492dd62c..b3886824485 100644 --- a/htdocs/public/agenda/agendaexport.php +++ b/htdocs/public/agenda/agendaexport.php @@ -57,7 +57,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; // Security check -if (empty($conf->agenda->enabled)) accessforbidden('',1,1,1); +if (empty($conf->agenda->enabled)) accessforbidden('',0,0,1); // Not older than if (! isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY=100; // default limit diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 0fef24df949..ca50b39d061 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -42,7 +42,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php'; // Security check -if (empty($conf->don->enabled)) accessforbidden('',1,1,1); +if (empty($conf->don->enabled)) accessforbidden('',0,0,1); $langs->load("donations"); diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index cfe73b8ce0d..597c26c49f8 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -66,7 +66,7 @@ $langs->load("install"); $langs->load("other"); // Security check -if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); +if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1); if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) { diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index fc96ffed01c..8a98ea4c4c3 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; // Security check -if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); +if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1); $langs->load("main"); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 9064dd52879..ea2b70c2447 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -36,7 +36,7 @@ if (is_numeric($entity)) define("DOLENTITY", $entity); require '../../main.inc.php'; // Security check -if (empty($conf->adherent->enabled)) accessforbidden('',1,1,1); +if (empty($conf->adherent->enabled)) accessforbidden('',0,0,1); $langs->load("main"); diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index e7a0b258986..0760ff291ec 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Security check -if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other"); diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index 47601fb8dab..09de4525b39 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check -if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other"); diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index becfd7978c2..65f4545a4ba 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check -if (empty($conf->paybox->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paybox->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other"); diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php index d1ed853eb5d..4b9053cd4c2 100644 --- a/htdocs/public/paypal/newpayment.php +++ b/htdocs/public/paypal/newpayment.php @@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; // Security check -if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other"); diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index d6b1843b2b1..f21b2d2409c 100644 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check -if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other"); diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index f7fad5ebb31..499952c1b85 100644 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; // Security check -if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1); +if (empty($conf->paypal->enabled)) accessforbidden('',0,0,1); $langs->load("main"); $langs->load("other");