1 files changed, 42 insertions, 27 deletions
diff --git a/app/Controllers/errorController.php b/app/Controllers/errorController.php
index 922650b3d..b0bafda72 100644
--- a/app/Controllers/errorController.php
+++ b/app/Controllers/errorController.php
@@ -1,36 +1,51 @@
 <?php
 
+/**
+ * Controller to handle error page.
+ */
 class FreshRSS_error_Controller extends Minz_ActionController {
+	/**
+	 * This action is the default one for the controller.
+	 *
+	 * It is called by Minz_Error::error() method.
+	 *
+	 * Parameters are passed by Minz_Session to have a proper url:
+	 *   - error_code (default: 404)
+	 *   - error_logs (default: array())
+	 */
 	public function indexAction() {
-		switch (Minz_Request::param('code')) {
-			case 403:
-				$this->view->code = 'Error 403 - Forbidden';
-				break;
-			case 404:
-				$this->view->code = 'Error 404 - Not found';
-				break;
-			case 500:
-				$this->view->code = 'Error 500 - Internal Server Error';
-				break;
-			case 503:
-				$this->view->code = 'Error 503 - Service Unavailable';
-				break;
-			default:
-				$this->view->code = 'Error 404 - Not found';
+		$code_int = Minz_Session::param('error_code', 404);
+		$error_logs = Minz_Session::param('error_logs', array());
+		Minz_Session::_param('error_code');
+		Minz_Session::_param('error_logs');
+
+		switch ($code_int) {
+		case 200 :
+			header('HTTP/1.1 200 OK');
+			break;
+		case 403:
+			header('HTTP/1.1 403 Forbidden');
+			$this->view->code = 'Error 403 - Forbidden';
+			$this->view->errorMessage = _t('feedback.access.denied');
+			break;
+		case 500:
+			header('HTTP/1.1 500 Internal Server Error');
+			$this->view->code = 'Error 500 - Internal Server Error';
+			break;
+		case 503:
+			header('HTTP/1.1 503 Service Unavailable');
+			$this->view->code = 'Error 503 - Service Unavailable';
+			break;
+		case 404:
+		default:
+			header('HTTP/1.1 404 Not Found');
+			$this->view->code = 'Error 404 - Not found';
+			$this->view->errorMessage = _t('feedback.access.not_found');
 		}
 
-		$errors = Minz_Request::param('logs', array());
-		$this->view->errorMessage = trim(implode($errors));
-		if ($this->view->errorMessage == '') {
-			switch(Minz_Request::param('code')) {
-				case 403:
-					$this->view->errorMessage = Minz_Translate::t('forbidden_access');
-					break;
-				case 404:
-				default:
-					$this->view->errorMessage = Minz_Translate::t('page_not_found');
-					break;
-			}
+		$error_message = trim(implode($error_logs));
+		if ($error_message !== '') {
+			$this->view->errorMessage = $error_message;
 		}
 
 		Minz_View::prependTitle($this->view->code . ' · ');