|
|
@@ -43,7 +43,7 @@ class Minz_FrontController {
|
|
|
Minz_Request::forward ($url);
|
|
|
} catch (Minz_Exception $e) {
|
|
|
Minz_Log::error($e->getMessage());
|
|
|
- $this->killApp ($e->getMessage ());
|
|
|
+ $this->killApp ($e->getMessage());
|
|
|
}
|
|
|
|
|
|
$this->dispatcher = Minz_Dispatcher::getInstance();
|
|
|
@@ -54,21 +54,21 @@ class Minz_FrontController {
|
|
|
* @return tableau représentant l'url
|
|
|
*/
|
|
|
private function buildUrl() {
|
|
|
- $url = array ();
|
|
|
+ $url = array();
|
|
|
|
|
|
- $url['c'] = Minz_Request::fetchGET (
|
|
|
+ $url['c'] = Minz_Request::fetchGET(
|
|
|
'c',
|
|
|
- Minz_Request::defaultControllerName ()
|
|
|
+ Minz_Request::defaultControllerName()
|
|
|
);
|
|
|
- $url['a'] = Minz_Request::fetchGET (
|
|
|
+ $url['a'] = Minz_Request::fetchGET(
|
|
|
'a',
|
|
|
- Minz_Request::defaultActionName ()
|
|
|
+ Minz_Request::defaultActionName()
|
|
|
);
|
|
|
- $url['params'] = Minz_Request::fetchGET ();
|
|
|
+ $url['params'] = Minz_Request::fetchGET();
|
|
|
|
|
|
// post-traitement
|
|
|
- unset ($url['params']['c']);
|
|
|
- unset ($url['params']['a']);
|
|
|
+ unset($url['params']['c']);
|
|
|
+ unset($url['params']['a']);
|
|
|
|
|
|
return $url;
|
|
|
}
|
|
|
@@ -76,7 +76,7 @@ class Minz_FrontController {
|
|
|
/**
|
|
|
* Démarre l'application (lance le dispatcher et renvoie la réponse)
|
|
|
*/
|
|
|
- public function run () {
|
|
|
+ public function run() {
|
|
|
try {
|
|
|
$this->dispatcher->run();
|
|
|
} catch (Minz_Exception $e) {
|
|
|
@@ -92,11 +92,11 @@ class Minz_FrontController {
|
|
|
$e instanceof Minz_ActionException) {
|
|
|
Minz_Error::error (
|
|
|
404,
|
|
|
- array ('error' => array ($e->getMessage ())),
|
|
|
+ array('error' => array ($e->getMessage ())),
|
|
|
true
|
|
|
);
|
|
|
} else {
|
|
|
- $this->killApp ();
|
|
|
+ $this->killApp();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -105,10 +105,11 @@ class Minz_FrontController {
|
|
|
* Permet d'arrêter le programme en urgence
|
|
|
*/
|
|
|
private function killApp ($txt = '') {
|
|
|
- if ($txt == '') {
|
|
|
- $txt = 'See logs files';
|
|
|
+ if (function_exists('errorMessage')) {
|
|
|
+ //If the application has defined a custom error message function
|
|
|
+ exit(errorMessage('Application problem', $txt));
|
|
|
}
|
|
|
- exit ('### Application problem ###<br />'."\n".$txt);
|
|
|
+ exit('### Application problem ###<br />' . "\n" . $txt);
|
|
|
}
|
|
|
|
|
|
private function setReporting() {
|