From c2ccffb76ccb6e9dfd8934c62cd60c1922ea2bb8 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 3 Oct 2013 18:35:30 +0000 Subject: [PATCH] functions.inc.php: - 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 --- functions.inc.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 1cdccc90..626bcdd3 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -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='';