From 9024dddf46c8c6de8a857332030cf62f9b5a0974 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Wed, 27 Feb 2019 14:36:45 +0000
Subject: [PATCH] move password_expiration code into the MailboxHandler.

---
 functions.inc.php        | 19 -------------------
 model/MailboxHandler.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index f176579b..6686b0f9 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1781,25 +1781,6 @@ function db_insert($table, array $values, $timestamp = array('created', 'modifie
         }
     }
 
-    $_table = trim($table, "`'");
-    if (Config::bool('password_expiration')) {
-        if ($_table == 'mailbox') {
-            $domain_dirty = $values['domain'];
-            $domain = trim($domain_dirty, "`'"); // naive assumption it is ' escaping.
-            $password_expiration_value = (int) get_password_expiration_value($domain);
-            if (db_sqlite()) {
-                $values['password_expiry'] = "datetime('now', '$password_expiration_value day')";
-            } else {
-                $values['password_expiry'] = date('Y-m-d H:i', strtotime("+$password_expiration_value day"));
-            }
-        }
-    } else {
-        if ($_table == 'mailbox') {
-            unset($values['password_expiry']);
-        }
-    }
-
-
     $value_string = '';
     $comma = '';
     $prepared_statment_values = $values;
diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php
index a4453e40..ad596e78 100644
--- a/model/MailboxHandler.php
+++ b/model/MailboxHandler.php
@@ -255,6 +255,16 @@ class MailboxHandler extends PFAHandler {
             return false;
         }
 
+
+        if (Config::bool('password_expiration')) {
+            if(!empty($this->values['password']) && !empty($this->values['password2']) && $this->values['password'] == $this->values['password2']) {
+                $domain_dirty = $this->domain_from_id();
+                $domain = trim($domain_dirty, "`'"); // naive assumption it is ' escaping.
+                $password_expiration_value = (int)get_password_expiration_value($domain);
+                $this->values['password_expiry'] = date('Y-m-d H:i', strtotime("+$password_expiration_value day"));
+            }
+        }
+
         return true;
     }