actually that's basically it

1 files changed, 17 insertions, 7 deletions

diff --git a/identity_addresses.php b/identity_addresses.php
index e2c1e98..5ddad7c 100644
--- a/identity_addresses.php
+++ b/identity_addresses.php
@@ -14,9 +14,8 @@ class identity_addresses extends rcube_plugin {
     }
 
     function fix_form($params) {
-        $record = $params['record'];
-        $options = array($record['email'] => $record['email']);
-        $permitted_addresses = $this->get_permitted_addresses($record);
+        $options = array($_SESSION['username'] => $_SESSION['username']);
+        $permitted_addresses = $this->get_permitted_addresses();
         foreach ($permitted_addresses as $addr) {
             $options[$addr] = $addr;
         }
@@ -31,16 +30,27 @@ class identity_addresses extends rcube_plugin {
     }
 
     function validate_create($params) {
-        return array('abort' => false, 'record' => $params['record']);
+        $record = $params['record'];
+        return array(
+            'abort' => $this->validate_modification($record),
+            'record' => $record
+        );
     }
 
     function validate_update($params) {
-        return array('abort' => false, 'record' => $params['record']);
+        $record = $params['record'];
+        return array(
+            'abort' => $this->validate_modification($record),
+            'record' => $record
+        );
     }
 
-    function validate_modification() {}
+    function validate_modification($record) {
+        return !in_array($record['email'],
+                         $this->get_permitted_addresses($record));
+    }
 
-    private function get_permitted_addresses($record) {
+    private function get_permitted_addresses() {
         if (!($sql = $this->rcmail->config->get('identity_addresses_query'))) {
             return [];
         }