Merge branch 'route-naming' of evolix/evoadmin-web into master
This commit is contained in:
commit
cd6abd008d
|
@ -48,19 +48,19 @@ if (!array_key_exists('auth', $_SESSION) || $_SESSION['auth']!=1) {
|
|||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin.php';
|
||||
|
||||
} elseif (preg_match('#^/webadmin/servername/(.*)/?$#', $uri, $params)) {
|
||||
} elseif (preg_match('#^/webadmin/(.*)/domain/?(edit)?/?(.*)?/$#', $uri, $params)) {
|
||||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin-servername.php';
|
||||
|
||||
} elseif (preg_match('#^/webadmin/itk/(.*)/?$#', $uri, $params)) {
|
||||
} elseif (preg_match('#^/webadmin/(.*)/itk/?(enable|disable)?/?(.*)?/$#', $uri, $params)) {
|
||||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin-itk.php';
|
||||
|
||||
} elseif (preg_match('#^/webadmin/php/(.*)/?$#', $uri, $params)) {
|
||||
} elseif (preg_match('#^/webadmin/(.*)/php/$#', $uri, $params)) {
|
||||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin-php.php';
|
||||
|
||||
} elseif (preg_match('#^/webadmin/edit/(.*)/?$#', $uri, $params)) {
|
||||
} elseif (preg_match('#^/webadmin/(.*)/alias/?(add|delete)?/?(.*)?/$#', $uri, $params)) {
|
||||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin-edit.php';
|
||||
|
||||
|
|
|
@ -18,21 +18,24 @@ require_once EVOADMIN_BASE . '../lib/domain.php';
|
|||
|
||||
global $conf;
|
||||
|
||||
if (isset($_GET['del']) ) {
|
||||
$redirect_url = "/webadmin/" . $params[1] . "/alias/";
|
||||
|
||||
if (isset($params[2]) && $params[2] == "delete") {
|
||||
if (isset($params[3]) && $params[3] == "") http_redirect($redirect_url);
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
|
||||
include_once EVOADMIN_BASE . '../tpl/menu.tpl.php';
|
||||
|
||||
$alias = htmlspecialchars($_GET['del']);
|
||||
$alias = $params[3];
|
||||
|
||||
if (isset($_GET['modif']) && ($_GET['modif'] == 'yes')) {
|
||||
if (isset($_POST["confirm-delete-alias"])) {
|
||||
|
||||
print "<center>";
|
||||
print "<p>Suppression de $alias...</p>";
|
||||
|
||||
|
||||
$serveralias = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'domain' => $params[1],
|
||||
'alias' => $alias
|
||||
);
|
||||
|
||||
|
@ -81,23 +84,25 @@ if (isset($_GET['del']) ) {
|
|||
print "<p>La suppression a échouée. Veuillez contacter votre administrateur.</p>";
|
||||
|
||||
}
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
|
||||
} else if ( ! isset($_GET['modif']) ) {
|
||||
} else {
|
||||
|
||||
print "<center>";
|
||||
print "<form name=\"form-confirm-delete-alias\" id=\"form-confirm-delete-alias\" action=\"\" method=\"POST\">";
|
||||
print "<p>Confirmez vous la suppression de $alias ?</p>";
|
||||
printf ('<p><a href="%s?del=%s&modif=yes">Confirmer la suppression</a></p>', $_SERVER['REDIRECT_URL'], $alias);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print " <p><input type=\"hidden\" name=\"confirm-delete-alias\" value=\"confirm\">";
|
||||
print " <p><input type=\"submit\" value=\"Confirmer la suppression\"/ style=\"margin-left:0px;\"></p>";
|
||||
print "</form>";
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||
|
||||
} else if (isset($_GET['add']) ) {
|
||||
|
||||
}
|
||||
elseif (isset($params[2]) && $params[2] == "add") {
|
||||
require_once EVOADMIN_BASE . '../evolibs/Form.php';
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
|
||||
|
@ -182,7 +187,7 @@ if (isset($_GET['del']) ) {
|
|||
}
|
||||
else {
|
||||
$serveralias = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'domain' => $params[1],
|
||||
'alias' => $form->getField('domain_alias')->getValue(),
|
||||
);
|
||||
|
||||
|
@ -197,13 +202,13 @@ if (isset($_GET['del']) ) {
|
|||
//domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer
|
||||
print "<center>";
|
||||
printf ('<p>L\'alias %s du domaine %s a bien été créé</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la creation de l\'alias %s du domaine %s</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
|
@ -211,7 +216,7 @@ if (isset($_GET['del']) ) {
|
|||
print "<center>";
|
||||
printf ('<p>Echec dans la creation de l\'alias %s du domaine %s</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
print ('<p>L\'alias existe dans d\'autres vhosts.');
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
|
@ -240,9 +245,9 @@ if (isset($_GET['del']) ) {
|
|||
}
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
else {
|
||||
|
||||
$domain = $params[1];
|
||||
$alias_list = array();
|
||||
|
|
|
@ -18,58 +18,44 @@ require_once EVOADMIN_BASE . '../lib/domain.php';
|
|||
|
||||
global $conf;
|
||||
|
||||
if (isset($_GET['enable']) ) {
|
||||
if (isset($params[2]) && $params[2] != "") {
|
||||
$redirect_url = "/webadmin/" . $params[1] . "/itk/";
|
||||
|
||||
if (isset($params[3]) && $params[3] == "") http_redirect($redirect_url);
|
||||
|
||||
require_once EVOADMIN_BASE . '../evolibs/Form.php';
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
|
||||
include_once EVOADMIN_BASE . '../tpl/menu.tpl.php';
|
||||
|
||||
|
||||
# TODO: sanitize $_GET
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'servername' => $_GET['enable']
|
||||
'domain' => $params[1],
|
||||
'servername' => $params[3]
|
||||
);
|
||||
|
||||
if ($params[2] == "enable") {
|
||||
$enable_cmd = 'web-add.sh enable-user-itk ' . $servername['servername'] . ' ' . $servername['domain'];
|
||||
|
||||
sudoexec($enable_cmd, $enable_cmd_output, $enable_cmd_return);
|
||||
|
||||
if ($enable_cmd_return == 0) {
|
||||
print 'Sécurité ITK activée.';
|
||||
printf ('<p><a href="%s">Retour à la gestion ITK</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la gestion ITK</a></p>', $redirect_url);
|
||||
}
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||
|
||||
|
||||
}
|
||||
elseif (isset($_GET['disable']) ) {
|
||||
require_once EVOADMIN_BASE . '../evolibs/Form.php';
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
|
||||
include_once EVOADMIN_BASE . '../tpl/menu.tpl.php';
|
||||
|
||||
|
||||
# TODO: sanitize $_GET
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'servername' => $_GET['disable']
|
||||
);
|
||||
|
||||
elseif ($params[2] == "disable") {
|
||||
$disable_cmd = 'web-add.sh disable-user-itk ' . $servername['servername'] . ' ' . $servername['domain'];
|
||||
|
||||
sudoexec($disable_cmd, $disable_cmd_output, $disable_cmd_return);
|
||||
|
||||
if ($disable_cmd_return == 0) {
|
||||
print 'Sécurité ITK désactivée';
|
||||
printf ('<p><a href="%s">Retour à la gestion ITK</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la gestion ITK</a></p>', $redirect_url);
|
||||
}
|
||||
}
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||
|
||||
|
||||
}
|
||||
|
||||
else {
|
||||
|
||||
$domain = $params[1];
|
||||
|
|
|
@ -56,7 +56,7 @@ else {
|
|||
if ($exec_return == 0) {
|
||||
|
||||
print "<center>";
|
||||
printf ('<p>La version de PHP bien été modifié</p>');
|
||||
printf ('<p>La version de PHP a bien été modifiée</p>');
|
||||
printf ('<p><a href="/webadmin">Retour à liste des comptes</a></p>');
|
||||
print "</center>";
|
||||
|
||||
|
@ -64,7 +64,7 @@ else {
|
|||
else {
|
||||
print "<center>";
|
||||
printf ('<h2>ERREUR</h2>');
|
||||
printf ('<p>Une erreur innatendue s\'est produite </p>');
|
||||
printf ('<p>Une erreur inattendue s\'est produite </p>');
|
||||
|
||||
if ($conf['debug'] == TRUE) {
|
||||
print '<pre>';
|
||||
|
|
|
@ -18,15 +18,19 @@ require_once EVOADMIN_BASE . '../lib/domain.php';
|
|||
|
||||
global $conf;
|
||||
|
||||
if (isset($_GET['edit']) ) {
|
||||
if (isset($params[2]) && $params[2] == "edit") {
|
||||
$redirect_url = "/webadmin/" . $params[1] . "/domain/";
|
||||
|
||||
if (isset($params[3]) && $params[3] == "") http_redirect($redirect_url);
|
||||
|
||||
require_once EVOADMIN_BASE . '../evolibs/Form.php';
|
||||
|
||||
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), $_GET['edit']);
|
||||
$form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $_GET['edit']);
|
||||
$form->addField('domain_servername', new DomainInputFormField("ServerName", TRUE), $params[3]);
|
||||
$form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $params[3]);
|
||||
|
||||
if (!empty($_POST)) {
|
||||
$form->isCurrentPage(TRUE);
|
||||
|
@ -88,25 +92,25 @@ if (isset($_GET['edit']) ) {
|
|||
|
||||
print "<center>";
|
||||
printf ('<p>L\'alias %s du domaine %s a bien été créé</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la creation de l\'alias %s du domaine %s</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Alias %s du domaine %s deja existant !</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
|
||||
}
|
||||
}
|
||||
else {
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'domain' => $params[1],
|
||||
'servername' => $form->getField('domain_servername')->getValue(),
|
||||
'previous_servername' => $form->getField('previous_servername')->getValue(),
|
||||
);
|
||||
|
@ -123,13 +127,13 @@ if (isset($_GET['edit']) ) {
|
|||
//domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer
|
||||
print "<center>";
|
||||
printf ('<p>Le ServerName %s a bien été modifié</p>', $servername['servername']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
|
@ -137,7 +141,7 @@ if (isset($_GET['edit']) ) {
|
|||
print "<center>";
|
||||
printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
|
||||
print ('<p>Le domaine existe déjà dans d\'autres vhosts.');
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
if (is_superadmin()) {
|
||||
print "<center>";
|
||||
printf('<p><a href="/webadmin/edit/%s?add">Ajouter un alias</a></p>', $domain);
|
||||
printf('<p><a href="/webadmin/%s/alias/add/">Ajouter un alias</a></p>', $domain);
|
||||
print "</center>";
|
||||
}?>
|
||||
|
||||
|
@ -41,7 +41,7 @@
|
|||
printf('<td><a href="http://%s">http://%s</a></td>',
|
||||
$alias_list[$i]['alias'], $alias_list[$i]['alias']);
|
||||
if (is_superadmin())
|
||||
printf('<td><a href="/webadmin/edit/%s?del=%s">Supprimer</a></td>',
|
||||
printf('<td><a href="/webadmin/%s/alias/delete/%s/">Supprimer</a></td>',
|
||||
$domain, $alias_list[$i]['alias']);
|
||||
print '</tr>';
|
||||
} ?>
|
||||
|
@ -52,11 +52,10 @@
|
|||
print "<p>Aucun alias existant pour le domaine $domain !</p>";
|
||||
if (is_superadmin()) {
|
||||
print "<center>";
|
||||
printf('<p><a href="/webadmin/edit/%s?add">Ajouter un alias</a></p>', $domain);
|
||||
printf('<p><a href="/webadmin/%s/alias/add/">Ajouter un alias</a></p>', $domain);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
|
|
|
@ -38,14 +38,18 @@
|
|||
printf('<td>%s</td>',
|
||||
$data_list[$i]['user']);
|
||||
if (is_superadmin()) {
|
||||
|
||||
if (strpos($data_list[$i]['user'], 'www') !== false) {
|
||||
$action = ['disable', 'Désactiver'];
|
||||
} else {
|
||||
$action = ['enable', 'Activer'];
|
||||
}
|
||||
|
||||
printf('<td><a href="/webadmin/itk/%s?%s=%s">'.$action[1].'</a></td>',
|
||||
// AssignUserID not set in the vhost, override previous action
|
||||
if (empty($data_list[$i]['user'])) {
|
||||
$action = ["", ""];
|
||||
}
|
||||
|
||||
printf('<td><a href="/webadmin/%s/itk/%s/%s/">'.$action[1].'</a></td>',
|
||||
$domain, $action[0], $data_list[$i]['servername']);
|
||||
}
|
||||
print '</tr>';
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
printf('<td>%s</td>',
|
||||
$servername_list[$i]);
|
||||
if (is_superadmin())
|
||||
printf('<td><a href="/webadmin/servername/%s?edit=%s">Modifier</a></td>',
|
||||
printf('<td><a href="/webadmin/%s/domain/edit/%s/">Modifier</a></td>',
|
||||
$domain, $servername_list[$i]);
|
||||
print '</tr>';
|
||||
} ?>
|
||||
|
|
|
@ -95,6 +95,7 @@
|
|||
printf('<td>%s</td>', $vhost_info['quota_hard']);
|
||||
printf('<td>%s</td>', $vhost_info['occupation']);
|
||||
}
|
||||
|
||||
if (array_key_exists('php_versions', $conf) && count($conf['php_versions']) > 1) {
|
||||
printf('<td>%s</td>', preg_replace("/^(\d)(\d)$/", '\1.\2', $vhost_info['php_version']));
|
||||
}
|
||||
|
@ -102,12 +103,12 @@
|
|||
|
||||
if (is_superadmin()) {
|
||||
printf('<td>');
|
||||
printf('<a href="/webadmin/edit/%s">Alias</a> - ', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/servername/%s">Servername</a> - ', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/%s/alias/">Alias</a> - ', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/%s/domain/">Servername</a> - ', $vhost_info['owner']);
|
||||
if(is_multiphp()) {
|
||||
printf('<a href="/webadmin/php/%s">PHP</a>', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/%s/php/">PHP</a>', $vhost_info['owner']);
|
||||
} else {
|
||||
printf('<a href="/webadmin/itk/%s">ITK</a>', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/%s/itk/">ITK</a>', $vhost_info['owner']);
|
||||
}
|
||||
printf('</td>');
|
||||
|
||||
|
|
Loading…
Reference in a new issue