Added default spam profile of Normal when creating mail domain.

cwispy · Mar 5, 2020 · 1855702 · 1855702
1 parent 01d4637
commit 1855702
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/classes/ispcfg3_class.php b/classes/ispcfg3_class.php
@@ -982,6 +982,29 @@ public function mail_user_update( $client_id, $primary_id, array $params = null
         return $result;
     }
 
+    public function mail_spamfilter_user_add( $client_id, $params = null ) {
+        if ( !is_array( $client_id ) ) {
+            $data = [ 'client_id' => $client_id ];
+            $data['params'] = $params;
+        } else {
+            $data = $client_id;
+        }
+        $result = self::restpost( 'mail_spamfilter_user_add', $data );
+
+        return $result;
+    }
+
+    public function mail_policy_get( $primary_id ) {
+        if ( !is_array( $primary_id ) ) {
+            $data = [ 'primary_id' => $primary_id ];
+        } else {
+            $data = $primary_id;
+        }
+        $result = self::restpost( 'mail_policy_get', $data );
+
+        return $result;
+    }
+
     public function mailquota_get_by_user( $primary_id ) {
         if ( !is_array( $primary_id ) ) {
             $data = [ 'primary_id' => $primary_id ];

diff --git a/ispcfg3.php b/ispcfg3.php
@@ -612,6 +612,20 @@ function ispcfg3_CreateAccount(array $params ) {
 
             logModuleCall('ispconfig','CreateMailDomain',$maildomain_id['response'],$ispcparams,'','');
 
+            $policy = $client->mail_policy_get( array( 'primary_id' => array( 'policy_name' => 'Normal' ) ) );
+
+            $ispcparams = array( 
+                    'server_id'     => $defaultmailserver,
+                    'priority'      => 5,
+                    'policy_id'     => $policy['response'][0]['id'],
+                    'email'         => '@'.$domain,
+                    'fullname'      => '@'.$domain,
+                    'local'         => 'y'
+                );
+
+            $mailpolicy_id = $client->mail_spamfilter_user_add( $client_id, $ispcparams );
+
+            logModuleCall('ispconfig','CreateMailPolicy',$mailpolicy_id['response'],$ispcparams,'','');
         }
 
         if ( $dbcreate == 'on' ) {