diff --git a/bin/v_list_user_packages b/bin/v_list_user_packages
index 20370068..1cf32535 100755
--- a/bin/v_list_user_packages
+++ b/bin/v_list_user_packages
@@ -71,9 +71,9 @@ shell_list_pkgs() {
#----------------------------------------------------------#
# Defining fields
-fields='$PACKAGE $TEMPLATE $WEB_DOMAINS $WEB_SSL $WEB_ALIASES $DATABASES
- $MAIL_DOMAINS $MAIL_BOXES $MAIL_FORWARDERS $DNS_DOMAINS $DISK_QUOTA
- $BANDWIDTH $NS $SHELL $BACKUPS'
+fields='$PACKAGE $TEMPLATE $WEB_DOMAINS $WEB_ALIASES $DNS_DOMAINS $DNS_RECORDS
+ $MAIL_DOMAINS $MAIL_ACCOUNTS $DATABASES $CRON_JOBS $DISK_QUOTA $BANDWIDTH
+ $NS $SHELL $BACKUPS $TIME $DATE'
# Listing domains
case $format in
diff --git a/data/packages/default.pkg b/data/packages/default.pkg
index 0399cabe..815371c1 100644
--- a/data/packages/default.pkg
+++ b/data/packages/default.pkg
@@ -12,3 +12,5 @@ BANDWIDTH='100000'
NS='ns1.localhost,ns2.localhost'
SHELL='nologin'
BACKUPS='3'
+TIME='11:31:29'
+DATE='2012-07-26'
diff --git a/data/packages/gainsboro.pkg b/data/packages/gainsboro.pkg
index 4529b9cc..e7d4402e 100644
--- a/data/packages/gainsboro.pkg
+++ b/data/packages/gainsboro.pkg
@@ -12,3 +12,5 @@ BANDWIDTH='10000'
NS='ns1.localhost,ns2.localhost'
SHELL='nologin'
BACKUPS='1'
+TIME='11:31:30'
+DATE='2012-07-26'
diff --git a/data/packages/palegreen.pkg b/data/packages/palegreen.pkg
index 7c3200ca..8e71593a 100644
--- a/data/packages/palegreen.pkg
+++ b/data/packages/palegreen.pkg
@@ -12,3 +12,5 @@ BANDWIDTH='50000'
NS='ns1.localhost,ns2.localhost'
SHELL='nologin'
BACKUPS='5'
+TIME='11:31:31'
+DATE='2012-07-26'
diff --git a/data/packages/slategrey.pkg b/data/packages/slategrey.pkg
index 0399cabe..e2f2664d 100644
--- a/data/packages/slategrey.pkg
+++ b/data/packages/slategrey.pkg
@@ -12,3 +12,5 @@ BANDWIDTH='100000'
NS='ns1.localhost,ns2.localhost'
SHELL='nologin'
BACKUPS='3'
+TIME='11:31:32'
+DATE='2012-07-26'
diff --git a/func/main.sh b/func/main.sh
index 5f691303..1553af70 100755
--- a/func/main.sh
+++ b/func/main.sh
@@ -122,7 +122,7 @@ gen_password() {
# Package existance check
is_package_valid() {
if [ ! -e "$VESTA/data/packages/$package.pkg" ]; then
- echo "Error: $package is not exist"
+ echo "Error: package $package not exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
diff --git a/web/images/reload.png b/web/images/reload.png
new file mode 100644
index 00000000..44cdc0cc
Binary files /dev/null and b/web/images/reload.png differ
diff --git a/web/images/update.png b/web/images/update.png
new file mode 100644
index 00000000..9cf6bfa6
Binary files /dev/null and b/web/images/update.png differ
diff --git a/web/list/packages/index.php b/web/list/packages/index.php
index 32c28a1f..c4264303 100644
--- a/web/list/packages/index.php
+++ b/web/list/packages/index.php
@@ -1,34 +1,28 @@
0 ) {
- header("Location: /error/");
-}
-$panel = json_decode(implode('', $output), true);
-if ( $_SESSION['user'] == 'admin' ) {
- require_once '../../templates/admin/panel.html';
-} else {
- require_once '../../templates/header.html';
+// Panel
+top_panel($user,$TAB);
+
+// Data
+if ($_SESSION['user'] == 'admin') {
+
+ exec (VESTA_CMD."v_list_user_packages 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_packages.html');
+ include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html');
}
-require_once '../../templates/footer.html';
+// Footer
+include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
new file mode 100644
index 00000000..ef67c90e
--- /dev/null
+++ b/web/templates/admin/list_packages.html
@@ -0,0 +1,118 @@
+
+
+ $value) {
+ ++$i;
+?>
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+ Defaul Template: |
+ |
+ System Shell: |
+ |
+
+ Bandwidth:
+ |
+ Disk:
+ |
+
+ |
+
+
+ Web Domains: |
+ |
+ Web Aliases: |
+ per domain |
+ Dns Domains: |
+ |
+ Dns Records: |
+ per domain |
+ Name Servers: |
+ |
+ |
+
+
+ Mail Domains: |
+ |
+ Mail Accounts: |
+ per domain |
+ Databases: |
+ |
+ Cron Jobs: |
+ |
+ Backups: |
+ |
+
+ |
+
+
+ |
+
+
+
+
+ |
"; ?>
+
+
+ |
"; ?>
+ |
"; ?>
diff --git a/web/templates/admin/menu_packages.html b/web/templates/admin/menu_packages.html
new file mode 100644
index 00000000..7689b385
--- /dev/null
+++ b/web/templates/admin/menu_packages.html
@@ -0,0 +1,16 @@
+
+