Loading htdocs/postDelete.php +6 −6 Original line number Diff line number Diff line Loading @@ -105,24 +105,24 @@ function deleteMailAccount() global $user2delete, $userOnly, $domain; if (($domain != "") || ($userOnly != "")) { if (!empty($domain) && !empty($userOnly)) { $ssh = new SSH2($PF_HOSTNAME); if (!$ssh->login($PF_USER, $PF_PWD)) { exit('Login Failed'); } $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete "' . escapeshellarg($user2delete) . '"'); $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete ' . escapeshellarg($user2delete)); $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . escapeshellarg($userOnly) . " " . escapeshellarg($domain)); $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . escapeshellarg($userOnly) . ' ' . escapeshellarg($domain)); // verify it's done $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view "' . escapeshellarg($user2delete) . '" 2>&1 |grep "not valid"'); $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view ' . escapeshellarg($user2delete) . ' 2>&1 |grep "not valid"'); // build path to check deletion $fullPath = $baseDir . $domain . "/" . $userOnly; $delDirConfirm = $ssh->exec('[ ! -d "' . escapeshellarg($fullPath) . '" ] && echo "DELETED"'); $delDirConfirm = $ssh->exec('[ ! -d ' . escapeshellarg($fullPath) . ' ] && echo "DELETED"'); if (($delDbConfirm == "Error: The EMAIL is not valid!") && ($delDirConfirm == "DELETED")) { if (($delDbConfirm === "Error: The EMAIL is not valid!") && ($delDirConfirm === "DELETED")) { return true; } else { return false; Loading Loading
htdocs/postDelete.php +6 −6 Original line number Diff line number Diff line Loading @@ -105,24 +105,24 @@ function deleteMailAccount() global $user2delete, $userOnly, $domain; if (($domain != "") || ($userOnly != "")) { if (!empty($domain) && !empty($userOnly)) { $ssh = new SSH2($PF_HOSTNAME); if (!$ssh->login($PF_USER, $PF_PWD)) { exit('Login Failed'); } $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete "' . escapeshellarg($user2delete) . '"'); $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox delete ' . escapeshellarg($user2delete)); $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . escapeshellarg($userOnly) . " " . escapeshellarg($domain)); $ssh->exec('sudo /usr/local/bin/postfixadmin-mailbox-postdeletion.sh ' . escapeshellarg($userOnly) . ' ' . escapeshellarg($domain)); // verify it's done $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view "' . escapeshellarg($user2delete) . '" 2>&1 |grep "not valid"'); $delDbConfirm = $ssh->exec('/postfixadmin/scripts/postfixadmin-cli mailbox view ' . escapeshellarg($user2delete) . ' 2>&1 |grep "not valid"'); // build path to check deletion $fullPath = $baseDir . $domain . "/" . $userOnly; $delDirConfirm = $ssh->exec('[ ! -d "' . escapeshellarg($fullPath) . '" ] && echo "DELETED"'); $delDirConfirm = $ssh->exec('[ ! -d ' . escapeshellarg($fullPath) . ' ] && echo "DELETED"'); if (($delDbConfirm == "Error: The EMAIL is not valid!") && ($delDirConfirm == "DELETED")) { if (($delDbConfirm === "Error: The EMAIL is not valid!") && ($delDirConfirm === "DELETED")) { return true; } else { return false; Loading