Merge pull request #1183 from David-Muhasa/encrypt-auto

Autocrypt messages encrept automatically
cypht-org · Aug 21, 2024 · bc9177b · bc9177b
2 parents 22da66e + b7e2ffd
commit bc9177b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/modules/pgp/modules.php b/modules/pgp/modules.php
@@ -108,20 +108,23 @@ protected function output() {
         }
         $pub_keys = $this->get('pgp_public_keys', array());
         $res = '<script type="text/javascript" src="'.WEB_ROOT.'modules/pgp/assets/openpgp.min.js"></script>';
+        $res .= '<div class="container">';
+        $res .= '<div class="row justify-content-md-center">';
+        $res .= '<div class="col col-lg-8">';
         $res .= '<div class="pgp_section">';
 
         $res .= '<span class="pgp_sign"><label for="pgp_sign" class="form-label">'.$this->trans('PGP Sign as').'</label>';
         $res .= '<select id="pgp_sign" size="1" class="form-control"></select></span>';
 
         if (count($pub_keys) > 0) {
-            $res .= '<label for="pgp_encrypt" class="form-label">'.$this->trans('PGP Encrypt for').
+            $res .= '<label for="pgp_encrypt" class="form-label" style="margin-top:1rem">'.$this->trans('PGP Encrypt for').
                 '</label><select id="pgp_encrypt" size="1" class="form-control"><option disabled selected value=""></option>';
             foreach ($pub_keys as $vals) {
                 $res .= '<option value="'.$vals['key'].'">'.$vals['email'].'</option>';
             }
             $res .= '</select>';
         }
-        $res .= '<input type="button" class="pgp_apply" value="'.$this->trans('Apply').'" class="btn btn-primary" /></div>'.prompt_for_passhrase($this);
+        $res .= '</di></di></di></di>';
         return $res;
     }
 }

diff --git a/modules/pgp/site.js b/modules/pgp/site.js
@@ -311,7 +311,7 @@ $(function() {
         if (($('#pgp_encrypt option').length + $('#pgp_sign option').length) == 0) {
             $('.pgp_section').hide();
         }
-        $('.pgp_apply').on("click", function() { Hm_Pgp.process_settings(); return false; });
+        $('.smtp_send_placeholder').on("click", function() { Hm_Pgp.process_settings(); return false; });
     }
     else if (hm_page_name() == 'message') {
         Hm_Ajax.add_callback_hook('ajax_imap_message_content', Hm_Pgp.check_pgp_msg);

diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
@@ -966,15 +966,25 @@ protected function output() {
     }
 }
 
+/**
+ * @subpackage smtp/output
+ */
+class Hm_Output_compose_title extends Hm_Output_Module {
+    protected function output() {
+        return'<div class="content_title px-3">'.$this->trans('Compose').'</div>';
+    }
+}
+
 /**
  * @subpackage smtp/output
  */
 class Hm_Output_compose_form_start extends Hm_Output_Module {
     protected function output() {
-        return'<div class="compose_page p-0"><div class="content_title px-3">'.$this->trans('Compose').'</div>'.
-            '<div class="container"><div class="row justify-content-md-center">'.
-            '<div class="col col-lg-8">'.
-            '<form class="compose_form p-4" method="post" action="?page=compose" data-reminder="' . $this->get('enable_attachment_reminder', 0) . '">';
+        $res = '<div class="container">';
+        $res .= '<div class="row justify-content-md-center">';
+        $res .= '<div class="col col-lg-8">';
+        $res .= '<form class="compose_form p-4" method="post" action="?page=compose" data-reminder="' . $this->get('enable_attachment_reminder', 0) . '">';
+        return $res;
     }
 }
 

diff --git a/modules/smtp/setup.php b/modules/smtp/setup.php
@@ -12,7 +12,8 @@
 add_handler('compose', 'load_smtp_servers_from_config', true, 'smtp', 'load_smtp_reply_to_details', 'after');
 add_handler('compose', 'add_smtp_servers_to_page_data', true, 'smtp', 'load_smtp_servers_from_config', 'after');
 add_handler('compose', 'process_compose_form_submit', true, 'smtp', 'load_smtp_servers_from_config', 'after');
-add_output('compose', 'compose_form_start', true, 'smtp', 'content_section_start', 'after');
+add_output('compose', 'compose_title', true, 'smtp', 'content_section_start', 'after');
+add_output('compose', 'compose_form_start', true, 'smtp', 'compose_title', 'after');
 add_output('compose', 'compose_form_draft_list', true, 'smtp', 'compose_form_start', 'before');
 add_output('compose', 'compose_form_content', true, 'smtp', 'compose_form_start', 'after');
 add_output('compose', 'compose_form_end', true, 'smtp', 'compose_form_content', 'after');