mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-21 02:34:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better error message on failure (#3407)

Browse Source 
* bump default logout from 30 to 365 days

* * Change cookie duration to constant
* Change cookie duration to three months

* use class

* use 90 days (otherwise login form says 91.3 days)

* change class

* also this works now

* Better error message

* inconsistent dot with the other message

* Better error message

* add errorMessage()

* fix style

* html escape the error title

* also html escape error message

* remove spaces before parentheses

* rework the error message

* Minz-friendly

* Update message

Do not advise running this script as wrong user

* Update lib/lib_rss.php

Co-authored-by: Martin <spleefer90@gmail.com>

Co-authored-by: Martin Rys <martin@rys.pw>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
This commit is contained in:
MartinMartin RysFrans de JongeAlexandre Alapetite
 authored and GitHub committed 2021-02-05 21:59:21 +01:00
1 parent 0577bc772b
commit 934f032c19
3 files changed
+44 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/Minz/FrontController.php
+16 -15
View File
@@ -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() {