diff --git a/.gitignore b/.gitignore
index 6e9dadb..7d7f61e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
conf/config.local.php
.vagrant
+.idea
diff --git a/htdocs/inc/js/webadmin.js b/htdocs/inc/js/webadmin.js
index 77bb78f..4a78df5 100644
--- a/htdocs/inc/js/webadmin.js
+++ b/htdocs/inc/js/webadmin.js
@@ -21,6 +21,12 @@ function switch_disabled(name) {
}
document.observe("dom:loaded", function() {
+ if (document.getElementById('vhost-delete-db') != null) {
+ document.getElementById('vhost-delete-db').onclick = function() {
+ console.log("clicked box");
+ switch_disabled('vhost-dbname');
+ }
+ }
document.getElementById('password_random').onclick = function() {
switch_disabled('password');
}
diff --git a/htdocs/index.php b/htdocs/index.php
index b1010bb..c2f5ff0 100755
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -48,26 +48,41 @@ if (!array_key_exists('auth', $_SESSION) || $_SESSION['auth']!=1) {
include_once EVOADMIN_BASE . '../inc/webadmin.php';
-} elseif (preg_match('#^/webadmin/(.*)/domain/?(edit)?/?(.*)?/$#', $uri, $params)) {
+} elseif (preg_match('#^/webadmin?#', $uri)) {
- include_once EVOADMIN_BASE . '../inc/webadmin-servername.php';
+ // Redirect to /webadmin in order to set $_SESSION['non_stanard']
+ if (!isset($_SESSION['non_standard']))
+ http_redirect('/webadmin');
-} elseif (preg_match('#^/webadmin/(.*)/itk/?(enable|disable)?/?(.*)?/$#', $uri, $params)) {
+ // block the non-standard vhost modification
+ if (in_array(htmlspecialchars(basename($_SERVER['REDIRECT_URL'])), $_SESSION['non_standard']))
+ http_redirect('/webadmin');
- include_once EVOADMIN_BASE . '../inc/webadmin-itk.php';
+ if (preg_match('#^/webadmin/(.*)/domain/?(edit)?/?(.*)?/$#', $uri, $params)) {
-} elseif (preg_match('#^/webadmin/(.*)/php/$#', $uri, $params)) {
+ include_once EVOADMIN_BASE . '../inc/webadmin-servername.php';
- include_once EVOADMIN_BASE . '../inc/webadmin-php.php';
+ } elseif (preg_match('#^/webadmin/(.*)/itk/?(enable|disable)?/?(.*)?/$#', $uri, $params)) {
-} elseif (preg_match('#^/webadmin/(.*)/alias/?(add|delete)?/?(.*)?/$#', $uri, $params)) {
+ include_once EVOADMIN_BASE . '../inc/webadmin-itk.php';
- include_once EVOADMIN_BASE . '../inc/webadmin-edit.php';
+ } elseif (preg_match('#^/webadmin/(.*)/php/$#', $uri, $params)) {
-} elseif (preg_match('#^/webadmin/suppr/(.*)/?$#', $uri, $params)) {
+ include_once EVOADMIN_BASE . '../inc/webadmin-php.php';
- include_once EVOADMIN_BASE . '../inc/webadmin-suppr.php';
+ } elseif (preg_match('#^/webadmin/(.*)/alias/?(add|delete)?/?(.*)?/$#', $uri, $params)) {
+ include_once EVOADMIN_BASE . '../inc/webadmin-edit.php';
+
+ } elseif (preg_match('#^/webadmin/delete/(.*)/?$#', $uri, $params)) {
+
+ include_once EVOADMIN_BASE . '../inc/webadmin-delete.php';
+
+ } elseif (preg_match('#^/webadmin/suppr/(.*)/?$#', $uri, $params)) {
+
+ include_once EVOADMIN_BASE . '../inc/webadmin-suppr.php';
+
+ }
} elseif (is_superadmin() && preg_match('#^/accounts/?#', $uri, $params)) {
include_once EVOADMIN_BASE . '../inc/accounts.php';
diff --git a/inc/webadmin-delete.php b/inc/webadmin-delete.php
new file mode 100644
index 0000000..85b9e03
--- /dev/null
+++ b/inc/webadmin-delete.php
@@ -0,0 +1,72 @@
+
+ * @author Thomas Martin Veuillez entrer le nom du compte web à supprimer. Compte supprimé. La suppression a échouée. Veuillez contacter votre administrateur. La suppression a échouée. Veuillez contacter votre administrateur. Alias %s est supprimé. La suppression a échouée. Veuillez contacter votre administrateur. Echec dans la creation de l\'alias %s du domaine %s Echec dans la creation de l\'alias %s L\'alias existe dans d\'autres vhosts.');
printf ('Ajout d'un serveralias
";
+ print "Ajout d'un alias
";
print "";
}
} else {
- print "Modification du ServerName
";
+ print "Modification du Servername
";
print "
Aucun Servername existant pour le domaine $domain !
"; } diff --git a/tpl/webadmin.tpl.php b/tpl/webadmin.tpl.php index 192d52c..280b6e9 100755 --- a/tpl/webadmin.tpl.php +++ b/tpl/webadmin.tpl.php @@ -22,9 +22,9 @@