mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
functions.inc.php:
- smtp_get_admin_email(), domain_postcreation(), domain_postdeletion(): use Config::read instead of $CONF - smtp_get_response(): whitespace fixes git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1532 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
ba7ebe7adb
commit
43f2591d93
@ -1158,9 +1158,9 @@ function smtp_mail ($to, $from, $data, $body = "") {
|
||||
* @return String - username/mail address
|
||||
*/
|
||||
function smtp_get_admin_email() {
|
||||
global $CONF;
|
||||
if(isset($CONF['admin_email']) && !empty($CONF['admin_email']))
|
||||
return $CONF['admin_email'];
|
||||
$admin_email = Config::read('admin_email');
|
||||
if(!empty($admin_email))
|
||||
return $admin_email;
|
||||
else
|
||||
return authentication_get_username();
|
||||
}
|
||||
@ -1644,13 +1644,11 @@ function mailbox_postdeletion($username,$domain) {
|
||||
Returns: boolean.
|
||||
*/
|
||||
# TODO: move to DomainHandler
|
||||
# TODO: use Config::read instead of $CONF
|
||||
# TODO: replace "print" with $this->errormsg (or infomsg?)
|
||||
function domain_postcreation($domain) {
|
||||
global $CONF;
|
||||
$confpar='domain_postcreation_script';
|
||||
$script=Config::read('domain_postcreation_script');
|
||||
|
||||
if (!isset($CONF[$confpar]) || empty($CONF[$confpar])) {
|
||||
if (empty($script)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1660,7 +1658,7 @@ function domain_postcreation($domain) {
|
||||
}
|
||||
|
||||
$cmdarg1=escapeshellarg($domain);
|
||||
$command=$CONF[$confpar]." $cmdarg1";
|
||||
$command= "$script $cmdarg1";
|
||||
$retval=0;
|
||||
$output=array();
|
||||
$firstline='';
|
||||
@ -1679,13 +1677,11 @@ function domain_postcreation($domain) {
|
||||
Returns: boolean.
|
||||
*/
|
||||
# TODO: move to DomainHandler (after moving the delete code there)
|
||||
# TODO: use Config::read instead of $CONF
|
||||
# TODO: replace "print" with $this->errormsg (or infomsg?)
|
||||
function domain_postdeletion($domain) {
|
||||
global $CONF;
|
||||
$confpar='domain_postdeletion_script';
|
||||
$script=Config::read('domain_postdeletion_script');
|
||||
|
||||
if (!isset($CONF[$confpar]) || empty($CONF[$confpar])) {
|
||||
if (empty($script)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1695,7 +1691,7 @@ function domain_postdeletion($domain) {
|
||||
}
|
||||
|
||||
$cmdarg1=escapeshellarg($domain);
|
||||
$command=$CONF[$confpar]." $cmdarg1";
|
||||
$command= "$script $cmdarg1";
|
||||
$retval=0;
|
||||
$output=array();
|
||||
$firstline='';
|
||||
|
Loading…
Reference in New Issue
Block a user