webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

functions.inc.php:

Browse Source 
- mailbox_postdeletion(): use Config::read instead of global $CONF


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1522 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2013-10-03 18:35:30 +00:00
parent b985816baa
commit c2ccffb76c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
functions.inc.php
View File

@@ -1588,10 +1588,9 @@ function table_by_key ($table_key) {
Returns: boolean.
*/
function mailbox_postdeletion($username,$domain) {
global $CONF;
$confpar='mailbox_postdeletion_script';
$cmd = Config::read('mailbox_postdeletion_script');
if (!isset($CONF[$confpar]) || empty($CONF[$confpar])) {
if ( empty($cmd) ) {
return true;
}
@@ -1602,7 +1601,7 @@ function mailbox_postdeletion($username,$domain) {
$cmdarg1=escapeshellarg($username);
$cmdarg2=escapeshellarg($domain);
$command=$CONF[$confpar]." $cmdarg1 $cmdarg2";
$command = "$cmd $cmdarg1 $cmdarg2";
$retval=0;
$output=array();
$firstline='';