Changeset 3431943

Timestamp:

01/04/2026 04:50:34 AM (2 weeks ago)

Author:

realpinny

Message:

small update

File:

• pinnys-simple-smtp/trunk/pinnys-simple-smtp.php (modified) (2 diffs)

pinnys-simple-smtp/trunk/pinnys-simple-smtp.php

@@ -63 +63 @@
         add_action('admin_init', [$this, 'handle_test_email']); 
         add_action('phpmailer_init', [$this, 'configure_smtp']);
+        add_filter('pre_update_option_pinnys_smtp_password', [$this, 'pre_update_password'], 10, 2);
     }
     
@@ -84 +85 @@
         register_setting(PINNYS_SMTP_GROUP, 'pinnys_smtp_from_email', 'sanitize_email');
         register_setting(PINNYS_SMTP_GROUP, 'pinnys_smtp_from_name', 'sanitize_text_field');
-
-        register_setting(PINNYS_SMTP_GROUP, 'pinnys_smtp_password', [
-            'sanitize_callback' => [$this, 'process_password_save']
-        ]);
-    }
-
-    public function process_password_save($input) {
-        if (empty($input)) {
-            return get_option('pinnys_smtp_password');
-        }
-        return pinnys_smtp_encrypt($input);
+        register_setting(PINNYS_SMTP_GROUP, 'pinnys_smtp_password');
+    }
+    
+    public function pre_update_password($new_value, $old_value) {
+        $new = trim((string) $new_value);
+        
+        if ($new === '') {
+            return $old_value;
+        }
+        
+        $encrypted = pinnys_smtp_encrypt($new);
+        return ($encrypted !== false && $encrypted !== '') ? $encrypted : $old_value;
     }
 
     public function handle_test_email() {
-        // Strict Page Check
         if (!isset($_GET['page']) || $_GET['page'] !== PINNYS_SMTP_SLUG) {
             return;