diff --git a/web/add/web/index.php b/web/add/web/index.php index 29cc8fdcd..4f1a55b21 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -229,10 +229,8 @@ top_panel($user,$TAB); // Are you admin? if ($_SESSION['user'] == 'admin') { - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html'); } else { - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/add_web.html'); } unset($_SESSION['error_msg']); diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 7328359c5..642cea771 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -509,10 +509,8 @@ top_panel($user,$TAB); } if ($_SESSION['user'] == 'admin') { - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_web.html'); } else { - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_web.html'); } unset($_SESSION['error_msg']); diff --git a/web/list/web/index.php b/web/list/web/index.php index 2cc0c4b5c..22c8dbaf5 100644 --- a/web/list/web/index.php +++ b/web/list/web/index.php @@ -13,23 +13,16 @@ top_panel($user,$TAB); // Data if ($_SESSION['user'] == 'admin') { - exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); - unset($output); - - include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html'); } else { exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var); check_error($return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data); - unset($output); - - include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_web.html'); include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html'); } diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 688b8f937..0fb6d74d0 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -1,102 +1,235 @@ - + + + + +
Adding Domain + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+ + + - - - - - + + +
- - -
- 		- - -
- - - - - - - - - - - - - -
Domain
IP address
DNS support
>
Mail support
>
Advanced Options ⇢
- - - - - - - - - - - - - - - - - - -
Domain Aliases
Apache Template
+ + + + +
+ + + + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain +
+ + IP address +
+ +
+ DNS support +
+ > +
+ Mail support +
+ > +
+ Advanced Options ⇢ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain Aliases +
+ +
+ Apache Template +
+ +
+ Error Logging +
+ > +
+ Nginx Support +
+ > +
+ SSL Support +
+ > +
+ SSL Certificate +
+ +
+ SSL Key +
+ +
+ SSL Certificate Authority (optional) +
+ +
+ Web Statistics +
+ +
+
+ + +
+
+ diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index ce3ea0976..d64b3dcdd 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -1,122 +1,250 @@ - - - - - + +
- - - - -
- 		- - -
-
- - - - - - - - +
Domain
IP address
Aliases
Template
+ + + +
Editing Domain + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+
-
Error Logging
>
Nginx Support
onclick="javascript:elementHideShow('nginxtable');">
- - -
Nginx Supported Extentions
SSL Support
onclick="javascript:elementHideShow('ssltable');">
- - - - - - - - -
SSL HomeDirectory
SSL Certificate
SSL Key
SSL Certificate Authority (optional)
Web Statistics
Web Statistic Authorization
onclick="javascript:elementHideShow('statstable');">
- - - -
Web Statistics Username
Web Statistics Password generate
-
- - -
-
+
+ + + + + + +
+ + + + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain +
+ + IP address +
+ +
+ Aliases +
+ +
+ Template +
+ +
+ Error Logging +
+ > +
+ Nginx Support +
+ onclick="javascript:elementHideShow('nginxtable');"> +
+ + + + + + + +
+ Nginx Supported Extentions +
+ +
+
+ SSL Support +
+ onclick="javascript:elementHideShow('ssltable');"> +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ SSL HomeDirectory +
+ +
+ SSL Certificate +
+ +
+ SSL Key +
+ +
+ SSL Certificate Authority (optional) +
+ +
+
Web Statistics
Web Statistic Authorization
onclick="javascript:elementHideShow('statstable');">
+ + + +
Web Statistics Username
Web Statistics Password generate
+
+ + +
+
+ \ No newline at end of file diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 7de37ec49..c30917536 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -1,164 +1,241 @@ - - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - } - - if (!empty($data[$key]['SSL_HOME'])) { - if ($data[$key]['SSL_HOME'] == 'same') { - $ssl_home = 'public_html'; - } else { - $ssl_home = 'public_shtml'; - } - } else { - $ssl_home = ''; - } - if (strlen($data[$key]['NGINX_EXT']) > 16 ) { - $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']); - $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16); - $nginx_ext = trim($nginx_ext, ","); - $nginx_ext = str_replace(',', ', ', $nginx_ext); - $nginx_ext = $nginx_ext.", ..."; - } else { - $nginx_ext_title = ''; - $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']); - } - - ?> - - - - - - - - -
- - - - - -
" >
">
- 		- - - '; - echo " open webstats "; - } ?> - - - -
"> edit - - "> -
" title="Confirmation"> -

Are you sure you want to domain?

-
- 		- - delete -
-

Are you sure you want to delete domain?

