Fix: entity into public pages not set at correct place
This commit is contained in:
parent
1df18f1e93
commit
6e5f3b8bdd
@ -38,12 +38,11 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
// For MultiCompany module
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
if (is_int($entity))
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
{
|
|
||||||
define("DOLENTITY", $entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
|
||||||
|
|||||||
@ -27,12 +27,11 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
// For MultiCompany module
|
// For MultiCompany module.
|
||||||
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : 1);
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
if (is_int($entity))
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
{
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
define("DOLENTITY", $entity);
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
}
|
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
|
||||||
|
|||||||
@ -27,12 +27,11 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
// For MultiCompany module
|
// For MultiCompany module.
|
||||||
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : 1);
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
if (is_int($entity))
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
{
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
define("DOLENTITY", $entity);
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
}
|
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
|
|
||||||
|
|||||||
@ -27,6 +27,12 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||||
|
|||||||
@ -26,6 +26,12 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||||
|
|||||||
@ -26,6 +26,12 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paybox/lib/paybox.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||||
|
|||||||
@ -29,12 +29,11 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
// For MultiCompany module
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
if (is_int($entity))
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
{
|
|
||||||
define("DOLENTITY", $entity);
|
|
||||||
}
|
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
||||||
|
|||||||
@ -29,16 +29,17 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||||
|
|
||||||
// For MultiCompany module.
|
|
||||||
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
|
||||||
$entity=GETPOST('entity')?GETPOST('entity','int'):1;
|
|
||||||
if (is_int($entity)) define("DOLENTITY", $entity);
|
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
|
if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
|
||||||
|
|
||||||
|
|||||||
@ -29,16 +29,17 @@
|
|||||||
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
define("NOLOGIN",1); // This means this output page does not require to be logged.
|
||||||
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
|
||||||
|
|
||||||
|
// For MultiCompany module.
|
||||||
|
// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
|
||||||
|
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
||||||
|
$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
|
||||||
|
if (is_int($entity)) define("DOLENTITY", $entity);
|
||||||
|
|
||||||
require '../../main.inc.php';
|
require '../../main.inc.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||||
|
|
||||||
// For MultiCompany module
|
|
||||||
// TODO This should be useless. Because entity must be retreive from object ref and not from url.
|
|
||||||
$entity=GETPOST('entity')?GETPOST('entity','int'):1;
|
|
||||||
if (is_int($entity)) define("DOLENTITY", $entity);
|
|
||||||
|
|
||||||
// Security check
|
// Security check
|
||||||
if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
|
if (empty($conf->paypal->enabled)) accessforbidden('',1,1,1);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user