Acksop/SAND-framework
1
0
Fork 0
Code Issues Pull requests Packages Projects 1 Releases Wiki Activity

update 3.2.2

Browse source
This commit is contained in:
Emmanuel ROY 2021-02-23 16:41:07 +01:00
parent c341a9b84b
commit 0d3b2ae752
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
application/class/Url.php
View file

@ -112,17 +112,17 @@ class Url
case 'POST':
if ($appRequest) {
$page['name'] = ucfirst($page['name']);
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
if (!file_exists($pageFile)) {
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
}
} else {
$pageFile = CONTROLLERS_PATH . DIRECTORY_SEPARATOR . $page['name'] . '.php';
if (!file_exists($pageFile)) {
$page['name'] = ucfirst($page['name']);
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
if (!file_exists($pageFile)) {
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
}
}
}
@ -134,11 +134,34 @@ class Url
}
}
//Test sur l'existence de la page actuelle et renvoi sur le controlleur 404 d'erreur si besoin
if (!file_exists($pageFile)) {
if ($appRequest) {
$page['name'] = 'Error';
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
if (!file_exists($pageFile)) {
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
}
} else {
$page['name'] = 'error';
$pageFile = CONTROLLERS_PATH . DIRECTORY_SEPARATOR . $page['name'] . '.php';
if (!file_exists($pageFile)) {
$page['name'] = ucfirst($page['name']);
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php';
if (!file_exists($pageFile)) {
$pageFile = CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php';
if (!file_exists($pageFile)) {
//FrameWork : expose undefined controlleur error
// TODO: Send SANDerror
die("le controlleur 404 d'erreur n'existe pas : \n"
. CONTROLLERS_PATH . DIRECTORY_SEPARATOR . $page['name'] . '.php' . "\n"
. "ou l'un des controlleurs 404 (REST ou HTTP) n'existe pas : \n"
. CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'RestReponse.php \n'
. " ou \n"
. CONTROLLER_PATH . DIRECTORY_SEPARATOR . $page['name'] . 'HttpReponse.php');
}
}
}
}
}
$this->page = $page;