-
-
- - - - - +
- - - - - +
[] template
Bandwidth: -
Disk: -
+ + + +
+
+ +
+
+ + +
+
+ toggle all + + +
+
+
- 		- - - - - -
CGI Support:
Error Log:
Web Statistics:
Statistics Auth:
- 		- - - - - -
SSL Support:
SSL Home:
Nginx Template:
Nginx Extentions:>
-
-
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + } + if (!empty($data[$key]['SSL_HOME'])) { + if ($data[$key]['SSL_HOME'] == 'same') { + $ssl_home = 'public_html'; + } else { + $ssl_home = 'public_shtml'; + } + } else { + $ssl_home = ''; + } + if (strlen($data[$key]['NGINX_EXT']) > 16 ) { + $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']); + $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16); + $nginx_ext = trim($nginx_ext, ","); + $nginx_ext = str_replace(',', ', ', $nginx_ext); + $nginx_ext = $nginx_ext.", ..."; + } else { + $nginx_ext_title = ''; + $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']); + } + ?> + + + + + + + +
+ + + + +
" >
">
+ 		+ + + + '; + echo " open webstats "; + } + ?> + + + + +
"> edit + + "> +
" title="Confirmation"> +

Are you sure you want to domain?

+
+ 		+ + delete +
+

Are you sure you want to delete domain?

+
+
+ + + + + + + + + + +
+ +
+ + + + + + + + + + + + +
+ +
+ [] template +
+ Bandwidth: +
+
+
+
Disk: +
+
+
+
+ 		+ + + + + + + + + + + + + + + + + +
CGI Support:
Error Log:
Web Statistics:
Statistics Auth:
+ 		+ + + + + + + + + + + + + + + + + +
SSL Support:
SSL Home:
Nginx Template:
Nginx Extentions:>
+
+
+ + "; ?> - - -"; ?> - - - - -
→ - -
- -"; ?> -"; ?> + + + + +
+ + +
+ + "; ?> + "; ?> diff --git a/web/templates/admin/menu_add_web.html b/web/templates/admin/menu_add_web.html deleted file mode 100644 index f32e4b320..000000000 --- a/web/templates/admin/menu_add_web.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - -
Adding Web Domain - → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
diff --git a/web/templates/admin/menu_edit_web.html b/web/templates/admin/menu_edit_web.html deleted file mode 100644 index 071ebad24..000000000 --- a/web/templates/admin/menu_edit_web.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - -
Editing Web Domain - → ".$_SESSION['error_msg'].""; - } else { - if (!empty($_SESSION['ok_msg'])) { - echo " → ".$_SESSION['ok_msg'].""; - } - } - ?> -
diff --git a/web/templates/admin/menu_web.html b/web/templates/admin/menu_web.html deleted file mode 100644 index b361cec2d..000000000 --- a/web/templates/admin/menu_web.html +++ /dev/null @@ -1,42 +0,0 @@ - - -
-

.

