diff --git a/bin/v-list-web-domain-accesslog b/bin/v-list-web-domain-accesslog new file mode 100755 index 00000000..9fe682ab --- /dev/null +++ b/bin/v-list-web-domain-accesslog @@ -0,0 +1,49 @@ +#!/bin/bash +# info: list web domain access log +# options: USER DOMAIN [LINES] +# +# The function of obtaining raw access web domain logs. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +domain=$2 +lines=${3-30} + +# Includes +source $VESTA/conf/vesta.conf +source $VESTA/func/main.sh + + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER DOMAIN [FORMAT]' +is_object_valid 'user' 'USER' "$user" +is_object_valid 'web' 'DOMAIN' "$domain" + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Check number of output lines +if [ "$lines" -gt '3000' ]; then + read_cmd="cat" +else + read_cmd="tail -n $lines" +fi + +$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.log + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/bin/v-list-web-domain-errorlog b/bin/v-list-web-domain-errorlog new file mode 100755 index 00000000..7424d7b2 --- /dev/null +++ b/bin/v-list-web-domain-errorlog @@ -0,0 +1,49 @@ +#!/bin/bash +# info: list web domain error log +# options: USER DOMAIN [LINES] +# +# The function of obtaining raw error web domain logs. + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument defenition +user=$1 +domain=$2 +lines=${3-30} + +# Includes +source $VESTA/conf/vesta.conf +source $VESTA/func/main.sh + + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER DOMAIN [FORMAT]' +is_object_valid 'user' 'USER' "$user" +is_object_valid 'web' 'DOMAIN' "$domain" + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +# Check number of output lines +if [ "$lines" -gt '3000' ]; then + read_cmd="cat" +else + read_cmd="tail -n $lines" +fi + +$read_cmd /var/log/$WEB_SYSTEM/domains/$domain.error.log + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +exit diff --git a/web/download/web-log/index.php b/web/download/web-log/index.php new file mode 100644 index 00000000..79b5601c --- /dev/null +++ b/web/download/web-log/index.php @@ -0,0 +1,28 @@ + diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index f356af8e..d0838589 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -65,6 +65,7 @@ $LANG['en'] = array( 'logout' => 'logout', 'edit' => 'edit', 'open webstats' => 'open webstats', + 'view logs' => 'view logs', 'list records' => 'list %s records', 'add record' => 'add record', 'list accounts' => 'list %s accounts', @@ -308,6 +309,8 @@ $LANG['en'] = array( 'stats password' => 'stats password', 'ftp user password' => 'ftp user password', 'ftp user' => 'ftp user', + 'Download AccessLog' => 'Download AccessLog', + 'Download ErrorLog' => 'Download ErrorLog', '1 account' => '1 account', '%s accounts' => '%s accounts', diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index b36425ba..dbf70c01 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -64,6 +64,7 @@ $LANG['es'] = array( 'logout' => 'salir', 'edit' => 'editar', 'open webstats' => 'abrir webstats', + 'view logs' => 'ver los logs', 'list records' => 'listar los %s registros', 'add record' => 'añadir registro', 'list accounts' => 'listar %s cuentas', @@ -307,6 +308,8 @@ $LANG['es'] = array( 'stats password' => 'contraseña estadísticas', 'ftp user password' => 'contraseña usuario ftp', 'ftp user' => 'usuario ftp', + 'Download AccessLog' => 'Descargar AccessLog', + 'Download ErrorLog' => 'Descargar ErrorLog', '1 account' => '1 cuenta', '%s accounts' => '%s cuentas', diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index b72ceab6..31ad71a3 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -66,6 +66,7 @@ $LANG['ro'] = array( 'logout' => 'logout', 'edit' => 'edita', 'open webstats' => 'deschide raportul de analiză', + 'view logs' => 'vizualiza loguri', 'list records' => 'arată inregistrarile: %s', 'add record' => 'adaugă înregistrare', 'list accounts' => 'arata conturi: %s', @@ -309,6 +310,8 @@ $LANG['ro'] = array( 'stats password' => 'parola de utilizator statistici', 'ftp user password' => 'parola de FTP', 'ftp user' => 'cont FTP', + 'Download AccessLog' => 'Descarcă AccessLog', + 'Download ErrorLog' => 'Descarcă ErrorLog', '1 account' => '1 utilizator', '%s accounts' => '%s utilizatori', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 45023261..5fb61bc6 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -66,6 +66,7 @@ $LANG['ru'] = array( 'logout' => 'выйти', 'edit' => 'редактировать', 'open webstats' => 'открыть отчет веб-аналитики', + 'view logs' => 'просмотреть логи', 'list records' => 'показать записи: %s', 'add record' => 'добавить запись', 'list accounts' => 'показать аккаунты: %s', @@ -309,6 +310,8 @@ $LANG['ru'] = array( 'stats password' => 'пароль пользователя статистики', 'ftp user password' => 'пароль для доступа к FTP', 'ftp user' => 'пользователь FTP', + 'Download AccessLog' => 'Скачать AccessLog', + 'Download ErrorLog' => 'Скачать ErrorLog', '1 account' => ' пользователей на странице: 1', '%s accounts' => 'пользователей на странице: %s', diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index 5e35a460..1d7bee6c 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -66,6 +66,7 @@ $LANG['ua'] = array( 'logout' => 'вийти', 'edit' => 'редагувати', 'open webstats' => 'відкрити звіт веб-аналітики', + 'view logs' => 'переглянути логи', 'list records' => 'показати записи: %s', 'add record' => 'додати запис', 'list accounts' => 'показати акаунти: %s', @@ -309,7 +310,9 @@ $LANG['ua'] = array( 'stats password' => 'пароль користувача статистики', 'ftp user password' => 'пароль для доступу до FTP', 'ftp user' => 'користувач FTP', - + 'Download AccessLog' => 'Завантажити AccessLog', + 'Download ErrorLog' => 'Завантажити ErrorLog', + '1 account' => ' користувач на сторінці: 1', '%s accounts' => 'користувачів на сторінці: %s', '1 domain' => 'домен на сторінці: 1', diff --git a/web/list/web-log/index.php b/web/list/web-log/index.php new file mode 100644 index 00000000..95b6de2a --- /dev/null +++ b/web/list/web-log/index.php @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/web/templates/admin/list_weblog.html b/web/templates/admin/list_weblog.html new file mode 100644 index 00000000..c5ce3a0b --- /dev/null +++ b/web/templates/admin/list_weblog.html @@ -0,0 +1,127 @@ + + + + + Web Log Manager + + + + + + + + + + +
+ "> + + + + "> + + + + "> + + + + "> + + + +
+
+
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 6e857cd5..7c88a67b 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -97,6 +97,12 @@
                                              
                                         
                                     
+                                    
+                                        
+                                            
+                                             
+                                        
+