From 84f9311fd53f5fa58ae55986ece9bfa7dac455c1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 29 Aug 2019 18:08:43 +0200
Subject: fix: Fix "validate email"-related issues (#2512)

* fix: Make sure $disable_aside is initialized

There was a warning for an uninitialized variable, hidden in production
but visible in development mode.

* fix: Allow to delete account when email isn't validated
---
 app/Controllers/userController.php | 1 +
 app/FreshRSS.php                   | 4 +++-
 app/layout/simple.phtml            | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 9e909a3b5..a1d649c0a 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -123,6 +123,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 		}
 
 		$email_not_verified = FreshRSS_Context::$user_conf->email_validation_token !== '';
+		$this->view->disable_aside = false;
 		if ($email_not_verified) {
 			$this->view->_layout('simple');
 			$this->view->disable_aside = true;
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index c48ad2093..d472a2147 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -153,7 +153,9 @@ class FreshRSS extends Minz_FrontController {
 			Minz_Request::is('user', 'validateEmail') ||
 			Minz_Request::is('user', 'sendValidationEmail') ||
 			Minz_Request::is('user', 'profile') ||
-			Minz_Request::is('auth', 'logout')
+			Minz_Request::is('user', 'delete') ||
+			Minz_Request::is('auth', 'logout') ||
+			Minz_Request::is('javascript', 'nonce')
 		);
 		if ($email_not_verified && !$action_is_allowed) {
 			Minz_Request::forward(array(
diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml
index 5546966be..b62e35988 100644
--- a/app/layout/simple.phtml
+++ b/app/layout/simple.phtml
@@ -5,6 +5,9 @@
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="initial-scale=1.0" />
 		<?php echo self::headStyle(); ?>
+		<script id="jsonVars" type="application/json">
+<?php $this->renderHelper('javascript_vars'); ?>
+		</script>
 		<?php echo self::headScript(); ?>
 		<link rel="shortcut icon" id="favicon" type="image/x-icon" sizes="16x16 64x64" href="<?php echo Minz_Url::display('/favicon.ico'); ?>" />
 		<link rel="icon msapplication-TileImage apple-touch-icon" type="image/png" sizes="256x256" href="<?php echo Minz_Url::display('/themes/icons/favicon-256.png'); ?>" />
-- 
cgit v1.2.3