evolix
/
evoadmin-web
18
0
Fork 1
Code Issues 33 Pull Requests 6 Releases 1 Wiki Activity

call function check_occurence for alias and servername

This commit is contained in:
Nicolas Roman 2019-03-25 13:10:09 +01:00 committed by Ludovic Poujol
parent 24c4e4236d
commit cf4d066f0e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/webadmin-edit.php
View File

@ -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);

8
inc/webadmin-servername.php
View File

@ -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 "<center>";