Skip to content

Commit b99d5de

Browse files
author
Marius Burkard
committed
Merge branch 'develop' into 'develop'
Add API event support to mail_domain_*, mail_user_*, mail_alias_*, mail_forward_* See merge request ispconfig/ispconfig3!1394
2 parents acdf764 + fb615f8 commit b99d5de

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

interface/lib/classes/remote.d/mail.inc.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function mail_domain_add($session_id, $client_id, $params)
6060
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
6161
return false;
6262
}
63-
$primary_id = $this->insertQuery('../mail/form/mail_domain.tform.php', $client_id, $params);
63+
$primary_id = $this->insertQuery('../mail/form/mail_domain.tform.php', $client_id, $params, 'mail:mail_domain:on_after_insert');
6464
return $primary_id;
6565
}
6666

@@ -71,7 +71,7 @@ public function mail_domain_update($session_id, $client_id, $primary_id, $params
7171
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
7272
return false;
7373
}
74-
$affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php', $client_id, $primary_id, $params);
74+
$affected_rows = $this->updateQuery('../mail/form/mail_domain.tform.php', $client_id, $primary_id, $params, 'mail:mail_domain:on_after_update');
7575
return $affected_rows;
7676
}
7777

@@ -82,7 +82,7 @@ public function mail_domain_delete($session_id, $primary_id)
8282
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
8383
return false;
8484
}
85-
$affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php', $primary_id);
85+
$affected_rows = $this->deleteQuery('../mail/form/mail_domain.tform.php', $primary_id, 'mail:mail_domain:on_after_delete');
8686
return $affected_rows;
8787
}
8888

@@ -222,7 +222,7 @@ public function mail_user_add($session_id, $client_id, $params){
222222
if (!isset($params['gid'])) $params['gid'] = -1;
223223
if (!isset($params['maildir_format'])) $params['maildir_format'] = 'maildir';
224224

225-
$mailuser_id = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
225+
$mailuser_id = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params, 'mail:mail_user:on_after_insert');
226226
return $mailuser_id;
227227
}
228228

@@ -245,7 +245,7 @@ public function mail_user_update($session_id, $client_id, $primary_id, $params)
245245
return false;
246246
}
247247

248-
$affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params);
248+
$affected_rows = $this->updateQuery('../mail/form/mail_user.tform.php', $client_id, $primary_id, $params, 'mail:mail_user:on_after_update');
249249
return $affected_rows;
250250
}
251251

@@ -258,7 +258,7 @@ public function mail_user_delete($session_id, $primary_id)
258258
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
259259
return false;
260260
}
261-
$affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php', $primary_id);
261+
$affected_rows = $this->deleteQuery('../mail/form/mail_user.tform.php', $primary_id, 'mail:mail_user:on_after_delete');
262262
return $affected_rows;
263263
}
264264

@@ -413,7 +413,7 @@ public function mail_alias_add($session_id, $client_id, $params)
413413
}
414414
unset($tmp);
415415

416-
$affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params);
416+
$affected_rows = $this->insertQuery('../mail/form/mail_alias.tform.php', $client_id, $params, 'mail:mail_alias:on_after_insert');
417417
return $affected_rows;
418418
}
419419

@@ -435,7 +435,7 @@ public function mail_alias_update($session_id, $client_id, $primary_id, $params)
435435
}
436436
unset($tmp);
437437

438-
$affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params);
438+
$affected_rows = $this->updateQuery('../mail/form/mail_alias.tform.php', $client_id, $primary_id, $params, 'mail:mail_alias:on_after_update');
439439
return $affected_rows;
440440
}
441441

@@ -446,7 +446,7 @@ public function mail_alias_delete($session_id, $primary_id)
446446
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
447447
return false;
448448
}
449-
$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id);
449+
$affected_rows = $this->deleteQuery('../mail/form/mail_alias.tform.php', $primary_id, 'mail:mail_alias:on_after_delete');
450450
return $affected_rows;
451451
}
452452

@@ -472,7 +472,7 @@ public function mail_forward_add($session_id, $client_id, $params)
472472
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
473473
return false;
474474
}
475-
$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params);
475+
$affected_rows = $this->insertQuery('../mail/form/mail_forward.tform.php', $client_id, $params, 'mail:mail_forward:on_after_insert');
476476
return $affected_rows;
477477
}
478478

@@ -484,7 +484,7 @@ public function mail_forward_update($session_id, $client_id, $primary_id, $param
484484
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
485485
return false;
486486
}
487-
$affected_rows = $this->updateQuery('../mail/form/mail_forward.tform.php', $client_id, $primary_id, $params);
487+
$affected_rows = $this->updateQuery('../mail/form/mail_forward.tform.php', $client_id, $primary_id, $params, 'mail:mail_forward:on_after_update');
488488
return $affected_rows;
489489
}
490490

@@ -496,7 +496,7 @@ public function mail_forward_delete($session_id, $primary_id)
496496
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
497497
return false;
498498
}
499-
$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id);
499+
$affected_rows = $this->deleteQuery('../mail/form/mail_forward.tform.php', $primary_id, 'mail:mail_forward:on_after_delete');
500500
return $affected_rows;
501501
}
502502

@@ -1110,4 +1110,4 @@ public function mailquota_get_by_user($session_id, $client_id)
11101110

11111111
}
11121112

1113-
?>
1113+
?>

0 commit comments

Comments
 (0)