webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-07-31 10:04:20 +03:00
Code Activity

functions.inc.php, DomainHandler, MailboxHandler:

Browse Source 
- move mailbox_postdeletion() to MailboxHandler
- move domain_postcreation() and domain_postdeletion() to
  DomainHandler
- adopt those functions for usage inside the *Handler (replace
  print with $this->errormsg etc.)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1579 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2013-11-14 22:10:05 +00:00
parent 9decae80e9
commit 2bf5df92ea
3 changed files with 105 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
model/DomainHandler.php
View File

@ -122,7 +122,7 @@ class DomainHandler extends PFAHandler {
}
if ($this->new) {
if (!domain_postcreation($this->id)) {
if (!$this->domain_postcreation()) {
$this->errormsg[] = Config::lang('pAdminCreate_domain_error');
}
} else {
@ -174,7 +174,7 @@ class DomainHandler extends PFAHandler {
# finally delete the domain
db_delete($this->db_table, $this->id_field, $this->id);
if ( !domain_postdeletion($this->id) ) {
if ( !$this->domain_postdeletion() ) {
$this->error_msg[] = $PALANG['domain_postdel_failed'];
}
@ -194,5 +194,69 @@ class DomainHandler extends PFAHandler {
public function _formatted_mailboxes($item) { return $item['mailbox_count'] . ' / ' . $item['mailboxes']; }
public function _formatted_quota ($item) { return $item['total_quota'] . ' / ' . $item['quota'] ; }
/**
* Called after a domain has been added
*
* @return boolean
*/
protected function domain_postcreation() {
$script=Config::read('domain_postcreation_script');
if (empty($script)) {
return true;
}
if (empty($this->id)) {
$this->errormsg[] = 'Empty domain parameter in domain_postcreation';
return false;
}
$cmdarg1=escapeshellarg($this->id);
$command= "$script $cmdarg1";
$retval=0;
$output=array();
$firstline='';
$firstline=exec($command,$output,$retval);
if (0!=$retval) {
error_log("Running $command yielded return value=$retval, first line of output=$firstline");
$this->errormsg[] = 'Problems running domain postcreation script!';
return FALSE;
}
return TRUE;
}
/**
* Called after a domain has been deleted
*
* @return boolean
*/
protected function domain_postdeletion() {
$script=Config::read('domain_postdeletion_script');
if (empty($script)) {
return true;
}
if (empty($this->id)) {
$this->errormsg[] = 'Empty domain parameter in domain_postdeletion';
return false;
}
$cmdarg1=escapeshellarg($this->id);
$command= "$script $cmdarg1";
$retval=0;
$output=array();
$firstline='';
$firstline=exec($command,$output,$retval);
if (0!=$retval) {
error_log("Running $command yielded return value=$retval, first line of output=$firstline");
$this->errormsg[] = 'Problems running domain postdeletion script!';
return FALSE;
}
return TRUE;
}
}
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */