From 6215d4c0562507111e6e3efcabccc2a143224605 Mon Sep 17 00:00:00 2001 From: Nicolas Roman Date: Tue, 23 Apr 2019 10:32:38 +0200 Subject: [PATCH] normaliser les titres des tableaux (servernames, alias, etc.) --- inc/webadmin-edit.php | 10 +++++----- inc/webadmin-servername.php | 24 ++++++++++++------------ tpl/webadmin-edit.tpl.php | 4 ++-- tpl/webadmin-itk.tpl.php | 2 +- tpl/webadmin-servername.tpl.php | 6 +++--- tpl/webadmin.tpl.php | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php index 0ef2b20..4351d16 100644 --- a/inc/webadmin-edit.php +++ b/inc/webadmin-edit.php @@ -114,7 +114,7 @@ elseif (isset($params[2]) && $params[2] == "add") { $form = new FormPage("Ajout d'un alias", FALSE); $form->addField('domain_alias', new DomainInputFormField("Alias", TRUE)); - $form->addField('domain_linked', new SelectFormField("Domaine lié", True, $data_output_servername)); + $form->addField('domain_linked', new SelectFormField("Servername lié", True, $data_output_servername)); if (!empty($_POST)) { $form->isCurrentPage(TRUE); @@ -229,10 +229,10 @@ elseif (isset($params[2]) && $params[2] == "add") { } } else { - print "

Ajout d'un serveralias

"; + print "

Ajout d'un alias

"; print "
"; print "
"; - print " Ajout d'un serveralias"; + print " Ajout d'un alias"; print $form; print "

"; print "
"; @@ -240,10 +240,10 @@ elseif (isset($params[2]) && $params[2] == "add") { } } else { - print "

Ajout d'un serveralias

"; + print "

Ajout d'un alias

"; print ""; print "
"; - print " Ajout d'un serveralias"; + print " Ajout d'un alias"; print $form; print "

"; print "
"; diff --git a/inc/webadmin-servername.php b/inc/webadmin-servername.php index 7779c43..c9b43c7 100644 --- a/inc/webadmin-servername.php +++ b/inc/webadmin-servername.php @@ -28,8 +28,8 @@ if (isset($params[2]) && $params[2] == "edit") { include_once EVOADMIN_BASE . '../tpl/header.tpl.php'; include_once EVOADMIN_BASE . '../tpl/menu.tpl.php'; - $form = new FormPage("Modification du ServerName", FALSE); - $form->addField('domain_servername', new DomainInputFormField("ServerName", TRUE), $params[3]); + $form = new FormPage("Modification du Servername", FALSE); + $form->addField('domain_servername', new DomainInputFormField("Servername", TRUE), $params[3]); $form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $params[3]); if (!empty($_POST)) { @@ -126,40 +126,40 @@ if (isset($params[2]) && $params[2] == "edit") { if ($exec_return == 0) { //domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer print "
"; - printf ('

Le ServerName %s a bien été modifié

', $servername['servername']); - printf ('

Retour à la liste des ServerNames

', $redirect_url); + printf ('

Le Servername %s a bien été modifié

', $servername['servername']); + printf ('

Retour à la liste des Servernames

', $redirect_url); print "
"; } else { print "
"; - printf ('

Echec dans la modification du ServerName %s

', $servername['servername']); - printf ('

Retour à la liste des ServerNames

', $redirect_url); + printf ('

Echec dans la modification du Servername %s

', $servername['servername']); + printf ('

Retour à la liste des Servernames

', $redirect_url); print "
"; } } else { print "
"; - printf ('

Echec dans la modification du ServerName %s

', $servername['servername']); + printf ('

Echec dans la modification du Servername %s

', $servername['servername']); print ('

Le domaine existe déjà dans d\'autres vhosts.'); - printf ('

Retour à la liste des ServerNames

', $redirect_url); + printf ('

Retour à la liste des Servernames

', $redirect_url); print "
"; } } } else { - print "

Modification du ServerName

"; + print "

Modification du Servername

"; print ""; print "
"; - print " Modification du ServerName"; + print " Modification du Servername"; print $form; print "

"; print "
"; print "
"; } } else { - print "

Modification du ServerName

"; + print "

Modification du Servername

"; print "
"; print "
"; - print " Modification du ServerName"; + print " Modification du Servername"; print $form; print "

"; print "
"; diff --git a/tpl/webadmin-edit.tpl.php b/tpl/webadmin-edit.tpl.php index d12638a..808922b 100644 --- a/tpl/webadmin-edit.tpl.php +++ b/tpl/webadmin-edit.tpl.php @@ -29,7 +29,7 @@ Alias - Domaine + Servername Action'; } ?> @@ -40,7 +40,7 @@ for ( $i=0; $i < count($vhost_list); ++$i ) { for ($y = 0; $y < count($vhost_list[$i]['aliases']); $y++) { print ''; - printf('http://%s', + printf('%s', $vhost_list[$i]['aliases'][$y], $vhost_list[$i]['aliases'][$y]); printf('%s', $vhost_list[$i]['servername']); diff --git a/tpl/webadmin-itk.tpl.php b/tpl/webadmin-itk.tpl.php index 313f947..c856703 100644 --- a/tpl/webadmin-itk.tpl.php +++ b/tpl/webadmin-itk.tpl.php @@ -22,7 +22,7 @@ - + Action'; diff --git a/tpl/webadmin-servername.tpl.php b/tpl/webadmin-servername.tpl.php index 9766b99..ac53cdd 100644 --- a/tpl/webadmin-servername.tpl.php +++ b/tpl/webadmin-servername.tpl.php @@ -13,7 +13,7 @@ ?> -

ServerNames

+

Servernames

- + Action'; } ?> @@ -43,7 +43,7 @@
ServerNameServername Utilisateur
ServerNameServername
Aucun ServerName existant pour le domaine $domain !

"; + print "

Aucun Servername existant pour le domaine $domain !

"; } diff --git a/tpl/webadmin.tpl.php b/tpl/webadmin.tpl.php index 192d52c..3ff59d2 100755 --- a/tpl/webadmin.tpl.php +++ b/tpl/webadmin.tpl.php @@ -22,9 +22,9 @@ Propriétaire'; + print 'Virtual Host'; } ?> - Domaine + Servername Alias'; } @@ -61,7 +61,7 @@ if(is_superadmin()) { printf('%s', $vhost_info['owner']); } - printf('http://%s', + printf('%s', $vhost_info['server_name'], $vhost_info['server_name']); if ($conf['cluster']) { @@ -87,7 +87,7 @@ printf('%s', $vhost_info['slave']); } - printf('%s', preg_replace('/,/','
',$vhost_info['server_alias'])); + printf('%s', preg_replace('/,/','
',$vhost_info['server_alias'])); if ($conf['quota']) { printf('%s', $vhost_info['size']);