From 9c94e84d8262fd78dd80d0236b998a6971073bf3 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 28 May 2020 15:23:46 +0200
Subject: [PATCH] 10.2.dev11 config warning pwd smtp

---
 core/module/config/view/index/index.php | 65 +++++++++++++------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php
index dd65a6f5..884abd64 100755
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
@@ -256,37 +256,7 @@
 		</div>
 	</div>
 </div>
-<div class="row">
-	<div class="col12">
-		<div class="block">
-			<h4>Options avancées</h4>
-			<div class="row">
-				<div class="col3">
-					<?php echo template::text('configAnalyticsId', [
-						'help' => 'Saisissez l\'ID de suivi.',
-						'label' => 'Google Analytics',
-						'placeholder' => 'UA-XXXXXXXX-X',
-						'value' => $this->getData(['config', 'analyticsId'])
-					]); ?>
-				</div>
-				<div class="col3 offset1 verticalAlignBottom">
-					<?php echo template::button('configHead', [
-						'href' => helper::baseUrl() . 'config/script/head',
-						'value' => 'Script inséré dans head',
-						'ico' => 'pencil'
-					]); ?>
-				</div>
-				<div class="col3 offset1 verticalAlignBottom">
-					<?php echo template::button('scriptBody', [
-						'href' => helper::baseUrl() . 'config/script/body',
-						'value' => 'Script inséré dans body',
-						'ico' => 'pencil'
-				]); ?>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
+
 <div class="row">
 	<div class="col12">
 		<div class="block">
@@ -363,7 +333,7 @@
 							<?php echo template::password('configSmtpPassword', [
 								'label' => 'Mot de passe',
 								'autocomplete' => 'off',
-								'value' => helper::decrypt ($this->getData(['config', 'smtp','username' ]),$this->getData(['config','smtp','password']))
+								'value' => $this->getData(['config', 'smtp','username' ]) ? helper::decrypt ($this->getData(['config', 'smtp','username' ]),$this->getData(['config','smtp','password'])) : ''
 							]); ?>
 						</div>
 						<div  class="col2">
@@ -378,6 +348,37 @@
 		</div>
 	</div>
 </div>
+<div class="row">
+	<div class="col12">
+		<div class="block">
+			<h4>Options avancées</h4>
+			<div class="row">
+				<div class="col3">
+					<?php echo template::text('configAnalyticsId', [
+						'help' => 'Saisissez l\'ID de suivi.',
+						'label' => 'Google Analytics',
+						'placeholder' => 'UA-XXXXXXXX-X',
+						'value' => $this->getData(['config', 'analyticsId'])
+					]); ?>
+				</div>
+				<div class="col3 offset1 verticalAlignBottom">
+					<?php echo template::button('configHead', [
+						'href' => helper::baseUrl() . 'config/script/head',
+						'value' => 'Script inséré dans head',
+						'ico' => 'pencil'
+					]); ?>
+				</div>
+				<div class="col3 offset1 verticalAlignBottom">
+					<?php echo template::button('scriptBody', [
+						'href' => helper::baseUrl() . 'config/script/body',
+						'value' => 'Script inséré dans body',
+						'ico' => 'pencil'
+				]); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
 <div class="row">
 	<div class="col12">
 		<div class="block">