From a754a895eda5c26c172c4418c4ba6333d89b386a Mon Sep 17 00:00:00 2001
From: Tealk <tealk@anzah.email>
Date: Tue, 29 Jun 2021 11:18:15 +0200
Subject: [PATCH 1/4] template adapted to standard

---
 securemail/templates/admin.tpl | 38 +++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl
index c23ff2cd..bc007930 100644
--- a/securemail/templates/admin.tpl
+++ b/securemail/templates/admin.tpl
@@ -1,26 +1,16 @@
-{{* We organize the settings in collapsable panel-groups *}}
-{{* this div should be in frio theme *}}
-<div class="panel-group panel-group-settings" id="securemail" role="tablist" aria-multiselectable="true">
-    {{* The password setting section *}}
-    <div class="panel">
-        <div class="section-subtitle-wrapper" role="tab" id="securemail-settings">
-            <h4>
-                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#securemail-settings-collapse" aria-expanded="true" aria-controls="securemail-settings-collapse">
-                    {{$title}}
-                </a>
-            </h4>
-        </div>
-        <div id="securemail-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="securemail-settings">
-            <div class="section-content-tools-wrapper">
-                {{include file="field_checkbox.tpl" field=$enable}}
-                {{include file="field_textarea.tpl" field=$publickey}}
+<span id="settings_securemail_inflated" class="settings-block fakelink" style="display: block" onclick="openClose('settings_securemail_expanded'); openClose('settings_securemail_inflated');">
+  <h3>{{$title}}</h3>
+</span>
+<div id="settings_securemail_expanded" class="settings-block" style="display: none">
+  <span class="fakelink" onclick="openClose('settings_securemail_expanded'); openClose('settings_securemail_inflated');"><h3>{{$title}}</h3></span>
+  <div id="securemail-wrapper">
+    {{include file="field_checkbox.tpl" field=$enable}}
+    {{include file="field_textarea.tpl" field=$publickey}}
 
-                <div class="form-group pull-right settings-submit-wrapper" >
-                    <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-                    <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
-                </div>
-                <div class="clear"></div>
-            </div>
-        </div>
+    <div class="form-group pull-right settings-submit-wrapper" >
+      <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+      <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
     </div>
-</div>
+    <div class="clear"></div>
+  </div>
+</div>
\ No newline at end of file

From ad111e05df44409c7f20cdf4e45c342b44fafdc9 Mon Sep 17 00:00:00 2001
From: Tealk <12276250+Tealk@users.noreply.github.com>
Date: Tue, 29 Jun 2021 17:30:13 +0200
Subject: [PATCH 2/4] Apply suggestions from code review

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
---
 securemail/templates/admin.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl
index bc007930..ec35e332 100644
--- a/securemail/templates/admin.tpl
+++ b/securemail/templates/admin.tpl
@@ -8,9 +8,9 @@
     {{include file="field_textarea.tpl" field=$publickey}}
 
     <div class="form-group pull-right settings-submit-wrapper" >
-      <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-      <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
+      <button type="submit" name="securemail-submit" class="btn btn-primary" value="submit">{{$submit}}</button>
+      <button type="submit" name="securemail-submit" class="btn btn-default" value="test">{{$test}}</button>
     </div>
     <div class="clear"></div>
   </div>
-</div>
\ No newline at end of file
+</div>

From 629c1cca9f330db4e57c8ed3f505acf9f29b734e Mon Sep 17 00:00:00 2001
From: Tealk <tealk@anzah.email>
Date: Wed, 30 Jun 2021 09:36:21 +0200
Subject: [PATCH 3/4] fix $_POST variable

---
 securemail/securemail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/securemail/securemail.php b/securemail/securemail.php
index d396b3a8..112979a4 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -77,7 +77,7 @@ function securemail_settings_post(App &$a, array &$b)
 		$enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
 		DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
 
-		if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) {
+		if ($_POST['securemail-submit'] == "test" {
 
 			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
 

From d86ad302e387c1666e1aae51d243395883466bd5 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 30 Jun 2021 21:20:59 -0400
Subject: [PATCH 4/4] [securemail] Fix quoting style in
 securemail_settings_post()

---
 securemail/securemail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 112979a4..0c0b282b 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -77,7 +77,7 @@ function securemail_settings_post(App &$a, array &$b)
 		$enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
 		DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
 
-		if ($_POST['securemail-submit'] == "test" {
+		if ($_POST['securemail-submit'] == 'test' {
 
 			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));