-
- - - - - - - - -
- - - toggle all -
-
diff --git a/web/templates/login.html b/web/templates/login.html index e236482b8..a09c4ff74 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -1,148 +1,180 @@ - - Vesta - Login - - - -
- - - -
- + + diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html index 2c82ecb36..6c1f7e8e5 100644 --- a/web/templates/user/add_web.html +++ b/web/templates/user/add_web.html @@ -1,87 +1,212 @@ - + + + + +
Adding Domain + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+ + + - - - -
- - -
- 		- - -
- - - - - - - - - - - - - - + + +
Domain
IP address
DNS support
>
Mail support
>
Advanced Options ⇢
- - - - - - - - - - - - - - - - - + +
Domain Aliases
Error Logging
>
Nginx Support
>
SSL Support
>
SSL Certificate
SSL Key
SSL Certificate Authority (optional)
Web Statistics
+ + + + +
+ + + + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain +
+ + IP address +
+ +
+ DNS support +
+ > +
+ Mail support +
+ > +
+ Advanced Options ⇢ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain Aliases +
+ +
+ Error Logging +
+ > +
+ Nginx Support +
+ > +
+ SSL Support +
+ > +
+ SSL Certificate +
+ +
+ SSL Key +
+ +
+ SSL Certificate Authority (optional) +
+ +
+ Web Statistics +
+ +
+
+ + +
+
+ diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html index 66c36621a..9a69d8db9 100644 --- a/web/templates/user/edit_web.html +++ b/web/templates/user/edit_web.html @@ -1,108 +1,229 @@ - - - - - - -
- - - - -
- 		- - -
-
- - - - - - - - - - - - - - - - - - - - -
Domain
IP address
Aliases
Error Logging
>
Nginx Support
onclick="javascript:elementHideShow('nginxtable');">
- - -
Nginx Supported Extentions
SSL Support
onclick="javascript:elementHideShow('ssltable');">
- - - - - - - - -
SSL HomeDirectory
SSL Certificate
SSL Key
SSL Certificate Authority (optional)
Web Statistics
Web Statistic Authorization
onclick="javascript:elementHideShow('statstable');">
- - - -
Web Statistics Username
Web Statistics Password generate
-
- - -
-
+ + + + +
Editing Domain + → ".$_SESSION['error_msg'].""; + } else { + if (!empty($_SESSION['ok_msg'])) { + echo " → ".$_SESSION['ok_msg'].""; + } + } + ?> +
+
+ +
+ + + + + + +
+ + + + +
+ 		+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Domain +
+ + IP address +
+ +
+ Aliases +
+ +
+ Error Logging +
+ > +
+ Nginx Support +
+ onclick="javascript:elementHideShow('nginxtable');"> +
+ + + + + + + +
+ Nginx Supported Extentions +
+ +
+
+ SSL Support +
+ onclick="javascript:elementHideShow('ssltable');"> +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ SSL HomeDirectory +
+ +
+ SSL Certificate +
+ +
+ SSL Key +
+ +
+ SSL Certificate Authority (optional) +
+ +
+
Web Statistics
Web Statistic Authorization
onclick="javascript:elementHideShow('statstable');">
+ + + +
Web Statistics Username
Web Statistics Password generate
+
+ + +
+
+ \ No newline at end of file diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html index eaf3ec4cf..5098c7f57 100644 --- a/web/templates/user/list_web.html +++ b/web/templates/user/list_web.html @@ -1,139 +1,234 @@ - - $value) { - ++$i; - if ($data[$key]['SUSPENDED'] == 'yes') { - $status = 'suspended'; - $spnd_action = 'unsuspend' ; - } else { - $status = 'active'; - $spnd_action = 'suspend' ; - } - - if (!empty($data[$key]['SSL_HOME'])) { - if ($data[$key]['SSL_HOME'] == 'same') { - $ssl_home = 'public_html'; - } else { - $ssl_home = 'public_shtml'; - } - } else { - $ssl_home = ''; - } - if (strlen($data[$key]['NGINX_EXT']) > 16 ) { - $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']); - $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16); - $nginx_ext = trim($nginx_ext, ","); - $nginx_ext = str_replace(',', ', ', $nginx_ext); - $nginx_ext = $nginx_ext.", ..."; - } else { - $nginx_ext_title = ''; - $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']); - } - - ?> - - - - - - - - -
- - - - - -
">
- 		- - - '; - echo " open webstats "; - } ?> - - -
"> edit - - delete -
-

Are you sure you want to delete domain?

-
-
- - - - - +
- - - - - +
[] template
Bandwidth: -
Disk: -
+ + + +
+
+ +
+
+ + +
+
+ toggle all + + +
+
+
- 		- - - - - -
CGI Support:
Error Log:
Web Statistics:
Statistics Auth:
- 		- - - - - -
SSL Support:
SSL Home:
Nginx Template:
Nginx Extentions:>
-
-
+ $value) { + ++$i; + if ($data[$key]['SUSPENDED'] == 'yes') { + $status = 'suspended'; + $spnd_action = 'unsuspend' ; + } else { + $status = 'active'; + $spnd_action = 'suspend' ; + } + if (!empty($data[$key]['SSL_HOME'])) { + if ($data[$key]['SSL_HOME'] == 'same') { + $ssl_home = 'public_html'; + } else { + $ssl_home = 'public_shtml'; + } + } else { + $ssl_home = ''; + } + if (strlen($data[$key]['NGINX_EXT']) > 16 ) { + $nginx_ext_title = str_replace(',', ', ', $data[$key]['NGINX_EXT']); + $nginx_ext = substr($data[$key]['NGINX_EXT'], 0, 16); + $nginx_ext = trim($nginx_ext, ","); + $nginx_ext = str_replace(',', ', ', $nginx_ext); + $nginx_ext = $nginx_ext.", ..."; + } else { + $nginx_ext_title = ''; + $nginx_ext = str_replace(',', ', ', $data[$key]['NGINX_EXT']); + } + ?> + + + + + + + +
+ + + + +
" >
">
+ 		+ + + + '; + echo " open webstats "; + } + ?> + + + +
"> edit + + delete +
+

Are you sure you want to delete domain?

+
+
+ + + + + + + + + + +
+ +
+ + + + + + + + + + + + +
+ +
+ [] template +
+ Bandwidth: +
+
+
+
Disk: +
+
+
+
+ 		+ + + + + + + + + + + + + + + + + +
CGI Support:
Error Log:
Web Statistics:
Statistics Auth:
+ 		+ + + + + + + + + + + + + + + + + +
SSL Support:
SSL Home:
Nginx Template:
Nginx Extentions:>
+
+
+ +
"; ?> - - -"; ?> - - - - -
→ - -
- -"; ?> -"; ?> + + + + +
+ + +
+ + "; ?> + "; ?> diff --git a/web/templates/user/menu_web.html b/web/templates/user/menu_web.html deleted file mode 100644 index 35636404d..000000000 --- a/web/templates/user/menu_web.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -
- - toggle all -
-