From cf4d066f0ef3f56a4c9d271a2422de5a5c309145 Mon Sep 17 00:00:00 2001 From: Nicolas Roman Date: Mon, 25 Mar 2019 13:10:09 +0100 Subject: [PATCH] call function check_occurence for alias and servername --- inc/webadmin-edit.php | 4 +--- inc/webadmin-servername.php | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php index 0606e27..469eb2a 100644 --- a/inc/webadmin-edit.php +++ b/inc/webadmin-edit.php @@ -188,10 +188,8 @@ if (isset($_GET['del']) ) { $account_name=$serveralias['domain']; - $check_occurence_cmd = 'web-add.sh check-occurence ' . $serveralias['alias']; - sudoexec($check_occurence_cmd, $check_occurence_output, $check_occurence_return); + $check_occurence_return = check_occurence_name($serveralias['alias']); - // Check if the name is present in vhosts already, returns 1 if no if ($check_occurence_return == 1) { $exec_cmd = 'web-add.sh add-alias ' . $serveralias['domain'] . ' ' . $serveralias['alias']; sudoexec($exec_cmd, $exec_output, $exec_return); diff --git a/inc/webadmin-servername.php b/inc/webadmin-servername.php index 36cfd56..b2ec9c8 100644 --- a/inc/webadmin-servername.php +++ b/inc/webadmin-servername.php @@ -113,14 +113,12 @@ if (isset($_GET['edit']) ) { $account_name=$servername['domain']; - $check_occurence_cmd = 'web-add.sh check-occurence ' . $servername['servername']; - sudoexec($check_occurence_cmd, $check_occurence_output, $check_occurence_return); - - // Check if the name is present in vhosts already, returns 1 if no + $check_occurence_return = check_occurence_name($servername['servername']); + if ($check_occurence_return == 1) { $exec_cmd = 'web-add.sh update-servername ' . $servername['domain'] . ' ' . $servername['servername'] . ' ' . $servername['previous_servername']; sudoexec($exec_cmd, $exec_output, $exec_return); - + if ($exec_return == 0) { //domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer print "
";