From 8ab3cdc09cfbac3157e996664616c229214f6c8d Mon Sep 17 00:00:00 2001 From: tbrehm Date: Fri, 21 Oct 2011 10:03:56 +0000 Subject: [PATCH] Merged revisions 2681-2739 from 3.0.4 stable branch. --- install/dist/lib/fedora.lib.php | 8 +- install/dist/lib/gentoo.lib.php | 2 + install/lib/installer_base.lib.php | 2 + install/sql/incremental/upd_0026.sql | 1 + install/sql/ispconfig3.sql | 2 +- install/tpl/config.inc.php.master | 2 +- install/tpl/nginx_apps.vhost.master | 36 +- install/tpl/server.ini.master | 2 +- .../lib/classes/custom_datasource.inc.php | 25 + interface/lib/classes/listform.inc.php | 2 +- .../lib/classes/listform_actions.inc.php | 18 +- interface/lib/classes/remoting.inc.php | 10 +- interface/lib/lang/hr.lng | 12 +- interface/lib/lang/it.lng | 44 +- interface/web/admin/form/server.tform.php | 12 - .../web/admin/form/server_config.tform.php | 2 +- .../web/admin/lib/lang/ar_server_config.lng | 2 +- .../web/admin/lib/lang/bg_server_config.lng | 2 +- .../web/admin/lib/lang/br_server_config.lng | 2 +- .../web/admin/lib/lang/cz_server_config.lng | 2 +- .../web/admin/lib/lang/de_server_config.lng | 10 +- .../web/admin/lib/lang/el_server_config.lng | 2 +- .../web/admin/lib/lang/en_server_config.lng | 4 +- .../web/admin/lib/lang/es_server_config.lng | 2 +- .../web/admin/lib/lang/fi_server_config.lng | 2 +- .../web/admin/lib/lang/fr_server_config.lng | 2 +- interface/web/admin/lib/lang/hr.lng | 68 +- .../web/admin/lib/lang/hr_server_config.lng | 2 +- .../web/admin/lib/lang/hu_server_config.lng | 2 +- .../web/admin/lib/lang/id_server_config.lng | 2 +- interface/web/admin/lib/lang/it.lng | 22 +- interface/web/admin/lib/lang/it_firewall.lng | 2 +- .../web/admin/lib/lang/it_firewall_list.lng | 8 +- .../web/admin/lib/lang/it_groups_list.lng | 10 +- .../admin/lib/lang/it_language_complete.lng | 2 +- .../web/admin/lib/lang/it_language_edit.lng | 4 +- .../web/admin/lib/lang/it_language_export.lng | 2 +- .../web/admin/lib/lang/it_language_import.lng | 12 +- .../web/admin/lib/lang/it_package_install.lng | 6 +- .../admin/lib/lang/it_remote_user_list.lng | 6 +- interface/web/admin/lib/lang/it_server.lng | 18 +- .../web/admin/lib/lang/it_server_config.lng | 14 +- interface/web/admin/lib/lang/it_server_ip.lng | 6 +- .../web/admin/lib/lang/it_software_repo.lng | 6 +- .../lib/lang/it_software_update_list.lng | 4 +- .../web/admin/lib/lang/it_system_config.lng | 16 +- interface/web/admin/lib/lang/it_users.lng | 38 +- .../web/admin/lib/lang/it_users_list.lng | 2 +- .../web/admin/lib/lang/ja_server_config.lng | 2 +- .../web/admin/lib/lang/nl_server_config.lng | 2 +- .../web/admin/lib/lang/pl_server_config.lng | 2 +- .../web/admin/lib/lang/pt_server_config.lng | 2 +- .../web/admin/lib/lang/ro_server_config.lng | 2 +- .../web/admin/lib/lang/ru_server_config.lng | 2 +- .../web/admin/lib/lang/se_server_config.lng | 2 +- .../web/admin/lib/lang/sk_server_config.lng | 2 +- .../web/admin/lib/lang/tr_server_config.lng | 2 +- .../web/admin/templates/language_export.htm | 2 +- .../templates/server_config_rescue_edit.htm | 4 +- .../admin/templates/server_edit_services.htm | 12 - interface/web/admin/templates/server_list.htm | 8 +- interface/web/client/client_del.php | 2 +- interface/web/client/lib/lang/en_client.lng | 4 +- interface/web/client/lib/lang/it.lng | 8 +- interface/web/client/lib/lang/it_client.lng | 18 +- .../web/client/lib/lang/it_client_del.lng | 8 +- .../client/lib/lang/it_client_template.lng | 118 +- .../web/client/lib/lang/it_clients_list.lng | 4 +- .../web/client/lib/lang/it_resellers_list.lng | 12 +- .../dashboard/lib/lang/hr_dashlet_limits.lng | 4 +- interface/web/dashboard/lib/lang/it.lng | 4 +- .../dashboard/lib/lang/it_dashlet_limits.lng | 54 +- .../dashboard/lib/lang/it_dashlet_modules.lng | 2 +- .../web/designer/lib/lang/it_form_edit.lng | 2 +- .../web/designer/lib/lang/it_form_list.lng | 6 +- .../web/designer/lib/lang/it_module_edit.lng | 4 +- .../web/designer/lib/lang/it_module_list.lng | 6 +- .../designer/lib/lang/it_module_nav_edit.lng | 8 +- .../lib/lang/it_module_nav_item_edit.lng | 8 +- .../web/designer/lib/lang/it_module_show.lng | 6 +- interface/web/dns/dns_import.php | 280 ++- interface/web/dns/dns_slave_edit.php | 8 +- interface/web/dns/dns_soa_edit.php | 8 +- interface/web/dns/form/dns_soa.tform.php | 6 +- interface/web/dns/lib/lang/ar.lng | 3 + interface/web/dns/lib/lang/bg.lng | 3 + interface/web/dns/lib/lang/br.lng | 3 + interface/web/dns/lib/lang/cz.lng | 3 + interface/web/dns/lib/lang/de.lng | 3 + interface/web/dns/lib/lang/el.lng | 3 + interface/web/dns/lib/lang/en.lng | 4 +- interface/web/dns/lib/lang/es.lng | 3 + interface/web/dns/lib/lang/fi.lng | 3 + interface/web/dns/lib/lang/fr.lng | 3 + interface/web/dns/lib/lang/hr.lng | 17 +- interface/web/dns/lib/lang/hr_dns_txt.lng | 22 +- interface/web/dns/lib/lang/hr_dns_wizard.lng | 46 +- interface/web/dns/lib/lang/hu.lng | 3 + interface/web/dns/lib/lang/id.lng | 3 + interface/web/dns/lib/lang/it.lng | 3 + interface/web/dns/lib/lang/it_dns_soa.lng | 2 +- interface/web/dns/lib/lang/ja.lng | 3 + interface/web/dns/lib/lang/nl.lng | 3 + interface/web/dns/lib/lang/pl.lng | 3 + interface/web/dns/lib/lang/pt.lng | 3 + interface/web/dns/lib/lang/ro.lng | 3 + interface/web/dns/lib/lang/ru.lng | 3 + interface/web/dns/lib/lang/se.lng | 3 + interface/web/dns/lib/lang/sk.lng | 3 + interface/web/dns/lib/lang/tr.lng | 3 + interface/web/dns/templates/dns_import.htm | 12 +- interface/web/domain/lib/lang/it.lng | 14 +- interface/web/domain/lib/lang/it_domain.lng | 8 +- .../web/domain/lib/lang/it_domain_list.lng | 6 +- interface/web/help/lib/module.conf.php | 31 +- interface/web/help/version.php | 6 +- interface/web/js/scrigo.js.php | 2 +- interface/web/login/lib/lang/hr.lng | 28 +- interface/web/login/lib/lang/it.lng | 16 +- interface/web/mail/lib/lang/it.lng | 70 +- interface/web/mail/lib/lang/it_mail_alias.lng | 16 +- .../web/mail/lib/lang/it_mail_domain.lng | 18 +- .../lib/lang/it_mail_domain_admin_list.lng | 10 +- .../lib/lang/it_mail_user_filter_list.lng | 10 +- .../web/mail/lib/lang/it_mail_user_list.lng | 8 +- .../mail/lib/lang/it_mail_user_stats_list.lng | 10 +- .../lib/lang/it_spamfilter_config_list.lng | 2 +- .../mail/lib/lang/it_spamfilter_whitelist.lng | 8 +- interface/web/mail/mail_domain_edit.php | 8 +- interface/web/monitor/lib/lang/ar.lng | 3 + interface/web/monitor/lib/lang/bg.lng | 3 + interface/web/monitor/lib/lang/br.lng | 3 + interface/web/monitor/lib/lang/cz.lng | 3 + interface/web/monitor/lib/lang/de.lng | 3 + interface/web/monitor/lib/lang/el.lng | 3 + interface/web/monitor/lib/lang/en.lng | 3 + interface/web/monitor/lib/lang/es.lng | 3 + interface/web/monitor/lib/lang/fi.lng | 3 + interface/web/monitor/lib/lang/fr.lng | 3 + interface/web/monitor/lib/lang/hr.lng | 207 +- .../web/monitor/lib/lang/hr_datalog_list.lng | 2 +- interface/web/monitor/lib/lang/hu.lng | 3 + interface/web/monitor/lib/lang/id.lng | 3 + interface/web/monitor/lib/lang/it.lng | 77 +- .../web/monitor/lib/lang/it_datalog_list.lng | 2 +- .../web/monitor/lib/lang/it_syslog_list.lng | 2 +- interface/web/monitor/lib/lang/ja.lng | 3 + interface/web/monitor/lib/lang/nl.lng | 3 + interface/web/monitor/lib/lang/pl.lng | 3 + interface/web/monitor/lib/lang/pt.lng | 3 + interface/web/monitor/lib/lang/ro.lng | 3 + interface/web/monitor/lib/lang/ru.lng | 3 + interface/web/monitor/lib/lang/se.lng | 3 + interface/web/monitor/lib/lang/sk.lng | 3 + interface/web/monitor/lib/lang/tr.lng | 3 + interface/web/sites/ajax_get_ip.php | 2 +- interface/web/sites/database_edit.php | 8 +- .../web/sites/form/webdav_user.tform.php | 7 +- .../web/sites/lib/lang/ar_shell_user.lng | 1 + .../web/sites/lib/lang/bg_shell_user.lng | 1 + .../web/sites/lib/lang/br_shell_user.lng | 1 + .../web/sites/lib/lang/cz_shell_user.lng | 1 + .../web/sites/lib/lang/de_shell_user.lng | 1 + .../web/sites/lib/lang/el_shell_user.lng | 1 + .../web/sites/lib/lang/en_shell_user.lng | 1 + .../web/sites/lib/lang/es_shell_user.lng | 1 + .../web/sites/lib/lang/fi_shell_user.lng | 1 + .../web/sites/lib/lang/fr_shell_user.lng | 1 + interface/web/sites/lib/lang/hr.lng | 36 +- .../sites/lib/lang/hr_database_admin_list.lng | 14 +- .../web/sites/lib/lang/hr_shell_user.lng | 1 + .../web/sites/lib/lang/hu_shell_user.lng | 1 + .../web/sites/lib/lang/id_shell_user.lng | 1 + interface/web/sites/lib/lang/it.lng | 22 +- interface/web/sites/lib/lang/it_database.lng | 4 +- .../web/sites/lib/lang/it_shell_user.lng | 1 + .../lib/lang/it_user_quota_stats_list.lng | 10 +- .../web/sites/lib/lang/it_web_domain.lng | 4 +- .../web/sites/lib/lang/ja_shell_user.lng | 1 + .../web/sites/lib/lang/nl_shell_user.lng | 1 + .../web/sites/lib/lang/pl_shell_user.lng | 1 + .../web/sites/lib/lang/pt_shell_user.lng | 1 + .../web/sites/lib/lang/ro_shell_user.lng | 1 + .../web/sites/lib/lang/ru_shell_user.lng | 1 + .../web/sites/lib/lang/se_shell_user.lng | 1 + .../web/sites/lib/lang/sk_shell_user.lng | 1 + .../web/sites/lib/lang/tr_shell_user.lng | 1 + interface/web/sites/shell_user_edit.php | 2 + .../web/sites/templates/shell_user_edit.htm | 4 +- .../sites/templates/web_aliasdomain_edit.htm | 20 +- .../sites/templates/web_domain_redirect.htm | 2 +- .../sites/templates/web_subdomain_edit.htm | 21 +- interface/web/sites/web_domain_del.php | 31 +- interface/web/sites/web_domain_edit.php | 12 +- interface/web/temp/en.lng | 2131 ----------------- .../web/tools/lib/lang/it_usersettings.lng | 4 +- .../web/vm/lib/lang/de_openvz_template.lng | 2 +- interface/web/vm/lib/lang/de_openvz_vm.lng | 2 +- .../web/vm/lib/lang/en_openvz_template.lng | 2 +- interface/web/vm/lib/lang/en_openvz_vm.lng | 2 +- interface/web/vm/openvz_vm_edit.php | 8 +- interface/web/vm/templates/openvz_ip_edit.htm | 8 +- .../examples/sites_web_domain_add.php | 9 +- server/conf/awstats_index.php.master | 20 +- server/conf/bind_pri.domain.master | 2 +- server/conf/error/hr/400.html | 61 + server/conf/error/hr/401.html | 61 + server/conf/error/hr/403.html | 61 + server/conf/error/hr/404.html | 61 + server/conf/error/hr/405.html | 61 + server/conf/error/hr/500.html | 61 + server/conf/error/hr/502.html | 61 + server/conf/error/hr/503.html | 61 + server/conf/index/standard_index.html_hr | 60 + server/conf/index/user_standard_index.html_hr | 60 + server/conf/mail/welcome_email_hr.txt | 4 + server/conf/nginx_apps.vhost.master | 36 +- server/conf/nginx_vhost.conf.master | 10 +- server/conf/vhost.conf.master | 44 +- server/cron_daily.php | 2 +- server/lib/classes/monitor_tools.inc.php | 3 + .../mods-available/rescue_core_module.inc.php | 32 +- .../plugins-available/apache2_plugin.inc.php | 122 +- .../apps_vhost_plugin.inc.php | 2 + server/plugins-available/nginx_plugin.inc.php | 254 +- .../shelluser_base_plugin.inc.php | 64 +- .../shelluser_jailkit_plugin.inc.php | 68 +- 227 files changed, 2453 insertions(+), 3084 deletions(-) create mode 100644 install/sql/incremental/upd_0026.sql delete mode 100644 interface/web/temp/en.lng create mode 100644 server/conf/error/hr/400.html create mode 100644 server/conf/error/hr/401.html create mode 100644 server/conf/error/hr/403.html create mode 100644 server/conf/error/hr/404.html create mode 100644 server/conf/error/hr/405.html create mode 100644 server/conf/error/hr/500.html create mode 100644 server/conf/error/hr/502.html create mode 100644 server/conf/error/hr/503.html create mode 100644 server/conf/index/standard_index.html_hr create mode 100644 server/conf/index/user_standard_index.html_hr create mode 100644 server/conf/mail/welcome_email_hr.txt diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 6cb47183d..4efb6fc3b 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -865,11 +865,11 @@ class installer_dist extends installer_base { if($conf['nginx']['installed'] == true){ $command = 'usermod -a -G ispconfig '.$conf['nginx']['user']; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - if(is_user('ispapps')){ + //if(is_user('ispapps')){ // Allow the ispapps vhost access to /etc/squirrelmail - $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps'; - caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); - } + //$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps'; + //caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + //} if(is_group('ispapps')){ $command = 'usermod -a -G ispapps '.$conf['nginx']['user']; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 5aa5de18f..ffe5ef2c2 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -653,6 +653,7 @@ class installer extends installer_base if(substr($socket_dir,-1) != '/') $socket_dir .= '/'; if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir); $fpm_socket = $socket_dir.'apps.sock'; + $cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']); $content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content); $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content); @@ -660,6 +661,7 @@ class installer extends installer_base $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content); //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content); + $content = str_replace('{cgi_socket}', $cgi_socket, $content); wf($vhost_conf_dir.'/apps.vhost', $content); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 232efe761..b0cbfd650 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1500,6 +1500,7 @@ class installer_base { if(substr($socket_dir,-1) != '/') $socket_dir .= '/'; if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir); $fpm_socket = $socket_dir.'apps.sock'; + $cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']); $content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content); $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content); @@ -1507,6 +1508,7 @@ class installer_base { $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content); //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content); $content = str_replace('{fpm_socket}', $fpm_socket, $content); + $content = str_replace('{cgi_socket}', $cgi_socket, $content); wf($vhost_conf_dir.'/apps.vhost', $content); diff --git a/install/sql/incremental/upd_0026.sql b/install/sql/incremental/upd_0026.sql new file mode 100644 index 000000000..b5787a925 --- /dev/null +++ b/install/sql/incremental/upd_0026.sql @@ -0,0 +1 @@ +ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; \ No newline at end of file diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 96d04f6db..ff5b2ef9c 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1026,7 +1026,7 @@ CREATE TABLE `shell_user` ( `shell` varchar(255) NOT NULL default '/bin/bash', `dir` varchar(255) default NULL, `chroot` varchar(255) NOT NULL, - `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', + `ssh_rsa` text NOT NULL, PRIMARY KEY (`shell_user_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index d2517f2dc..99d4402c4 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -122,7 +122,7 @@ $conf['init_scripts'] = '/etc/init.d'; //** Interface -$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools'; +$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools,help'; //** Demo mode /* The demo mode is an option to restrict certain actions in the interface like diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master index c7e58a3a2..9de75dde6 100644 --- a/install/tpl/nginx_apps.vhost.master +++ b/install/tpl/nginx_apps.vhost.master @@ -38,9 +38,15 @@ server { try_files $uri =404; root /usr/share/; include /etc/nginx/fastcgi_params; - fastcgi_pass unix:{fpm_socket}; + # To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param PATH_INFO $fastcgi_script_name; + fastcgi_buffer_size 128k; + fastcgi_buffers 256 4k; + fastcgi_busy_buffers_size 256k; + fastcgi_temp_file_write_size 256k; } location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { root /usr/share/; @@ -57,9 +63,15 @@ server { try_files $uri =404; root /usr/share/; include /etc/nginx/fastcgi_params; - fastcgi_pass unix:{fpm_socket}; + # To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used + fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param PATH_INFO $fastcgi_script_name; + fastcgi_buffer_size 128k; + fastcgi_buffers 256 4k; + fastcgi_busy_buffers_size 256k; + fastcgi_temp_file_write_size 256k; } location ~* ^/squirrelmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { root /usr/share/; @@ -68,4 +80,24 @@ server { location /webmail { rewrite ^/* /squirrelmail last; } + + location /cgi-bin/mailman { + root /usr/lib/; + fastcgi_split_path_info (^/cgi-bin/mailman/[^/]*)(.*)$; + include /etc/nginx/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; + fastcgi_intercept_errors on; + fastcgi_pass unix:{cgi_socket}; + } + + location /images/mailman { + alias /usr/share/images/mailman; + } + + location /pipermail { + alias /var/lib/mailman/archives/public; + autoindex on; + } } \ No newline at end of file diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index d7a27e01a..8817e0003 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -103,7 +103,7 @@ wget=/usr/bin/wget [rescue] try_rescue=n -do_not_try_rescue_apache=n +do_not_try_rescue_httpd=n do_not_try_rescue_mysql=n do_not_try_rescue_mail=n diff --git a/interface/lib/classes/custom_datasource.inc.php b/interface/lib/classes/custom_datasource.inc.php index 52ba34ca5..43538d6b0 100644 --- a/interface/lib/classes/custom_datasource.inc.php +++ b/interface/lib/classes/custom_datasource.inc.php @@ -63,6 +63,31 @@ class custom_datasource { return $records_new; } + function webdav_domains($field, $record) { + global $app, $conf; + + $servers = $app->db->queryAllRecords("SELECT * FROM server WHERE active = 1 AND mirror_server_id = 0"); + $server_ids = array(); + $app->uses('getconf'); + if(is_array($servers) && !empty($servers)){ + foreach($servers as $server){ + $web_config = $app->getconf->get_server_config($server['server_id'], 'web'); + if($web_config['server_type'] != 'nginx') $server_ids[] = $server['server_id']; + } + } + $server_ids = implode(',', $server_ids); + $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND server_id IN (".$server_ids.") AND ".$app->tform->getAuthSQL('r')." ORDER BY domain"); + + $records_new = array(); + if(is_array($records)) { + foreach($records as $rec) { + $key = $rec['domain_id']; + $records_new[$key] = $rec['domain']; + } + } + return $records_new; + } + function client_servers($field, $record) { global $app, $conf; diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index f55df7b6a..a5843d660 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -282,7 +282,7 @@ class listform { public function decode($record) { global $conf, $app; - if(is_array($record)) { + if(is_array($record) && count($record) > 0) { foreach($this->listDef['item'] as $field){ $key = $field['field']; if(isset($record[$key])) { diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index 70d665208..a35aca925 100644 --- a/interface/lib/classes/listform_actions.inc.php +++ b/interface/lib/classes/listform_actions.inc.php @@ -86,15 +86,17 @@ class listform_actions { $rec['bgcolor'] = $this->DataRowColor; //* substitute value for select fields - foreach($app->listform->listDef['item'] as $field) { - $key = $field['field']; - if(isset($field['formtype']) && $field['formtype'] == 'SELECT') { - if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') { - // Set a additional image variable for bolean fields - $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png'; + if(is_array($app->listform->listDef['item']) && count($app->listform->listDef['item']) > 0) { + foreach($app->listform->listDef['item'] as $field) { + $key = $field['field']; + if(isset($field['formtype']) && $field['formtype'] == 'SELECT') { + if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') { + // Set a additional image variable for bolean fields + $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png'; + } + //* substitute value for select field + $rec[$key] = @$field['value'][$rec[$key]]; } - //* substitute value for select field - $rec[$key] = @$field['value'][$rec[$key]]; } } diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 0dfed21ed..c3e0697c2 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -1353,6 +1353,12 @@ class remoting { if($params['system_user'] == '') $params['system_user'] = '-'; if($params['system_group'] == '') $params['system_group'] = '-'; + //* Set a few defaults for nginx servers + if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; + if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1; + if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1; + if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1; + $domain_id = $this->insertQuery('../sites/form/web_domain.tform.php',$client_id,$params, 'sites:web_domain:on_after_insert'); if ($readonly === true) $app->db->query("UPDATE web_domain SET `sys_userid` = '1' WHERE domain_id = ".$domain_id); @@ -2521,8 +2527,8 @@ class remoting { return false; } $client_id = intval($client_id); - $sql = "SELECT database_id, database_name, database_user, database_password FROM web_database WHERE sys_userid = $client_id "; - $all = $app->db->queryAllRecords($sql); + $sql = "SELECT d.database_id, d.database_name, d.database_user, d.database_password FROM web_database d INNER JOIN sys_user s on(d.sys_groupid = s.default_group) WHERE client_id = $client_id"; + $all = $app->db->queryAllRecords($sql); return $all; } diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng index 820a6899d..937d88a3e 100644 --- a/interface/lib/lang/hr.lng +++ b/interface/lib/lang/hr.lng @@ -33,6 +33,12 @@ $wb['top_menu_domain'] = 'Domene'; $wb['top_menu_dashboard'] = 'Početna'; $wb['toolsarea_head_txt'] = 'Postavke'; $wb['latest_news_txt'] = 'Vijesti'; +$wb['error_301'] = 'Ne možete koristiti ovaj modul.'; +$wb['error_302'] = 'Greška u modulu.'; +$wb['error_1001'] = 'Korisničko ime i šifra ne mogu biti prazni!'; +$wb['error_1002'] = 'Korisničko ime i/ili šifra nisu ispravni!'; +$wb['error_1003'] = 'Korisničko ime je deaktivirano!'; +$wb['top_menu_vm'] = 'VServer'; $wb['daynamesmin_su'] = 'Su'; $wb['daynamesmin_mo'] = 'Mo'; $wb['daynamesmin_tu'] = 'Tu'; @@ -61,10 +67,4 @@ $wb['monthnamesshort_nov'] = 'Nov'; $wb['monthnamesshort_dec'] = 'Dec'; $wb['datepicker_nextText'] = 'Next'; $wb['datepicker_prevText'] = 'Prev'; -$wb['error_301'] = 'Module not permitted for the current user.'; -$wb['error_302'] = 'Module invalid.'; -$wb['error_1001'] = 'The username and password cannot be empty !'; -$wb['error_1002'] = 'The username and/or password are not correct !'; -$wb['error_1003'] = 'The username is deactivated!'; -$wb['top_menu_vm'] = 'VServer'; ?> diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng index db062caaf..772267ac0 100644 --- a/interface/lib/lang/it.lng +++ b/interface/lib/lang/it.lng @@ -1,20 +1,15 @@ '0', 'value' => array(0 => 0,1 => 1) ), - 'proxy_server' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'CHECKBOX', - 'default' => '0', - 'value' => array(0 => 0,1 => 1) - ), - 'firewall_server' => array ( - 'datatype' => 'INTEGER', - 'formtype' => 'CHECKBOX', - 'default' => '0', - 'value' => array(0 => 0,1 => 1) - ), 'mirror_server_id' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 1c4683171..f9ec365db 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -1053,7 +1053,7 @@ $form["tabs"]['rescue'] = array( 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), - 'do_not_try_rescue_apache' => array( + 'do_not_try_rescue_httpd' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', 'default' => 'n', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 2588921d7..44f4f74f4 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 629d48d5b..1d570d4c9 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index ca63e458c..64f7056ef 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index a805edbc5..2518aba18 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 55552b05b..71bc79fb1 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -143,10 +143,10 @@ $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM Socket-Verzeichnis'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM Socket-Verzeichnis ist leer.'; $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax'; $wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.'; -$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; -$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; -$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; -$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit'; +$wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring'; +$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring'; +$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere Email Monitoring'; +$wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die "Deaktiviere MySQL Monitoring" Checkbox und warten Sie 2-3 Minuten.
Falls Sie nicht 2-3 Minuten warten, wird Rescue versuchen, MySQL neu zu starten!'; $wb['enable_sni_txt'] = 'Enable SNI'; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 88399a345..8a9096c32 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 956abdd81..b3e9f60a0 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -144,10 +144,10 @@ $wb["php_fpm_start_port_error_empty"] = 'PHP-FPM start port is empty.'; $wb["php_fpm_socket_dir_txt"] = 'PHP-FPM socket directory'; $wb["php_fpm_socket_dir_error_empty"] = 'PHP-FPM socket directory is empty.'; $wb["try_rescue_txt"] = 'Enable service monitoring and restart on failure'; -$wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring'; +$wb["do_not_try_rescue_httpd_txt"] = 'Disable HTTPD monitoring'; $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring'; $wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring'; -$wb["rescue_description_txt"] = 'Information: If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb["rescue_description_txt"] = 'Information: If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.
If you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb["enable_sni_txt"] = 'Enable SNI'; $wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List'; $wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index aca475c02..38e83cf43 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 74abf1b24..d04966ba2 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 926a632bc..f6437c1dd 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/hr.lng b/interface/web/admin/lib/lang/hr.lng index ca775c5b0..0f6e4717f 100644 --- a/interface/web/admin/lib/lang/hr.lng +++ b/interface/web/admin/lib/lang/hr.lng @@ -1,43 +1,43 @@ diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index ce5c505de..3110f4f48 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 0f701237f..6a1c67e35 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 30482632f..cab99a14f 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/it.lng b/interface/web/admin/lib/lang/it.lng index b9000c05c..884dd8afa 100644 --- a/interface/web/admin/lib/lang/it.lng +++ b/interface/web/admin/lib/lang/it.lng @@ -1,4 +1,6 @@ diff --git a/interface/web/admin/lib/lang/it_firewall.lng b/interface/web/admin/lib/lang/it_firewall.lng index c58341df8..6a7ae5e3c 100644 --- a/interface/web/admin/lib/lang/it_firewall.lng +++ b/interface/web/admin/lib/lang/it_firewall.lng @@ -5,7 +5,7 @@ $wb['udp_port_txt'] = 'Apri porte UDP'; $wb['tcp_port_help_txt'] = 'Separate dalla virgola'; $wb['udp_port_help_txt'] = 'Separate dalle virgola'; $wb['active_txt'] = 'Attivo'; -$wb['firewall_error_unique'] = 'Cè già un record firewall per questo server.'; +$wb['firewall_error_unique'] = 'Cé già un record firewall per questo server.'; $wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.'; $wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.'; ?> diff --git a/interface/web/admin/lib/lang/it_firewall_list.lng b/interface/web/admin/lib/lang/it_firewall_list.lng index 24a34be1c..b812994c6 100644 --- a/interface/web/admin/lib/lang/it_firewall_list.lng +++ b/interface/web/admin/lib/lang/it_firewall_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/it_groups_list.lng b/interface/web/admin/lib/lang/it_groups_list.lng index f1d8e2c1a..c4650da01 100644 --- a/interface/web/admin/lib/lang/it_groups_list.lng +++ b/interface/web/admin/lib/lang/it_groups_list.lng @@ -1,7 +1,7 @@ WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['list_head_txt'] = 'Gruppi utenti sistema'; +$wb['description_txt'] = 'Descrizione'; +$wb['name_txt'] = 'Gruppo'; +$wb['add_new_record_txt'] = 'Aggiungi nuovo gruppo'; +$wb['warning_txt'] = 'ATTENZIONE: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; ?> diff --git a/interface/web/admin/lib/lang/it_language_complete.lng b/interface/web/admin/lib/lang/it_language_complete.lng index b5200ff9d..84e629e10 100644 --- a/interface/web/admin/lib/lang/it_language_complete.lng +++ b/interface/web/admin/lib/lang/it_language_complete.lng @@ -2,6 +2,6 @@ $wb['list_head_txt'] = 'Merge the selected language file with the english master language file.
This adds missing strings from the english master language files to the selected language.'; $wb['language_select_txt'] = 'Select language'; $wb['btn_save_txt'] = 'Merge files now'; -$wb['btn_cancel_txt'] = 'Back'; +$wb['btn_cancel_txt'] = 'Annulla'; $wb['list_desc_txt'] = 'Merge the selected language file with the english master language file.
This adds missing strings from the english master language files to the selected language.'; ?> diff --git a/interface/web/admin/lib/lang/it_language_edit.lng b/interface/web/admin/lib/lang/it_language_edit.lng index 4c50e883e..242642432 100644 --- a/interface/web/admin/lib/lang/it_language_edit.lng +++ b/interface/web/admin/lib/lang/it_language_edit.lng @@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Language file editor'; $wb['language_select_txt'] = 'Select language'; $wb['module_txt'] = 'Module'; $wb['lang_file_txt'] = 'Language file'; -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Back'; +$wb['btn_save_txt'] = 'Salva'; +$wb['btn_cancel_txt'] = 'Annulla'; ?> diff --git a/interface/web/admin/lib/lang/it_language_export.lng b/interface/web/admin/lib/lang/it_language_export.lng index f45d47b17..bce6b70bf 100644 --- a/interface/web/admin/lib/lang/it_language_export.lng +++ b/interface/web/admin/lib/lang/it_language_export.lng @@ -2,5 +2,5 @@ $wb['list_head_txt'] = 'Export language files'; $wb['language_select_txt'] = 'Select language'; $wb['btn_save_txt'] = 'Export the selected language file set'; -$wb['btn_cancel_txt'] = 'Back'; +$wb['btn_cancel_txt'] = 'Annulla'; ?> diff --git a/interface/web/admin/lib/lang/it_language_import.lng b/interface/web/admin/lib/lang/it_language_import.lng index 4c31ec3de..976255723 100644 --- a/interface/web/admin/lib/lang/it_language_import.lng +++ b/interface/web/admin/lib/lang/it_language_import.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/it_package_install.lng b/interface/web/admin/lib/lang/it_package_install.lng index 574dd1162..6218f7959 100644 --- a/interface/web/admin/lib/lang/it_package_install.lng +++ b/interface/web/admin/lib/lang/it_package_install.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/it_remote_user_list.lng b/interface/web/admin/lib/lang/it_remote_user_list.lng index 152a75fba..4d7c70c3c 100644 --- a/interface/web/admin/lib/lang/it_remote_user_list.lng +++ b/interface/web/admin/lib/lang/it_remote_user_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/admin/lib/lang/it_server.lng b/interface/web/admin/lib/lang/it_server.lng index abf8de295..18966e4a4 100644 --- a/interface/web/admin/lib/lang/it_server.lng +++ b/interface/web/admin/lib/lang/it_server.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 6904e797d..b9ba257a8 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -4,7 +4,6 @@ $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections'; $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['website_path_txt'] = 'Website path'; $wb['website_symlinks_txt'] = 'Website symlinks'; -$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['vhost_conf_dir_txt'] = 'Vhost config dir'; $wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir'; $wb['getmail_config_dir_txt'] = 'Getmail config dir'; @@ -70,11 +69,11 @@ $wb['awstats_conf_dir_txt'] = 'awstats conf folder'; $wb['awstats_data_dir_txt'] = 'awstats data folder'; $wb['awstats_pl_txt'] = 'awstats.pl script'; $wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script'; -$wb['backup_dir_txt'] = 'Backup directory'; +$wb['backup_dir_txt'] = 'Directory di backup'; $wb['named_conf_local_path_txt'] = 'BIND named.conf.local path'; -$wb['php_ini_path_cgi_txt'] = 'CGI php.ini path'; -$wb['php_ini_path_apache_txt'] = 'Apache php.ini path'; -$wb['check_apache_config_txt'] = 'Test apache configuration on restart'; +$wb['php_ini_path_cgi_txt'] = 'Percorso php.ini CGI'; +$wb['php_ini_path_apache_txt'] = 'Percorso php.ini apache'; +$wb['check_apache_config_txt'] = 'Testa al riavvio la configurazione di apache'; $wb['ufw_enable_txt'] = 'Enable'; $wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules'; $wb['ufw_ipv6_txt'] = 'Enable IPv6'; @@ -83,6 +82,7 @@ $wb['ufw_default_output_policy_txt'] = 'Default Output Policy'; $wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy'; $wb['ufw_default_application_policy_txt'] = 'Default Application Policy'; $wb['ufw_log_level_txt'] = 'Log Level'; +$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; $wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.'; $wb['CA_path_txt'] = 'CA Path'; $wb['CA_pass_txt'] = 'CA passphrase'; @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; -$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; +$wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
If you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; ?> diff --git a/interface/web/admin/lib/lang/it_server_ip.lng b/interface/web/admin/lib/lang/it_server_ip.lng index 88d8a2f60..86758810b 100644 --- a/interface/web/admin/lib/lang/it_server_ip.lng +++ b/interface/web/admin/lib/lang/it_server_ip.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng index d45ee9ac4..0a1819661 100644 --- a/interface/web/admin/lib/lang/it_software_update_list.lng +++ b/interface/web/admin/lib/lang/it_software_update_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index dd5b9f3dc..b263405cb 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 8e70364aa..ed49fa9b8 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -1,28 +1,28 @@ diff --git a/interface/web/admin/lib/lang/it_users_list.lng b/interface/web/admin/lib/lang/it_users_list.lng index 35598d33f..fdee4eb06 100644 --- a/interface/web/admin/lib/lang/it_users_list.lng +++ b/interface/web/admin/lib/lang/it_users_list.lng @@ -5,5 +5,5 @@ $wb['name_txt'] = 'Nome'; $wb['vorname_txt'] = 'Cognome'; $wb['ort_txt'] = 'Città'; $wb['add_new_record_txt'] = 'Add new user'; -$wb['warning_txt'] = 'WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; +$wb['warning_txt'] = 'ATTENZIONE: non editare o modificare alcuna impostazione utente in questa schermata. Usare piuttosto le impostazioni Cliente/Rivenditore del modulo Clienti. Modificare Utenti o gruppi in questa schermata può provocare la perdita di dati.'; ?> diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 98cb5d1ff..778009ec6 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 51ea4235e..ac60ba57d 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 6a84e037c..28d888bfb 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 850a99eb4..642d0c921 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 440df7c03..dd7a521ac 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 125de9929..87e40efbd 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 629d48d5b..1d570d4c9 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index ebb685927..69308b986 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index f4d29a721..fd0f14717 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -144,9 +144,9 @@ $wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.'; $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory'; $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.'; $wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure'; -$wb['do_not_try_rescue_apache_txt'] = 'Disable apache monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring'; $wb['rescue_description_txt'] = 'Information: If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.
if you do not wait 2-3 minutes, rescue will try to restart mysql!'; $wb['enable_sni_txt'] = 'Enable SNI'; +$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm index d03b389e2..12dd23756 100644 --- a/interface/web/admin/templates/language_export.htm +++ b/interface/web/admin/templates/language_export.htm @@ -7,7 +7,7 @@
Language Export
- {tmpl_var name='language_option'}
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm index 3aa9bf622..99cbf7961 100644 --- a/interface/web/admin/templates/server_config_rescue_edit.htm +++ b/interface/web/admin/templates/server_config_rescue_edit.htm @@ -12,9 +12,9 @@
-

{tmpl_var name='do_not_try_rescue_apache_txt'}

+

{tmpl_var name='do_not_try_rescue_httpd_txt'}

- {tmpl_var name='do_not_try_rescue_apache'} + {tmpl_var name='do_not_try_rescue_httpd'}
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm index 17ff55d5e..8eca2909c 100644 --- a/interface/web/admin/templates/server_edit_services.htm +++ b/interface/web/admin/templates/server_edit_services.htm @@ -45,18 +45,6 @@ {tmpl_var name='vserver_server'}
-
-

{tmpl_var name='proxy_server_txt'}

-
- {tmpl_var name='proxy_server'} -
-
-
-

{tmpl_var name='firewall_server_txt'}

-
- {tmpl_var name='firewall_server'} -
-
{tmpl_var name='search_file_server'} - -
@@ -42,8 +38,6 @@ {tmpl_var name="file_server"} {tmpl_var name="db_server"} {tmpl_var name="vserver_server"} - {tmpl_var name="proxy_server"} - {tmpl_var name="firewall_server"}
{tmpl_var name='delete_txt'} @@ -54,7 +48,7 @@ - + diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php index 29abe6f41..fd560e7a1 100644 --- a/interface/web/client/client_del.php +++ b/interface/web/client/client_del.php @@ -131,7 +131,7 @@ class page_action extends tform_actions { $app->db->query("DELETE FROM sys_user WHERE client_id = $client_id"); // Delete all records (sub-clients, mail, web, etc....) of this client. - $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic,web_folder,web_folder_user'; + $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic,web_folder,web_folder_user,domain'; $tables_array = explode(',',$tables); $client_group_id = intval($client_group['groupid']); if($client_group_id > 1) { diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index 36d3da237..cc7a28c8f 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -41,8 +41,8 @@ $wb["limit_domain_txt"] = 'limit_domain'; $wb["limit_subdomain_txt"] = 'limit_subdomain'; $wb["limit_webquota_txt"] = 'limit_webquota'; $wb["limit_database_txt"] = 'limit_database'; -$wb["limit_cron_txt"] = 'Allowed cron job types'; -$wb["limit_cron_type_txt"] = 'Max. type of cron jobs (chrooted and full implies url)'; +$wb["limit_cron_txt"] = 'Max. number of cron jobs'; +$wb["limit_cron_type_txt"] = 'Max. Allowed Cronjob types (chrooted and full implies url)'; $wb["limit_cron_frequency_txt"] = 'Min. delay between executions'; $wb["ip_address_txt"] = 'ip_address'; $wb["limit_client_error_notint"] = 'Client Limit is not a number.'; diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng index 17552563e..4d6a7a319 100644 --- a/interface/web/client/lib/lang/it.lng +++ b/interface/web/client/lib/lang/it.lng @@ -6,8 +6,8 @@ $wb['Add Client'] = 'Aggiungi cliente'; $wb['Edit Client'] = 'Modifica cliente'; $wb['Clients'] = 'Clienti'; $wb['Edit Client-Templates'] = 'Modifica modelli cliente'; -$wb['Add Reseller'] = 'Add Reseller'; -$wb['Edit Reseller'] = 'Edit Reseller'; -$wb['Resellers'] = 'Resellers'; -$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.'; +$wb['Add Reseller'] = 'Aggiungi rivenditore'; +$wb['Edit Reseller'] = 'Modifica rivenditore'; +$wb['Resellers'] = 'Rivenditori'; +$wb['error_has_clients'] = 'Questo rivenditore ha dei clienti, bisogna cancellarli prima di procedere.'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index f8eca4098..6120bef76 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -12,14 +12,14 @@ $wb['limit_spamfilter_wblist_txt'] = 'Numero massimo di spamfilter white / black $wb['limit_spamfilter_user_txt'] = 'Numero massimo di spamfilter users'; $wb['limit_spamfilter_policy_txt'] = 'Numero massimo di spamfilter policys'; $wb['default_mailserver_txt'] = 'Mailserver predefinito'; -$wb['company_name_txt'] = 'Nome compagnia'; +$wb['company_name_txt'] = 'Nome Azienda'; $wb['contact_name_txt'] = 'Nome contatto'; $wb['username_txt'] = 'Nome utente'; $wb['password_txt'] = 'Password'; $wb['language_txt'] = 'Lingua'; $wb['usertheme_txt'] = 'Tema'; $wb['street_txt'] = 'Via'; -$wb['zip_txt'] = 'C.a.p.'; +$wb['zip_txt'] = 'CAP'; $wb['city_txt'] = 'Città'; $wb['state_txt'] = 'Provincia'; $wb['country_txt'] = 'Stato'; @@ -30,7 +30,7 @@ $wb['email_txt'] = 'Email'; $wb['internet_txt'] = 'Internet'; $wb['icq_txt'] = 'ICQ'; $wb['notes_txt'] = 'Note'; -$wb['company_txt'] = 'Compagnia'; +$wb['company_txt'] = 'Azienda'; $wb['title_txt'] = 'Titolo'; $wb['firstname_txt'] = 'Nome'; $wb['surname_txt'] = 'Cognome'; @@ -42,21 +42,21 @@ $wb['limit_database_txt'] = 'Numero massimo database'; $wb['ip_address_txt'] = 'Indirizzi ip'; $wb['limit_client_error_notint'] = 'The sub client limit must be a number.'; $wb['firstname_error_empty'] = 'Nome è vuoto.'; -$wb['contact_error_empty'] = 'Nome compagnia è vuoto.'; +$wb['contact_error_empty'] = 'Nome azienda è vuoto.'; $wb['default_webserver_txt'] = 'Webserver predefinito'; $wb['limit_web_domain_txt'] = 'Numero massimo di domini'; -$wb['limit_web_aliasdomain_txt'] = 'Numero massimo di dominialias'; +$wb['limit_web_aliasdomain_txt'] = 'Numero massimo di alia domini'; $wb['limit_web_subdomain_txt'] = 'Numero massimo di sottodomini'; $wb['limit_ftp_user_txt'] = 'Numero massimo di utenti FTP'; $wb['default_dnsserver_txt'] = 'DNS Server predefinito'; $wb['limit_dns_zone_txt'] = 'Numero massimo di zone DNS'; -$wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones'; +$wb['limit_dns_slave_zone_txt'] = 'Numero massimo di zone DNS secondarie'; $wb['limit_dns_record_txt'] = 'Numero massimo di record DNS'; $wb['limit_shell_user_txt'] = 'Numero massimo di utenti Shell'; $wb['username_error_empty'] = 'Nome utente è vuoto.'; $wb['username_error_unique'] = 'Il nome utente deve essere unico.'; -$wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.'; -$wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.'; +$wb['limit_maildomain_error_notint'] = 'Il limite dei domini email devessere un numero.'; +$wb['limit_mailbox_error_notint'] = 'Il limite delle caselle di posta devessere un numero.'; $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.'; $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.'; $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.'; @@ -96,7 +96,7 @@ $wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; $wb['limit_webdav_user_txt'] = 'Max. number of Webdav users'; $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; $wb['customer_no_txt'] = 'Customer No.'; -$wb['vat_id_txt'] = 'VAT ID'; +$wb['vat_id_txt'] = 'P. IVA'; $wb['required_fields_txt'] = '* Required fields'; $wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; diff --git a/interface/web/client/lib/lang/it_client_del.lng b/interface/web/client/lib/lang/it_client_del.lng index a826d64e1..df74987ab 100644 --- a/interface/web/client/lib/lang/it_client_del.lng +++ b/interface/web/client/lib/lang/it_client_del.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index 5a6d3d85b..082e23e2c 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -1,65 +1,67 @@ diff --git a/interface/web/client/lib/lang/it_clients_list.lng b/interface/web/client/lib/lang/it_clients_list.lng index caadee56b..9cf1a558e 100644 --- a/interface/web/client/lib/lang/it_clients_list.lng +++ b/interface/web/client/lib/lang/it_clients_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/client/lib/lang/it_resellers_list.lng b/interface/web/client/lib/lang/it_resellers_list.lng index 34d089669..368a01263 100644 --- a/interface/web/client/lib/lang/it_resellers_list.lng +++ b/interface/web/client/lib/lang/it_resellers_list.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng index 7de907f72..65e0d4497 100644 --- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng @@ -5,7 +5,7 @@ $wb['unlimited_txt'] = 'neograničeno'; $wb['limit_maildomain_txt'] = 'Mail domene'; $wb['limit_mailbox_txt'] = 'Mailboxi'; $wb['limit_mailalias_txt'] = 'Mail aliasi'; -$wb['limit_mailaliasdomain_txt'] = 'Domain aliasi'; +$wb['limit_mailaliasdomain_txt'] = 'Aliasi domene'; $wb['limit_mailforward_txt'] = 'Mail forwarderi'; $wb['limit_mailcatchall_txt'] = 'Mail catchall računi'; $wb['limit_mailrouting_txt'] = 'Mail route'; @@ -26,5 +26,5 @@ $wb['limit_shell_user_txt'] = 'Shell računi'; $wb['limit_webdav_user_txt'] = 'Webdav računi'; $wb['limit_client_txt'] = 'Klijenti'; $wb['limit_database_txt'] = 'Baze'; -$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; +$wb['limit_mailmailinglist_txt'] = 'Mail liste'; ?> diff --git a/interface/web/dashboard/lib/lang/it.lng b/interface/web/dashboard/lib/lang/it.lng index 246054599..db8858aaf 100644 --- a/interface/web/dashboard/lib/lang/it.lng +++ b/interface/web/dashboard/lib/lang/it.lng @@ -1,4 +1,4 @@ diff --git a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng index fea2bd678..a89a62b9f 100644 --- a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng @@ -1,30 +1,30 @@ diff --git a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng index 6a02127a0..d9e5cd8c2 100644 --- a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng @@ -1,3 +1,3 @@ diff --git a/interface/web/designer/lib/lang/it_form_edit.lng b/interface/web/designer/lib/lang/it_form_edit.lng index 54fe173ec..1fc63b884 100644 --- a/interface/web/designer/lib/lang/it_form_edit.lng +++ b/interface/web/designer/lib/lang/it_form_edit.lng @@ -15,7 +15,7 @@ $wb['db_table_idx_txt'] = 'DB Table Index'; $wb['db_history_txt'] = 'Undo Log'; $wb['tab_default_txt'] = 'Default Tab'; $wb['list_default_txt'] = 'Default Liste'; -$wb['auth_txt'] = 'Permissions'; +$wb['auth_txt'] = 'Permessi'; $wb['auth_preset_userid_txt'] = 'UserID'; $wb['auth_preset_groupid_txt'] = 'GroupID'; $wb['auth_preset_perm_user_txt'] = 'Perm. User'; diff --git a/interface/web/designer/lib/lang/it_form_list.lng b/interface/web/designer/lib/lang/it_form_list.lng index 47432257f..015cc53ff 100644 --- a/interface/web/designer/lib/lang/it_form_list.lng +++ b/interface/web/designer/lib/lang/it_form_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/designer/lib/lang/it_module_edit.lng b/interface/web/designer/lib/lang/it_module_edit.lng index 592ccd76b..a759d40b6 100644 --- a/interface/web/designer/lib/lang/it_module_edit.lng +++ b/interface/web/designer/lib/lang/it_module_edit.lng @@ -11,12 +11,12 @@ $wb['header_txt'] = 'Module properties'; $wb['description_txt'] = ' Description

-Modulename: Name of the module directory. Only numbers, chars and underscore allowed.
+Modulename: Nome del modulo directory. Sono ammessi solo numeri, caratteri e underscore.
Moduletitle: Will be shown in the (upper) main navigation.
Template file: Template file of the module. Currently available: module.tpl.htm and module_tree.tpl.htm. Default is module.tpl.htm.
NaviFrame: If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.
Default page: These page will be shown when the module is opened.
Tab width: Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).
-Hint: All paths are relative to the directory web. +Suggerimento: tutti i percorsi sono relativi alla directory web. '; ?> diff --git a/interface/web/designer/lib/lang/it_module_list.lng b/interface/web/designer/lib/lang/it_module_list.lng index bc9ebed58..8a256cb49 100644 --- a/interface/web/designer/lib/lang/it_module_list.lng +++ b/interface/web/designer/lib/lang/it_module_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/designer/lib/lang/it_module_nav_edit.lng b/interface/web/designer/lib/lang/it_module_nav_edit.lng index fa5f15aa9..26a426a12 100644 --- a/interface/web/designer/lib/lang/it_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/it_module_nav_edit.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/designer/lib/lang/it_module_nav_item_edit.lng b/interface/web/designer/lib/lang/it_module_nav_item_edit.lng index 23f7d1592..47aac393b 100644 --- a/interface/web/designer/lib/lang/it_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/it_module_nav_item_edit.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/designer/lib/lang/it_module_show.lng b/interface/web/designer/lib/lang/it_module_show.lng index e295047b0..2cf9b07a8 100644 --- a/interface/web/designer/lib/lang/it_module_show.lng +++ b/interface/web/designer/lib/lang/it_module_show.lng @@ -10,7 +10,7 @@ $wb['new_txt'] = 'New'; $wb['up_txt'] = 'Up'; $wb['down_txt'] = 'Down'; $wb['module_txt'] = 'Module'; -$wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Dateien und Unterverzeichnisse lschen?'; -$wb['menu_del_txt'] = 'Wollen Sie das Men mit allen Untereintrgen lschen?'; -$wb['item_del_txt'] = 'Wollen Sie den Meneintrag lschen?'; +$wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Dateien und Unterverzeichnisse löschen?'; +$wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; +$wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php index 861c9c833..8ad327559 100644 --- a/interface/web/dns/dns_import.php +++ b/interface/web/dns/dns_import.php @@ -34,6 +34,8 @@ require_once('../../lib/app.inc.php'); //* Check permissions for module $app->auth->check_module_permissions('dns'); +$msg = ''; +$error = ''; // Loading the template $app->uses('tpl,validate_dns'); @@ -120,8 +122,9 @@ if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSIO // Import the zone-file //if(1=="1") -if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'])) -{ +if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'])){ + $valid_zone_file = FALSE; + $sql = "SELECT server_name FROM `server` WHERE server_id=".intval($server_id)." OR mirror_server_id=".intval($server_id)." ORDER BY server_name ASC"; $servers = $app->db->queryAllRecords($sql); for ($i=0;$i ($soa_array_key + 5)){ + if(substr($parts[0],-1) == '.' || $parts[0] == '@' || ($parts[0] != 'a' && $parts[0] != 'aaaa' && $parts[0] != 'ns' && $parts[0] != 'cname' && $parts[0] != 'hinfo' && $parts[0] != 'mx' && $parts[0] != 'naptr' && $parts[0] != 'ptr' && $parts[0] != 'rp' && $parts[0] != 'srv' && $parts[0] != 'txt')){ + if(is_numeric($parts[1])){ + if($parts[2] == 'in'){ + $resource_type = $parts[3]; + $pkey = 3; + } else { + $resource_type = $parts[2]; + $pkey = 2; + } + } else { + if($parts[1] == 'in'){ + $resource_type = $parts[2]; + $pkey = 2; + } else { + $resource_type = $parts[1]; + $pkey = 1; + } + } + $dns_rr[$r]['type'] = $resource_type; + if($parts[0] == '@' || $parts[0] == '.'){ + $dns_rr[$r]['name'] = $soa['name']; + } else { + $dns_rr[$r]['name'] = $parts[0]; + } + if(is_numeric($parts[1])){ + $dns_rr[$r]['ttl'] = intval($parts[1]); + } else { + $dns_rr[$r]['ttl'] = $soa['ttl']; + } + switch ($resource_type) { + case 'mx': + case 'srv': + $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); + break; + default: + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + } + } else { + // a 3600 IN A 1.2.3.4 + if(is_numeric($parts[1]) && $parts[2] == 'in' && ($parts[3] == 'a' || $parts[3] == 'aaaa' || $parts[3] == 'ns'|| $parts[3] == 'cname' || $parts[3] == 'hinfo' || $parts[3] == 'mx' || $parts[3] == 'naptr' || $parts[3] == 'ptr' || $parts[3] == 'rp' || $parts[3] == 'srv' || $parts[3] == 'txt')){ + $resource_type = $parts[3]; + $pkey = 3; + $dns_rr[$r]['type'] = $resource_type; + $dns_rr[$r]['name'] = $parts[0]; + $dns_rr[$r]['ttl'] = intval($parts[1]); + switch ($resource_type) { + case 'mx': + case 'srv': + $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); + break; + default: + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + } + } + // a IN A 1.2.3.4 + elseif($parts[1] == 'in' && ($parts[2] == 'a' || $parts[2] == 'aaaa' || $parts[2] == 'ns'|| $parts[2] == 'cname' || $parts[2] == 'hinfo' || $parts[2] == 'mx' || $parts[2] == 'naptr' || $parts[2] == 'ptr' || $parts[2] == 'rp' || $parts[2] == 'srv' || $parts[2] == 'txt')){ + $resource_type = $parts[2]; + $pkey = 2; + $dns_rr[$r]['type'] = $resource_type; + $dns_rr[$r]['name'] = $parts[0]; + $dns_rr[$r]['ttl'] = $soa['ttl']; + switch ($resource_type) { + case 'mx': + case 'srv': + $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); + break; + default: + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + } + } + // a 3600 A 1.2.3.4 + elseif(is_numeric($parts[1]) && ($parts[2] == 'a' || $parts[2] == 'aaaa' || $parts[2] == 'ns'|| $parts[2] == 'cname' || $parts[2] == 'hinfo' || $parts[2] == 'mx' || $parts[2] == 'naptr' || $parts[2] == 'ptr' || $parts[2] == 'rp' || $parts[2] == 'srv' || $parts[2] == 'txt')){ + $resource_type = $parts[2]; + $pkey = 2; + $dns_rr[$r]['type'] = $resource_type; + $dns_rr[$r]['name'] = $parts[0]; + $dns_rr[$r]['ttl'] = intval($parts[1]); + switch ($resource_type) { + case 'mx': + case 'srv': + $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); + break; + default: + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + } + } + // A 1.2.3.4 + // MX 10 mail + // TXT "v=spf1 a mx ptr -all" + else { + $resource_type = $parts[0]; + $pkey = 0; + $dns_rr[$r]['type'] = $resource_type; + $dns_rr[$r]['name'] = $soa['name']; + $dns_rr[$r]['ttl'] = $soa['ttl']; + switch ($resource_type) { + case 'mx': + case 'srv': + $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); + break; + default: + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + } + } + } + $dns_rr[$r]['type'] = strtoupper($dns_rr[$r]['type']); + if($dns_rr[$r]['type'] == 'NS' && $dns_rr[$r]['name'] == $soa['name']){ + unset($dns_rr[$r]); + } + $r++; } + $i++; } + + /* $i = 0; $r = 0; $s = 0; $dns_rr = array(); foreach ($lines as $line) { - if (substr($line,0,1)!=';'&&substr($line,0,1)!='$') + $line = trim($line); + if ($line != '' && substr($line,0,1) != ';' && substr($line,0,1) != '$') { $line = str_replace("\n",NULL,$line); $i++; @@ -174,22 +378,24 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' else if ($s == 4) $soa['expire'] = $line; else if ($s == 5) - $soa['ttl'] = $line; + $soa['minimum'] = $line; } } else { $line = str_replace("\t",",",$line); + $line = str_replace(" ",",",$line); $recs = explode(",",$line); foreach ($recs as $key => $rec) { $rec = trim($rec); + if($rec == '') continue; //name type data aux ttl active if ($key == 0) { - if ($rec == '@' || $rec == "") + if ($rec == '@') { $rec = $name; } @@ -203,7 +409,7 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' } else if ($key > $typekey[$r]) { - if ($rec != ""&&$rec != "(") + if ($rec != "" && $rec != "(") { $rec = explode(" ",$rec); @@ -261,19 +467,20 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' } } + */ - foreach ($servers as $server) - { - $dns_rr[$r]['name']=$name; - $dns_rr[$r]['type']='NS'; + foreach ($servers as $server){ + $dns_rr[$r]['name'] = $soa['name']; + $dns_rr[$r]['type'] = 'NS'; $dns_rr[$r]['data'] = $server['server_name']; $dns_rr[$r]['aux'] = 0; - $r++; } - print('
');
-					print_r($dns_rr);
-					print('
'); + //print('
');
+					//print_r($dns_rr);
+					//print('
'); + + // Insert the soa record $sys_userid = $_SESSION['s']['user']['userid']; $origin = $app->db->quote($soa['name']); @@ -282,33 +489,40 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $refresh = $app->db->quote($soa['refresh']); $retry = $app->db->quote($soa['retry']); $expire = $app->db->quote($soa['expire']); - $minimum = $app->db->quote($soa['ttl']); + $minimum = $app->db->quote($soa['minimum']); $ttl = $app->db->quote($soa['ttl']); $xfer = $app->db->quote(''); $serial = $app->db->quote(intval($soa['serial'])+1); + //print_r($soa); + //die(); + if($valid_zone_file){ + $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `origin`, `ns`, `mbox`, `serial`, `refresh`, `retry`, `expire`, `minimum`, `ttl`, `active`, `xfer`) VALUES + ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$origin', '$ns', '$mbox', '$serial', '$refresh', '$retry', '$expire', '$minimum', '$ttl', 'Y', '$xfer')"; + $dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id'); - $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `origin`, `ns`, `mbox`, `serial`, `refresh`, `retry`, `expire`, `minimum`, `ttl`, `active`, `xfer`) VALUES - ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$origin', '$ns', '$mbox', '$serial', '$refresh', '$retry', '$expire', '$minimum', '$ttl', 'Y', '$xfer')"; - $dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id'); - - // Insert the dns_rr records - if(is_array($dns_rr) && $dns_soa_id > 0) - { - foreach($dns_rr as $rr) + // Insert the dns_rr records + if(is_array($dns_rr) && $dns_soa_id > 0) { - $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `zone`, `name`, `type`, `data`, `aux`, `ttl`, `active`) VALUES - ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$dns_soa_id', '$rr[name]', '$rr[type]', '$rr[data]', '$rr[aux]', '$rr[ttl]', 'Y')"; - $dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id'); + foreach($dns_rr as $rr) + { + $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `zone`, `name`, `type`, `data`, `aux`, `ttl`, `active`) VALUES + ('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$dns_soa_id', '$rr[name]', '$rr[type]', '$rr[data]', '$rr[aux]', '$rr[ttl]', 'Y')"; + $dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id'); + } } + $msg .= $app->lng('zone_file_successfully_imported_txt'); + } else { + $error .= $app->lng('error_no_valid_zone_file_txt'); } - - header('Location: /dns/dns_soa_edit.php?id='.$dns_soa_id); + //header('Location: /dns/dns_soa_edit.php?id='.$dns_soa_id); } + $app->tpl->setVar('msg',$msg); $app->tpl->setVar('error',$error); $app->tpl->setVar("title",'Import Zone Files'); +$app->tpl->setVar("zonefile_to_import_txt",$app->lng('zonefile_to_import_txt')); $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng'; include($lng_file); diff --git a/interface/web/dns/dns_slave_edit.php b/interface/web/dns/dns_slave_edit.php index c40eb96b6..dc43a4b90 100644 --- a/interface/web/dns/dns_slave_edit.php +++ b/interface/web/dns/dns_slave_edit.php @@ -76,10 +76,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $client_select = ''; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= ""; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = ($client["groupid"] == @$tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } @@ -95,10 +95,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $client_select = ''; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } diff --git a/interface/web/dns/dns_soa_edit.php b/interface/web/dns/dns_soa_edit.php index e83602561..7ec027856 100644 --- a/interface/web/dns/dns_soa_edit.php +++ b/interface/web/dns/dns_soa_edit.php @@ -86,10 +86,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $client_select = ''; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= ""; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = ($client["groupid"] == @$tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } @@ -105,10 +105,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $client_select = ''; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index 1abf9ce64..4490d5573 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -127,7 +127,7 @@ $form["tabs"]['dns_soa'] = array ( 'refresh' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', - 'default' => '28800', + 'default' => '7200', 'value' => '', 'width' => '10', 'maxlength' => '10' @@ -135,7 +135,7 @@ $form["tabs"]['dns_soa'] = array ( 'retry' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', - 'default' => '7200', + 'default' => '540', 'value' => '', 'width' => '10', 'maxlength' => '10' @@ -159,7 +159,7 @@ $form["tabs"]['dns_soa'] = array ( 'ttl' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', - 'default' => '86400', + 'default' => '3600', 'value' => '', 'width' => '10', 'maxlength' => '10' diff --git a/interface/web/dns/lib/lang/ar.lng b/interface/web/dns/lib/lang/ar.lng index 36def8e93..c08339fe9 100644 --- a/interface/web/dns/lib/lang/ar.lng +++ b/interface/web/dns/lib/lang/ar.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/bg.lng b/interface/web/dns/lib/lang/bg.lng index 36def8e93..c08339fe9 100644 --- a/interface/web/dns/lib/lang/bg.lng +++ b/interface/web/dns/lib/lang/bg.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/br.lng b/interface/web/dns/lib/lang/br.lng index de70fdb27..b7a7a7cc0 100644 --- a/interface/web/dns/lib/lang/br.lng +++ b/interface/web/dns/lib/lang/br.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'TXT DNS'; $wb['DNS Wizard'] = 'Assistente de DNS'; $wb['Add DNS Zone'] = 'Adcionar Zona DNS'; $wb['Templates'] = 'Gabaritos'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index c8fd57564..432c8fede 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS průvodce'; $wb['Add DNS Zone'] = 'Přidat DNS zónu'; $wb['Templates'] = 'Šablony'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/de.lng b/interface/web/dns/lib/lang/de.lng index 90fb2d739..7242257fc 100644 --- a/interface/web/dns/lib/lang/de.lng +++ b/interface/web/dns/lib/lang/de.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'DNS-Zone hinzufügen'; $wb['Templates'] = 'Vorlagen'; +$wb['zone_file_successfully_imported_txt'] = 'Die Zone-Datei ist erfolgreich importiert worden!'; +$wb['error_no_valid_zone_file_txt'] = 'Es scheint, als ob dies keine gültige Zone-Datei ist!'; +$wb['zonefile_to_import_txt'] = 'Zone-Datei'; ?> diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng index 6a259a0c9..071cac295 100644 --- a/interface/web/dns/lib/lang/el.lng +++ b/interface/web/dns/lib/lang/el.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Οδηγός DNS'; $wb['Add DNS Zone'] = 'Νέα ζώνη DNS'; $wb['Templates'] = 'Πρότυπα'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/en.lng b/interface/web/dns/lib/lang/en.lng index c4a5beaad..f2311c029 100644 --- a/interface/web/dns/lib/lang/en.lng +++ b/interface/web/dns/lib/lang/en.lng @@ -18,5 +18,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; - +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/es.lng b/interface/web/dns/lib/lang/es.lng index 1f11a4f38..f71ae16a3 100644 --- a/interface/web/dns/lib/lang/es.lng +++ b/interface/web/dns/lib/lang/es.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Asistente DNS'; $wb['Add DNS Zone'] = 'Agregar Zona DNS'; $wb['Templates'] = 'Plantillas'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/fi.lng b/interface/web/dns/lib/lang/fi.lng index 8df98db8a..8814a771f 100755 --- a/interface/web/dns/lib/lang/fi.lng +++ b/interface/web/dns/lib/lang/fi.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT-tietue'; $wb['DNS Wizard'] = 'DNS-Velho'; $wb['Add DNS Zone'] = 'Lisää DNS-alue'; $wb['Templates'] = 'Mallit'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/fr.lng b/interface/web/dns/lib/lang/fr.lng index 5cb942f22..f4be1f219 100644 --- a/interface/web/dns/lib/lang/fr.lng +++ b/interface/web/dns/lib/lang/fr.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Assistant DNS'; $wb['Add DNS Zone'] = 'Ajout zone DNS'; $wb['Templates'] = 'Gabarits'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/hr.lng b/interface/web/dns/lib/lang/hr.lng index 36def8e93..6b4df5167 100644 --- a/interface/web/dns/lib/lang/hr.lng +++ b/interface/web/dns/lib/lang/hr.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_txt.lng b/interface/web/dns/lib/lang/hr_dns_txt.lng index 8e6c417d0..4dcc1367e 100644 --- a/interface/web/dns/lib/lang/hr_dns_txt.lng +++ b/interface/web/dns/lib/lang/hr_dns_txt.lng @@ -1,15 +1,15 @@ diff --git a/interface/web/dns/lib/lang/hr_dns_wizard.lng b/interface/web/dns/lib/lang/hr_dns_wizard.lng index ffceabb53..67767f3ab 100644 --- a/interface/web/dns/lib/lang/hr_dns_wizard.lng +++ b/interface/web/dns/lib/lang/hr_dns_wizard.lng @@ -1,29 +1,29 @@ diff --git a/interface/web/dns/lib/lang/hu.lng b/interface/web/dns/lib/lang/hu.lng index 0826b0680..bab141916 100644 --- a/interface/web/dns/lib/lang/hu.lng +++ b/interface/web/dns/lib/lang/hu.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Varázsló'; $wb['Add DNS Zone'] = 'Új DNS Zóna'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/id.lng b/interface/web/dns/lib/lang/id.lng index f5abc6f41..74b5f80bd 100644 --- a/interface/web/dns/lib/lang/id.lng +++ b/interface/web/dns/lib/lang/id.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Tambah Zona DNS'; $wb['Templates'] = 'Template'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/it.lng b/interface/web/dns/lib/lang/it.lng index 36def8e93..c08339fe9 100644 --- a/interface/web/dns/lib/lang/it.lng +++ b/interface/web/dns/lib/lang/it.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/it_dns_soa.lng b/interface/web/dns/lib/lang/it_dns_soa.lng index e3a6b7a8d..6bfc82ad7 100644 --- a/interface/web/dns/lib/lang/it_dns_soa.lng +++ b/interface/web/dns/lib/lang/it_dns_soa.lng @@ -22,8 +22,8 @@ $wb['ns_error_regex'] = 'NS has a invalid format.'; $wb['mbox_error_empty'] = 'Email is empty.'; $wb['mbox_error_regex'] = 'Email format invalid.'; $wb['also_notify_txt'] = 'Also Notify'; -$wb['also_notify_error_regex'] = 'Please use an IP address.'; $wb['update_acl_txt'] = 'Update ACL'; +$wb['also_notify_error_regex'] = 'Please use an IP address.'; $wb['seconds_txt'] = 'Seconds'; $wb['eg_domain_tld'] = 'e.g. domain.tld'; $wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld'; diff --git a/interface/web/dns/lib/lang/ja.lng b/interface/web/dns/lib/lang/ja.lng index f96696bc8..549cd2d11 100644 --- a/interface/web/dns/lib/lang/ja.lng +++ b/interface/web/dns/lib/lang/ja.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng index 36def8e93..c08339fe9 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng index 70b26f5f7..43a6a68b3 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Kreator DNS'; $wb['Add DNS Zone'] = 'Dodaj strefę DNS'; $wb['Templates'] = 'Szablony'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/pt.lng b/interface/web/dns/lib/lang/pt.lng index 2a06edc75..316981afe 100644 --- a/interface/web/dns/lib/lang/pt.lng +++ b/interface/web/dns/lib/lang/pt.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'TXT DNS'; $wb['DNS Wizard'] = 'Assistente de DNS'; $wb['Add DNS Zone'] = 'Adicionar Zona DNS'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/ro.lng b/interface/web/dns/lib/lang/ro.lng index 908f2aa49..f545b0781 100644 --- a/interface/web/dns/lib/lang/ro.lng +++ b/interface/web/dns/lib/lang/ro.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/ru.lng b/interface/web/dns/lib/lang/ru.lng index 72b8517e6..e52b2d607 100644 --- a/interface/web/dns/lib/lang/ru.lng +++ b/interface/web/dns/lib/lang/ru.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Помощник DNS'; $wb['Add DNS Zone'] = 'Добавить зону DNS'; $wb['Templates'] = 'Шаблоны'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/se.lng b/interface/web/dns/lib/lang/se.lng index 36def8e93..c08339fe9 100644 --- a/interface/web/dns/lib/lang/se.lng +++ b/interface/web/dns/lib/lang/se.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/sk.lng b/interface/web/dns/lib/lang/sk.lng index 2f963f663..e6f62f814 100644 --- a/interface/web/dns/lib/lang/sk.lng +++ b/interface/web/dns/lib/lang/sk.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Wizard'; $wb['Add DNS Zone'] = 'Add DNS Zone'; $wb['Templates'] = 'Templates'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/lib/lang/tr.lng b/interface/web/dns/lib/lang/tr.lng index b53aff495..e519b9a39 100644 --- a/interface/web/dns/lib/lang/tr.lng +++ b/interface/web/dns/lib/lang/tr.lng @@ -17,4 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'DNS Sihirbazı'; $wb['Add DNS Zone'] = 'DNS Zone Ekle'; $wb['Templates'] = 'Şablonlar'; +$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; +$wb['zonefile_to_import_txt'] = 'Zone File'; ?> diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm index a8e235137..90fd78f1a 100644 --- a/interface/web/dns/templates/dns_import.htm +++ b/interface/web/dns/templates/dns_import.htm @@ -25,10 +25,11 @@
- +
-
+
+
@@ -50,3 +51,10 @@
+ \ No newline at end of file diff --git a/interface/web/domain/lib/lang/it.lng b/interface/web/domain/lib/lang/it.lng index d7d7dcf15..eca9da234 100644 --- a/interface/web/domain/lib/lang/it.lng +++ b/interface/web/domain/lib/lang/it.lng @@ -1,9 +1,9 @@ '; +$wb['Domains'] = 'Domini'; +$wb['domain_txt'] = 'Dominio'; +$wb['client_txt'] = 'Cliente'; +$wb['error_domain_in mailuse'] = 'Questo dominio non può essere cancellato in quanto utilizzato come dominio di posta'; +$wb['error_domain_in webuse'] = 'Questo dominio non può essere cancellato in quanto utilizzato come dominio web'; +$wb['error_client_can_not_add_domain'] = 'Impossibile aggiungere nuovo dominio'; +$wb['error_client_group_id_empty'] = 'Devessere selezionato un cliente
'; ?> diff --git a/interface/web/domain/lib/lang/it_domain.lng b/interface/web/domain/lib/lang/it_domain.lng index a66a2258a..7c26779aa 100644 --- a/interface/web/domain/lib/lang/it_domain.lng +++ b/interface/web/domain/lib/lang/it_domain.lng @@ -1,6 +1,6 @@ diff --git a/interface/web/domain/lib/lang/it_domain_list.lng b/interface/web/domain/lib/lang/it_domain_list.lng index 331075936..dbc01af4a 100644 --- a/interface/web/domain/lib/lang/it_domain_list.lng +++ b/interface/web/domain/lib/lang/it_domain_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/help/lib/module.conf.php b/interface/web/help/lib/module.conf.php index 06144a14e..0761a4cbf 100644 --- a/interface/web/help/lib/module.conf.php +++ b/interface/web/help/lib/module.conf.php @@ -10,10 +10,15 @@ $module['title'] = 'top_menu_help'; $module['template'] = 'module.tpl.htm'; //* The page that is displayed when the module is loaded. the path must is relative to the web directory -if(isset($_GET['go2_faq_sections_list'])) +if(isset($_GET['go2_faq_sections_list'])){ $module['startpage'] = 'help/faq_sections_list.php'; -else - $module['startpage'] = 'help/version.php'; +} else { + if($_SESSION['s']['user']['typ'] == 'admin') { + $module['startpage'] = 'help/version.php'; + } else { + $module['startpage'] = 'help/support_message_list.php'; + } +} //* The width of the tab. Normally you should leave this empty and let the browser define the width automatically. $module['tab_width'] = ''; @@ -46,30 +51,34 @@ $module['nav'][] = array( 'title' => 'Support', $itemsfaq = array(); //* admin's tools if($_SESSION['s']['user']['typ'] == 'admin') { - $itemsfaq[] = array( 'title' => 'Manage Questions', - 'target' => 'content', - 'link' => 'help/faq_manage_questions_list.php'); $itemsfaq[] = array( 'title' => 'Manage Sections', 'target' => 'content', 'link' => 'help/faq_sections_list.php'); + $itemsfaq[] = array( 'title' => 'Manage Questions', + 'target' => 'content', + 'link' => 'help/faq_manage_questions_list.php'); + + $module['nav'][] = array( 'title' => 'FAQ', + 'open' => 1, + 'items' => $itemsfaq); } else { //* the user $sql = "SELECT * FROM help_faq_sections"; $res = $app->db->queryAllRecords($sql); //* all the content sections - if(is_array($res)) { + if(is_array($res) && !empty($res)) { foreach($res as $v) { $itemsfaq[] = array( 'title' => $v['hfs_name'], 'target' => 'content', 'link' => 'help/faq_list.php?hfs_id='.$v['hfs_id']); } + // Display 'FAQ' menu only if there are sections + $module['nav'][] = array( 'title' => 'FAQ', + 'open' => 1, + 'items' => $itemsfaq); } } - -$module['nav'][] = array( 'title' => 'FAQ', - 'open' => 1, - 'items' => $itemsfaq); //* -- end of the FAQ menu section diff --git a/interface/web/help/version.php b/interface/web/help/version.php index e53143c21..dc0577e4a 100644 --- a/interface/web/help/version.php +++ b/interface/web/help/version.php @@ -43,8 +43,10 @@ require_once('../../lib/config.inc.php'); require_once('../../lib/app.inc.php'); //* Check permissions for module -$app->auth->check_module_permissions('admin'); +$app->auth->check_module_permissions('help'); -echo '

 

 

'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'

'; +if($_SESSION['s']['user']['typ'] == 'admin') { + echo '

 

 

'.$app->lng('ISPConfig Version:').' '.ISPC_APP_VERSION.'

'; +} ?> \ No newline at end of file diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index ecfcf83e0..94b70754f 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -101,7 +101,7 @@ function submitLoginForm(formname) { } -function submitForm(formname,target) { +function submitForm(formname,target) { var submitFormObj = jQuery.ajax({ type: "POST", url: target, data: jQuery('#'+formname).serialize(), diff --git a/interface/web/login/lib/lang/hr.lng b/interface/web/login/lib/lang/hr.lng index e08e45066..a77b97596 100644 --- a/interface/web/login/lib/lang/hr.lng +++ b/interface/web/login/lib/lang/hr.lng @@ -1,17 +1,17 @@ 64 characters.'; -$wb['username_txt'] = 'Username'; -$wb['password_txt'] = 'Password'; +$wb['error_user_password_empty'] = 'Korisničko ime ili šifra nisu upisani.'; +$wb['error_user_password_incorrect'] = 'Pogrešno korisničko ime ili šifra.'; +$wb['error_user_blocked'] = 'Korisnik je blokiran.'; +$wb['error_user_too_many_logins'] = 'Previše pogrešnih logiranja , molimo pokušajte ponovno za 15 minuta.'; +$wb['pass_reset_txt'] = 'Nova šifra će biti generirana i poslana na email ako je email adresa unešena ispod jednaka onoj u bazi klijenata..'; +$wb['pw_reset'] = 'Šifra je resetirana i poslana na vašu email adresu.'; +$wb['pw_error'] = 'Korisničko ime ili šifra nisu ispravni.'; +$wb['pw_error_noinput'] = 'Unesite email adresu i korisničko ime.'; +$wb['pw_reset_mail_msg'] = 'Šifra za ISPConfig 3 control panel račun je resetirana. Vaša nova šifra je: '; +$wb['pw_reset_mail_title'] = 'Resetirana ISPConfig 3 control panel šifra.'; +$wb['user_regex_error'] = 'Korisničko ime sadrži nedozvoljene znakove ili je dulje od 64 znaka.'; +$wb['pw_error_length'] = 'Duljina šifre je > 64 znakova.'; +$wb['username_txt'] = 'Korisničko ime'; +$wb['password_txt'] = 'Šifra'; $wb['login_button_txt'] = 'Login'; ?> diff --git a/interface/web/login/lib/lang/it.lng b/interface/web/login/lib/lang/it.lng index 23940d3f2..3e99ec0b1 100644 --- a/interface/web/login/lib/lang/it.lng +++ b/interface/web/login/lib/lang/it.lng @@ -1,17 +1,17 @@ 64 characters.'; -$wb['error_user_password_empty'] = 'Username or Password empty.'; -$wb['error_user_password_incorrect'] = 'Username or Password wrong.'; -$wb['error_user_blocked'] = 'User is blocked.'; -$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes'; -$wb['username_txt'] = 'Username'; +$wb['user_regex_error'] = 'Nome utente contenente caratteri non permessi oppure più lungo di 64 caratteri.'; +$wb['pw_error_length'] = 'Lunghezza password maggiore di 64 caratteri.'; +$wb['error_user_password_empty'] = 'Nome utente o password vuoti.'; +$wb['error_user_password_incorrect'] = 'Nome utente o password errati.'; +$wb['error_user_blocked'] = 'Utente bloccato.'; +$wb['error_user_too_many_logins'] = 'Troppi tentativi errati di login. Riprovare tra 15 minuti'; +$wb['username_txt'] = 'Nome utente'; $wb['password_txt'] = 'Password'; $wb['login_button_txt'] = 'Login'; ?> diff --git a/interface/web/mail/lib/lang/it.lng b/interface/web/mail/lib/lang/it.lng index e3a31e332..3fd27265f 100644 --- a/interface/web/mail/lib/lang/it.lng +++ b/interface/web/mail/lib/lang/it.lng @@ -1,47 +1,47 @@ diff --git a/interface/web/mail/lib/lang/it_mail_alias.lng b/interface/web/mail/lib/lang/it_mail_alias.lng index 7f149eb96..444946849 100644 --- a/interface/web/mail/lib/lang/it_mail_alias.lng +++ b/interface/web/mail/lib/lang/it_mail_alias.lng @@ -1,12 +1,12 @@ diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng index 6120e82b7..5e6342bd0 100644 --- a/interface/web/mail/lib/lang/it_mail_domain.lng +++ b/interface/web/mail/lib/lang/it_mail_domain.lng @@ -1,13 +1,13 @@ diff --git a/interface/web/mail/lib/lang/it_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/it_mail_domain_admin_list.lng index aaab4b433..2e29b2475 100644 --- a/interface/web/mail/lib/lang/it_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/it_mail_domain_admin_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/it_mail_user_filter_list.lng b/interface/web/mail/lib/lang/it_mail_user_filter_list.lng index 2754259f4..1e94a4c1c 100644 --- a/interface/web/mail/lib/lang/it_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/it_mail_user_filter_list.lng @@ -1,7 +1,7 @@ diff --git a/interface/web/mail/lib/lang/it_mail_user_list.lng b/interface/web/mail/lib/lang/it_mail_user_list.lng index 3417eaacf..5d5bb3b1a 100644 --- a/interface/web/mail/lib/lang/it_mail_user_list.lng +++ b/interface/web/mail/lib/lang/it_mail_user_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/it_mail_user_stats_list.lng b/interface/web/mail/lib/lang/it_mail_user_stats_list.lng index edde65bd7..60ee81c49 100644 --- a/interface/web/mail/lib/lang/it_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/it_mail_user_stats_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/mail/lib/lang/it_spamfilter_config_list.lng b/interface/web/mail/lib/lang/it_spamfilter_config_list.lng index 70e49e22b..1069a579d 100644 --- a/interface/web/mail/lib/lang/it_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/it_spamfilter_config_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng index 5a85949ab..0ccc76b79 100644 --- a/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng @@ -1,9 +1,9 @@ diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 06ce64baf..5de100e39 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -80,10 +80,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $client_select = ''; if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= ""; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } @@ -105,10 +105,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $client_select = ''; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index b40f66d3a..01a79635a 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -143,4 +143,7 @@ $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index bd849c9f1..cfe58db4b 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index cf921f3f7..d3f3d3079 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'Existem diversas falhas no be $wb['monitor_title_beancounter_txt'] = 'BeanCounter OpenVz VE'; $wb['monitor_beancounter_nosupport_txt'] = 'Este servidor não é um um conteiner openVZ e não contém informações de beancounter'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 71b4d690c..7e79c6eaa 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 0eb5a6bcf..6490300e0 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index de07bd39d..e7e20e63d 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -143,4 +143,7 @@ $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_updates_nosupport_txt'] = 'Αυτή η εποπτεία δεν υποστηρίζεται για τη διανομή σας '; $wb['monitor_beancounter_nosupport_txt'] = 'Αυτός ο server δεν είναι ένας OpenVz VE και δεν έχει πληροφορίες για τον beancounter'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index 8f2cf4670..e1be79b19 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -45,6 +45,9 @@ $wb['Show Clamav-Log'] = 'Show Clamav-Log'; $wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log'; $wb['Show RKHunter-Log'] = 'Show RKHunter-Log'; $wb['Show Jobqueue'] = 'Show Jobqueue'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; $wb['monitor_general_serverstate_txt'] = 'Server State'; $wb['monitor_general_systemstate_txt'] = 'System State'; $wb['monitor_diskusage_filesystem_txt'] = 'Filesystem'; diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 313feb623..2d6815b84 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index 96b11901f..4036b3c5c 100755 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 092777b69..37f8fb014 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -143,4 +143,7 @@ $wb['monitor_title_fail2ban_txt'] = 'Log Fail2Ban'; $wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE'; $wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur nest pas un VE OpenVz et na pas dinformation de compteur'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index 1be9f859a..5692863c4 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -1,24 +1,24 @@ We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; +$wb['Show Mail-Queue'] = 'Prikaži mail queue'; +$wb['Show Mail-Log'] = 'Prikaži mail log'; +$wb['Show Mail warn-Log'] = 'Prikaži mail log (warn)'; +$wb['Show Mail err-Log'] = 'Prikaži mail log (error)'; +$wb['Show System-Log'] = 'Prikaži sistemski log'; +$wb['Show ISPC Cron-Log'] = 'Prikaži control panel cron log'; +$wb['Show Freshclam-Log'] = 'Prikaži freshclam log'; +$wb['Show Clamav-Log'] = 'Prikaži clamav log'; +$wb['Show ISPConfig-Log'] = 'Prikaži control panel log'; +$wb['Show RKHunter-Log'] = 'Prikaži RKHunter log'; +$wb['Show Jobqueue'] = 'Prikaži popis zadataka'; +$wb['monitor_general_serverstate_txt'] = 'Stanje servera'; +$wb['monitor_general_systemstate_txt'] = 'Stanje sistema'; +$wb['monitor_diskusage_filesystem_txt'] = 'Datotečni sustav'; +$wb['monitor_diskusage_type_txt'] = 'Vrsta'; +$wb['monitor_diskusage_size_txt'] = 'Veličina'; +$wb['monitor_diskusage_used_txt'] = 'U upotrebi'; +$wb['monitor_diskusage_available_txt'] = 'Slobodno'; +$wb['monitor_diskusage_usage_txt'] = 'Zauzeto %'; +$wb['monitor_diskusage_mounted_txt'] = 'Montirano na '; +$wb['monitor_logs_mail_txt'] = 'Mail log-ovi'; +$wb['monitor_logs_mailwarn_txt'] = 'Mail log upozorenja'; +$wb['monitor_logs_mailerr_txt'] = 'Mail log greške'; +$wb['monitor_logs_messages_txt'] = 'Sistemski log-ovi'; +$wb['monitor_logs_ispccron_txt'] = 'Control panel cron log-ovi'; +$wb['monitor_logs_freshclam_txt'] = 'Freshclam log-ovi'; +$wb['monitor_logs_clamav_txt'] = 'ClamAV log-ovi'; +$wb['monitor_logs_ispc_txt'] = 'Control panel log-ovi'; +$wb['monitor_nosupportedraid1_txt'] = 'Trenutno je podržan samo mdadm ili mpt-status za nadzor RAID-a.
Ne možemo pronaći niti jedan na vašem serveru.

To znači da ne možemo podržati vaš RAID.'; +$wb['monitor_norkhunter_txt'] = 'RKHunter nije instaliran, stoga nema log podataka.'; $wb['monitor_serverstate_server_txt'] = 'Server'; $wb['monitor_serverstate_state_txt'] = 'State'; -$wb['monitor_serverstate_unknown_txt'] = 'unknown'; -$wb['monitor_serverstate_info_txt'] = 'info'; -$wb['monitor_serverstate_warning_txt'] = 'warning'; -$wb['monitor_serverstate_critical_txt'] = 'critical'; -$wb['monitor_serverstate_error_txt'] = 'error'; +$wb['monitor_serverstate_unknown_txt'] = 'nepoznatih'; +$wb['monitor_serverstate_info_txt'] = 'informacija'; +$wb['monitor_serverstate_warning_txt'] = 'upozorenja'; +$wb['monitor_serverstate_critical_txt'] = 'kritičnih'; +$wb['monitor_serverstate_error_txt'] = 'grešaka/i'; $wb['monitor_serverstate_moreinfo_txt'] = 'Više informacija...'; $wb['monitor_serverstate_more_txt'] = 'Više...'; $wb['monitor_serverstate_fclamok_txt'] = 'Antivirusna zaštita je ok'; -$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your virus protection is OUTDATED!'; +$wb['monitor_serverstate_fclamoutdated_txt'] = 'Vaša antivirusna zaštita je stara!'; $wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!'; -$wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok'; -$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full'; -$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Your Hard-Disk is nearly full'; -$wb['monitor_serverstate_hdveryfull_txt'] = 'Your Hard-Disk is very full'; -$wb['monitor_serverstate_hdfull_txt'] = 'Your Hard-Disk has no more space left'; -$wb['monitor_serverstate_hdunknown_txt'] = 'Hard-Disk: ???'; +$wb['monitor_serverstate_hdok_txt'] = 'Stanje vašeg tvrdog diska je ok'; +$wb['monitor_serverstate_hdgoingfull_txt'] = 'Vaš tvrdi disk će biti popunjen'; +$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Vaš tvrdi disk je skoro pun'; +$wb['monitor_serverstate_hdveryfull_txt'] = 'Vaš tvrdi disk je blizu popunjenosti'; +$wb['monitor_serverstate_hdfull_txt'] = 'Vaš tvrdi disk je popunjen'; +$wb['monitor_serverstate_hdunknown_txt'] = 'Tvrdi disk: ???'; $wb['monitor_serverstate_listok_txt'] = 'Stanje servera je dobro'; $wb['monitor_serverstate_listinfo_txt'] = 'info'; $wb['monitor_serverstate_listwarning_txt'] = 'upozorenje'; $wb['monitor_serverstate_listcritical_txt'] = 'kritično'; $wb['monitor_serverstate_listerror_txt'] = 'greška'; $wb['monitor_serverstate_listunknown_txt'] = 'nepoznato'; -$wb['monitor_serverstate_loadok_txt'] = 'Your Server load is ok'; -$wb['monitor_serverstate_loadheavy_txt'] = 'Your Server in under heavy load'; -$wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load'; -$wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load'; -$wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load'; -$wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???'; -$wb['monitor_serverstate_mailqok_txt'] = 'Your Mail queue load is ok'; -$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mail queue is under heavy load'; -$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mail queue is under high load'; -$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mail queue is under higher load'; -$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mail queue is under highest load'; +$wb['monitor_serverstate_loadok_txt'] = 'Opterećenje servera je ok'; +$wb['monitor_serverstate_loadheavy_txt'] = 'Server je pod opterećenjem'; +$wb['monitor_serverstate_loadhigh_txt'] = 'Server je pod velikim opterećenjem'; +$wb['monitor_serverstate_loaghigher_txt'] = 'Server je pod vrlo velikim opterećenjem'; +$wb['monitor_serverstate_loadhighest_txt'] = 'Server je maksimalno opterećen'; +$wb['monitor_serverstate_loadunknown_txt'] = 'Opterećenje servera: ???'; +$wb['monitor_serverstate_mailqok_txt'] = 'Mail queue opterećenje je ok'; +$wb['monitor_serverstate_mailqheavy_txt'] = 'Mail queue je pod opterećenjem'; +$wb['monitor_serverstate_mailqhigh_txt'] = 'Mail queue je pod velikim opterećenjem'; +$wb['monitor_serverstate_mailqhigher_txt'] = 'Mail queue je pod vrlo velikim opterećenjem'; +$wb['monitor_serverstate_mailqhighest_txt'] = 'Mail queue je maksimalno opterećen'; $wb['monitor_serverstate_mailqunknown_txt'] = 'Mail queue: ???'; -$wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok'; -$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode'; -$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULTY disk. Replace as soon as possible!'; -$wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore'; -$wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???'; -$wb['monitor_serverstate_servicesonline_txt'] = 'All needed services are online'; -$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed services are offline'; -$wb['monitor_serverstate_servicesunknown_txt'] = 'Services: ???'; -$wb['monitor_serverstate_syslogok_txt'] = 'The System Log is O.K.'; -$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your system log'; -$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your system log'; -$wb['monitor_serverstate_syslogunknown_txt'] = 'System log: ???'; -$wb['monitor_serverstate_updatesok_txt'] = 'Your system is up to date.'; -$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more components needs an update'; -$wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_services_online_txt'] = 'Online'; -$wb['monitor_services_offline_txt'] = 'Offline'; +$wb['monitor_serverstate_raidok_txt'] = 'RAID je ok'; +$wb['monitor_serverstate_raidresync_txt'] = 'RAID je u RESYNC modu'; +$wb['monitor_serverstate_raidfault_txt'] = 'Jedan RAID disk je neispravan. Zamjenite disk što prije'; +$wb['monitor_serverstate_raiderror_txt'] = 'RAID više ne radi'; +$wb['monitor_serverstate_raidunknown_txt'] = 'RAID stanje: ???'; +$wb['monitor_serverstate_servicesonline_txt'] = 'Svi servisi su aktivni'; +$wb['monitor_serverstate_servicesoffline_txt'] = 'Jedan ili više servisa su neaktivni'; +$wb['monitor_serverstate_servicesunknown_txt'] = 'Servisi: ???'; +$wb['monitor_serverstate_syslogok_txt'] = 'Sistemski log je OK.'; +$wb['monitor_serverstate_syslogwarning_txt'] = 'Ima upozorenja u sistemskom log-u'; +$wb['monitor_serverstate_syslogerror_txt'] = 'Ima grešaka u sistemskom log-u'; +$wb['monitor_serverstate_syslogunknown_txt'] = 'Sistemski log: ???'; +$wb['monitor_serverstate_updatesok_txt'] = 'Nema nadogradnji za sistem.'; +$wb['monitor_serverstate_updatesneeded_txt'] = 'Postoji nadogradnja za jednu ili više komponenti '; +$wb['monitor_serverstate_updatesunknown_txt'] = 'Nadogradnja sistema: ???'; +$wb['monitor_serverstate_beancounterok_txt'] = 'Beancounter je ok'; +$wb['monitor_serverstate_beancounterinfo_txt'] = 'Postoje greške u beancounter-u'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'Postoji par greški u beancounter-u'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'Postoji puno grešaka u beancounter-u'; +$wb['monitor_serverstate_beancountererror_txt'] = 'Postoji previše grešaka u beancounter-u'; +$wb['monitor_services_online_txt'] = 'Uključen'; +$wb['monitor_services_offline_txt'] = 'Isključen'; $wb['monitor_services_web_txt'] = 'Web server:'; $wb['monitor_services_ftp_txt'] = 'FTP server:'; $wb['monitor_services_smtp_txt'] = 'SMTP server:'; @@ -129,18 +129,21 @@ $wb['monitor_services_pop_txt'] = 'POP3 server:'; $wb['monitor_services_imap_txt'] = 'IMAP server:'; $wb['monitor_services_mydns_txt'] = 'DNS server:'; $wb['monitor_services_mysql_txt'] = 'mySQL server:'; -$wb['monitor_settings_datafromdate_txt'] = 'Data from: '; +$wb['monitor_settings_datafromdate_txt'] = 'Podaci od: '; $wb['monitor_settings_datetimeformat_txt'] = 'd.m.Y. H:i'; -$wb['monitor_settings_refreshsq_txt'] = 'Refresh Sequence:'; +$wb['monitor_settings_refreshsq_txt'] = 'Osvježavanje:'; $wb['monitor_settings_server_txt'] = 'Server'; $wb['monitor_title_cpuinfo_txt'] = 'Procesor'; -$wb['monitor_title_updatestate_txt'] = 'Update Status'; +$wb['monitor_title_updatestate_txt'] = 'Stanje nadogradnje'; $wb['monitor_title_mailq_txt'] = 'Mail Queue'; -$wb['monitor_title_raidstate_txt'] = 'RAID Status'; -$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Log'; -$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; +$wb['monitor_title_raidstate_txt'] = 'Stanje RAID-a'; +$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter log'; +$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban log'; $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -$wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['monitor_updates_nosupport_txt'] = 'Ova distribucija nije podržana za ovaj nadzor'; +$wb['monitor_beancounter_nosupport_txt'] = 'Ovaj server nije OpenVz VE i nema beancounter informacije'; +$wb['monitor_title_iptables_txt'] = 'IPTables pravila'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/hr_datalog_list.lng b/interface/web/monitor/lib/lang/hr_datalog_list.lng index 0fa52dfc5..e6e8f8652 100644 --- a/interface/web/monitor/lib/lang/hr_datalog_list.lng +++ b/interface/web/monitor/lib/lang/hr_datalog_list.lng @@ -2,7 +2,7 @@ $wb['list_head_txt'] = 'Stanje'; $wb['tstamp_txt'] = 'Datum'; $wb['server_id_txt'] = 'Server'; -$wb['dbtable_txt'] = 'DB tablica'; +$wb['dbtable_txt'] = 'Tablica u bazi'; $wb['action_txt'] = 'Akcija'; $wb['status_txt'] = 'Status'; ?> diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index df713de9f..b16d6fcd2 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index 013cc2cb5..e0871f3b1 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'Ada terlalu banyak kegagalan $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'Server ini bukan OpenVz VE dan tidak memiliki informasi beancounter'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index 2ed4ad2db..8c7b8be0d 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -8,8 +8,8 @@ $wb['Server Load'] = 'Carico del server'; $wb['Disk usage'] = 'Utilizzo dischi'; $wb['Memory usage'] = 'Utilizzo memoria'; $wb['no_data_serverload_txt'] = 'Dati riguardo il carico del server attualmente non disponibili. Riprova più tardi.'; -$wb['no_data_memusage_txt'] = 'Dati riguardo l`uso della memoria attualmente non disponibili. Riprova più tardi.'; -$wb['no_data_diskusage_txt'] = 'Dati riguardo l`uso dei dischi attualmente non disponibili. Riprova più tardi.'; +$wb['no_data_memusage_txt'] = 'Dati riguardo luso della memoria attualmente non disponibili. Riprova più tardi.'; +$wb['no_data_diskusage_txt'] = 'Dati riguardo luso dei dischi attualmente non disponibili. Riprova più tardi.'; $wb['no_data_cpuinfo_txt'] = 'Dati riguardo la CPU attualmente non disponibili. Riprova più tardi.'; $wb['no_data_services_txt'] = 'Dati riguardo i servizi attualmente non disponibili. Riprova più tardi.'; $wb['no_logdata_txt'] = 'Log attualmente non disponibili. Riprova più tardi.'; @@ -17,10 +17,10 @@ $wb['Monitoring'] = 'Monitoraggio'; $wb['Server to Monitor'] = 'Server da monitorare'; $wb['Logfiles'] = 'File dei log'; $wb['Status of services'] = 'Stato dei servizi'; -$wb['No Refresh'] = 'No Aggiornamento'; +$wb['No Refresh'] = 'Nessun aggiornamento'; $wb['minutes'] = 'minuti'; $wb['Show Overview'] = 'Mostra panoramica'; -$wb['System State (All Servers)'] = 'Stato del sistema (Tutti i server)'; +$wb['System State (All Servers)'] = 'Stato del sistema (tutti i server)'; $wb['Hardware-Information'] = 'Informationi Hardware'; $wb['Show CPU info'] = 'Mostra info CPU'; $wb['Server State'] = 'Stato del server'; @@ -39,21 +39,21 @@ $wb['Show Clamav-Log'] = 'Mostra log Clamav'; $wb['Show ISPConfig-Log'] = 'Mostra log ISPConfig'; $wb['Show System-Log'] = 'Mostra log di sistema'; $wb['Show RKHunter-Log'] = 'Mostra log RKHunter'; -$wb['Show Jobqueue'] = 'Mostra Jobqueue'; +$wb['Show Jobqueue'] = 'Mostra coda lavori'; $wb['Show ISPC Cron-Log'] = 'Mostra log cron ISPC'; $wb['no_data_updates_txt'] = 'No data about updates available at the moment. Please check again later.'; $wb['no_data_raid_txt'] = 'No data about RAID available at the moment. Please check again later.'; $wb['no_data_rkhunter_txt'] = 'No data about RKHunter available at the moment. Please check again later.'; $wb['no_data_mailq_txt'] = 'No data Mailqueue available at the moment. Please check again later.'; -$wb['monitor_general_serverstate_txt'] = 'Server State'; -$wb['monitor_general_systemstate_txt'] = 'System State'; +$wb['monitor_general_serverstate_txt'] = 'Stato del server'; +$wb['monitor_general_systemstate_txt'] = 'Stato del sistema'; $wb['monitor_diskusage_filesystem_txt'] = 'Filesystem'; -$wb['monitor_diskusage_type_txt'] = 'Type'; -$wb['monitor_diskusage_size_txt'] = 'Size'; -$wb['monitor_diskusage_used_txt'] = 'Used'; -$wb['monitor_diskusage_available_txt'] = 'Available'; +$wb['monitor_diskusage_type_txt'] = 'Tipo'; +$wb['monitor_diskusage_size_txt'] = 'Dimensione'; +$wb['monitor_diskusage_used_txt'] = 'Usati'; +$wb['monitor_diskusage_available_txt'] = 'Disponibili'; $wb['monitor_diskusage_usage_txt'] = 'Use%'; -$wb['monitor_diskusage_mounted_txt'] = 'Mounted on'; +$wb['monitor_diskusage_mounted_txt'] = 'Punti di mount'; $wb['monitor_logs_mail_txt'] = 'Mail - Log'; $wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log'; $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log'; @@ -62,31 +62,31 @@ $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; $wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; -$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; +$wb['monitor_norkhunter_txt'] = 'RKHunter non è installato, non sono disponibili dati nel log '; $wb['monitor_serverstate_server_txt'] = 'Server'; -$wb['monitor_serverstate_state_txt'] = 'State'; -$wb['monitor_serverstate_unknown_txt'] = 'unknown'; +$wb['monitor_serverstate_state_txt'] = 'Stato'; +$wb['monitor_serverstate_unknown_txt'] = 'sconosciuto'; $wb['monitor_serverstate_info_txt'] = 'info'; -$wb['monitor_serverstate_warning_txt'] = 'warning'; -$wb['monitor_serverstate_critical_txt'] = 'critical'; -$wb['monitor_serverstate_error_txt'] = 'error'; -$wb['monitor_serverstate_moreinfo_txt'] = 'More information...'; -$wb['monitor_serverstate_more_txt'] = 'More...'; -$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok'; -$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!'; -$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!'; +$wb['monitor_serverstate_warning_txt'] = 'attenzione'; +$wb['monitor_serverstate_critical_txt'] = 'critico'; +$wb['monitor_serverstate_error_txt'] = 'errore'; +$wb['monitor_serverstate_moreinfo_txt'] = 'Maggiori informazioni...'; +$wb['monitor_serverstate_more_txt'] = 'Segue...'; +$wb['monitor_serverstate_fclamok_txt'] = 'Protezione anti virus ok'; +$wb['monitor_serverstate_fclamoutdated_txt'] = 'La vostra protezione anti virus è scaduta.'; +$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???'; $wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok'; -$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full'; -$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Your Hard-Disk is nearly full'; -$wb['monitor_serverstate_hdveryfull_txt'] = 'Your Hard-Disk is very full'; -$wb['monitor_serverstate_hdfull_txt'] = 'Your Hard-Disk has no more space left'; -$wb['monitor_serverstate_hdunknown_txt'] = 'Hard-Disk: ???'; +$wb['monitor_serverstate_hdgoingfull_txt'] = 'Il vostro disco rigido si sta saturando'; +$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Il vostro disco rigido è quasi saturo'; +$wb['monitor_serverstate_hdveryfull_txt'] = 'Il vostro disco rigido è saturo'; +$wb['monitor_serverstate_hdfull_txt'] = 'Il vostro disco rigido non ha più spazio'; +$wb['monitor_serverstate_hdunknown_txt'] = 'Disco rigido: ???'; $wb['monitor_serverstate_listok_txt'] = 'ok'; $wb['monitor_serverstate_listinfo_txt'] = 'info'; -$wb['monitor_serverstate_listwarning_txt'] = 'warning'; -$wb['monitor_serverstate_listcritical_txt'] = 'critical'; -$wb['monitor_serverstate_listerror_txt'] = 'error'; -$wb['monitor_serverstate_listunknown_txt'] = 'unknown'; +$wb['monitor_serverstate_listwarning_txt'] = 'attenzione'; +$wb['monitor_serverstate_listcritical_txt'] = 'critico'; +$wb['monitor_serverstate_listerror_txt'] = 'errore'; +$wb['monitor_serverstate_listunknown_txt'] = 'sconosciuto'; $wb['monitor_serverstate_loadok_txt'] = 'Your Server load is ok'; $wb['monitor_serverstate_loadheavy_txt'] = 'Your Server in under heavy load'; $wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load'; @@ -124,7 +124,7 @@ $wb['monitor_services_imap_txt'] = 'IMAP-Server:'; $wb['monitor_services_mydns_txt'] = 'DNS-Server:'; $wb['monitor_services_mysql_txt'] = 'mySQL-Server:'; $wb['monitor_settings_datafromdate_txt'] = 'Data from: '; -$wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i'; +$wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i'; $wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:'; $wb['monitor_settings_server_txt'] = 'Server'; $wb['monitor_title_cpuinfo_txt'] = 'CPU Info'; @@ -132,15 +132,18 @@ $wb['monitor_title_updatestate_txt'] = 'Update State'; $wb['monitor_title_mailq_txt'] = 'Mailqueue'; $wb['monitor_title_raidstate_txt'] = 'RAID-State'; $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log'; -$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring'; -$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; +$wb['monitor_updates_nosupport_txt'] = 'Distribuzione in uso non supportata per il monitoraggio'; +$wb['monitor_title_fail2ban_txt'] = 'Mostra log fail2Ban'; $wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.
We cant find any of them at your server.

This means we can not support your RAID yet.'; $wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; $wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; $wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; $wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; +$wb['monitor_title_beancounter_txt'] = 'Mostra risorse OpenVz VE'; +$wb['monitor_beancounter_nosupport_txt'] = 'Questo server non è una OpenVz VE per cui non ci sono informazioni disponibili.'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; ?> diff --git a/interface/web/monitor/lib/lang/it_datalog_list.lng b/interface/web/monitor/lib/lang/it_datalog_list.lng index 740dff161..512a4b935 100644 --- a/interface/web/monitor/lib/lang/it_datalog_list.lng +++ b/interface/web/monitor/lib/lang/it_datalog_list.lng @@ -1,5 +1,5 @@ diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 8835dabe1..0d3340755 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 14d913015..e4bfb03f2 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'In de beancounter bevinden zi $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'Deze server is geen OpenVz VE en heeft daarom geen beancounter informatie'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 558d51911..d5c74d764 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'Jest za dużo problemów w be $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'Ten serwer nie jest serwerem OpenVz VE i nie posiada informacji o beancounterach'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 54639f732..08d6d5940 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 0fc3a2079..859c4166e 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index 5ae5d3a2a..c1b310f89 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 4be4dbc99..5385f76d4 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 39a575d7e..9fed474a3 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 508b729cb..aaea02255 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -143,4 +143,7 @@ $wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in $wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; $wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; $wb['monitor_title_iptables_txt'] = 'IPTables Rules'; +$wb['Show fail2ban-Log'] = 'Show fail2ban-Log'; +$wb['Show IPTables'] = 'Show IPTables'; +$wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php index 8b2ee099c..faf775302 100644 --- a/interface/web/sites/ajax_get_ip.php +++ b/interface/web/sites/ajax_get_ip.php @@ -38,7 +38,7 @@ $server_id = intval($_GET["server_id"]); $client_group_id = intval($_GET["client_group_id"]); $ip_type = $app->db->quote($_GET['ip_type']); -if($_SESSION["s"]["user"]["typ"] == 'admin') { +if($_SESSION["s"]["user"]["typ"] == 'admin' or $app->auth->has_clients($_SESSION['s']['user']['userid'])) { $sql = "SELECT ip_address FROM server_ip WHERE ip_type = '$ip_type' AND server_id = $server_id"; $ips = $app->db->queryAllRecords($sql); diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index f59db12cf..e06694398 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -97,10 +97,10 @@ class page_action extends tform_actions { $clients = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $client_select = ''; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } @@ -135,10 +135,10 @@ class page_action extends tform_actions { $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = ""; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "\r\n"; } } diff --git a/interface/web/sites/form/webdav_user.tform.php b/interface/web/sites/form/webdav_user.tform.php index e378a7f4d..5d423b652 100644 --- a/interface/web/sites/form/webdav_user.tform.php +++ b/interface/web/sites/form/webdav_user.tform.php @@ -73,10 +73,9 @@ $form["tabs"]['webdav'] = array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', 'default' => '', - 'datasource' => array ( 'type' => 'SQL', - 'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain", - 'keyfield'=> 'domain_id', - 'valuefield'=> 'domain' + 'datasource' => array ( 'type' => 'CUSTOM', + 'class'=> 'custom_datasource', + 'function'=> 'webdav_domains' ), 'value' => '' ), diff --git a/interface/web/sites/lib/lang/ar_shell_user.lng b/interface/web/sites/lib/lang/ar_shell_user.lng index 804919021..2e9bdbd40 100644 --- a/interface/web/sites/lib/lang/ar_shell_user.lng +++ b/interface/web/sites/lib/lang/ar_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.'; $wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/bg_shell_user.lng b/interface/web/sites/lib/lang/bg_shell_user.lng index 1c20ee56d..741a7b3d7 100644 --- a/interface/web/sites/lib/lang/bg_shell_user.lng +++ b/interface/web/sites/lib/lang/bg_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Достигнат е максималният р $wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/br_shell_user.lng b/interface/web/sites/lib/lang/br_shell_user.lng index a5fd5239f..ea77c5d6d 100644 --- a/interface/web/sites/lib/lang/br_shell_user.lng +++ b/interface/web/sites/lib/lang/br_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'O número máximo de usuários shell para sua con $wb['parent_domain_id_error_empty'] = 'Nenhum website selecionado.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng index 8e37fead1..67d13e4a8 100644 --- a/interface/web/sites/lib/lang/cz_shell_user.lng +++ b/interface/web/sites/lib/lang/cz_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Dosažen max. počet shell uživatelů.'; $wb['parent_domain_id_error_empty'] = 'Nevybrána žádná webová stránka.'; $wb['puser_txt'] = 'Web: Uživatelské jméno'; $wb['pgroup_txt'] = 'Web: Skupina'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng index 4f0b2ec24..c2373ad83 100644 --- a/interface/web/sites/lib/lang/de_shell_user.lng +++ b/interface/web/sites/lib/lang/de_shell_user.lng @@ -19,4 +19,5 @@ $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['parent_domain_id_error_empty'] = 'Keine Website ausgewählt.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (für key-basierte Logins)'; ?> diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng index c47256046..8b126393f 100644 --- a/interface/web/sites/lib/lang/el_shell_user.lng +++ b/interface/web/sites/lib/lang/el_shell_user.lng @@ -19,4 +19,5 @@ $wb['uid_error_empty'] = 'Το GID δεν έχει οριστεί'; $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί'; $wb['limit_shell_user_txt'] = 'Φτάσατε το μέγιστο πλήθος τον λογαριασμών Shell'; $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/en_shell_user.lng b/interface/web/sites/lib/lang/en_shell_user.lng index f98f3f980..e05fd258e 100644 --- a/interface/web/sites/lib/lang/en_shell_user.lng +++ b/interface/web/sites/lib/lang/en_shell_user.lng @@ -20,4 +20,5 @@ $wb["uid_error_empty"] = 'GID empty.'; $wb["directory_error_empty"] = 'Directory empty.'; $wb["limit_shell_user_txt"] = 'The max number of shell users is reached.'; $wb["parent_domain_id_error_empty"] = 'No website selected.'; +$wb["ssh_rsa_txt"] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/es_shell_user.lng b/interface/web/sites/lib/lang/es_shell_user.lng index 6ab1e5b13..251c783ac 100644 --- a/interface/web/sites/lib/lang/es_shell_user.lng +++ b/interface/web/sites/lib/lang/es_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Se ha alcanzado el número máximo de usuarios de $wb['parent_domain_id_error_empty'] = 'No se ha seleccionado un sitio web.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/fi_shell_user.lng b/interface/web/sites/lib/lang/fi_shell_user.lng index 5ae9df811..769c0dd60 100755 --- a/interface/web/sites/lib/lang/fi_shell_user.lng +++ b/interface/web/sites/lib/lang/fi_shell_user.lng @@ -19,4 +19,5 @@ $wb['password_strength_txt'] = 'Salasanan vahvuus'; $wb['parent_domain_id_error_empty'] = 'Ei www-sivua valittuna.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng index 55cd7f4be..e18722415 100644 --- a/interface/web/sites/lib/lang/fr_shell_user.lng +++ b/interface/web/sites/lib/lang/fr_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Le nombre maximum dutilisateurs shell a été att $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/hr.lng b/interface/web/sites/lib/lang/hr.lng index 4d0cd9dd7..553cc45dc 100644 --- a/interface/web/sites/lib/lang/hr.lng +++ b/interface/web/sites/lib/lang/hr.lng @@ -1,25 +1,25 @@ diff --git a/interface/web/sites/lib/lang/hr_database_admin_list.lng b/interface/web/sites/lib/lang/hr_database_admin_list.lng index 3f05f65e6..aee31601c 100644 --- a/interface/web/sites/lib/lang/hr_database_admin_list.lng +++ b/interface/web/sites/lib/lang/hr_database_admin_list.lng @@ -1,10 +1,10 @@ diff --git a/interface/web/sites/lib/lang/hr_shell_user.lng b/interface/web/sites/lib/lang/hr_shell_user.lng index 6e2fca5ae..c4d822d2d 100644 --- a/interface/web/sites/lib/lang/hr_shell_user.lng +++ b/interface/web/sites/lib/lang/hr_shell_user.lng @@ -19,4 +19,5 @@ $wb['uid_error_empty'] = 'GID empty.'; $wb['directory_error_empty'] = 'Directory empty.'; $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.'; $wb['parent_domain_id_error_empty'] = 'No website selected.'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/hu_shell_user.lng b/interface/web/sites/lib/lang/hu_shell_user.lng index c3528b809..4b09074b4 100644 --- a/interface/web/sites/lib/lang/hu_shell_user.lng +++ b/interface/web/sites/lib/lang/hu_shell_user.lng @@ -19,4 +19,5 @@ $wb['password_strength_txt'] = 'Jelszó erőssége'; $wb['parent_domain_id_error_empty'] = 'Nincs webhely kiválasztva.'; $wb['puser_txt'] = 'Web Felhasználónév'; $wb['pgroup_txt'] = 'Web Csoportnév'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/id_shell_user.lng b/interface/web/sites/lib/lang/id_shell_user.lng index 72396ac53..8f34b6373 100644 --- a/interface/web/sites/lib/lang/id_shell_user.lng +++ b/interface/web/sites/lib/lang/id_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Jumlah maksimum pengguna shell telah tercapai.'; $wb['parent_domain_id_error_empty'] = 'Tak ada situs web yang dipilih.'; $wb['puser_txt'] = 'Nama Pengguna Web'; $wb['pgroup_txt'] = 'Grup Web'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/it.lng b/interface/web/sites/lib/lang/it.lng index 7bd69495e..1c6572957 100644 --- a/interface/web/sites/lib/lang/it.lng +++ b/interface/web/sites/lib/lang/it.lng @@ -2,24 +2,24 @@ $wb['Database'] = 'Database'; $wb['Options'] = 'Opzioni'; $wb['Shell User'] = 'Utente Shell'; -$wb['Domain'] = 'Domini'; +$wb['Domain'] = 'Dominio'; $wb['Redirect'] = 'Redirect'; $wb['SSL'] = 'SSL'; $wb['Subdomain'] = 'Sottodomini'; -$wb['Sites'] = 'Sites'; -$wb['Aliasdomain'] = 'Alias domini'; -$wb['FTP-User'] = 'Utenti FTP'; +$wb['Sites'] = 'Siti'; +$wb['Aliasdomain'] = 'Alias dominio'; +$wb['FTP-User'] = 'Utente FTP'; $wb['FTP'] = 'FTP'; -$wb['Shell-User'] = 'Utenti Shell'; +$wb['Shell-User'] = 'Utente Shell'; $wb['Shell'] = 'Shell'; $wb['Websites'] = 'Siti'; -$wb['Stats'] = 'Statistics'; -$wb['Website'] = 'Website'; +$wb['Stats'] = 'Statistiche'; +$wb['Website'] = 'Sito web'; $wb['Cron'] = 'Cron'; $wb['Cron Jobs'] = 'Cron Jobs'; -$wb['Statistics'] = 'Statistics'; -$wb['Web traffic'] = 'Web Traffic'; -$wb['Webdav-User'] = 'Webdav User'; +$wb['Statistics'] = 'Statistiche'; +$wb['Web traffic'] = 'Traffico web'; +$wb['Webdav-User'] = 'Utente Webdav'; $wb['Webdav'] = 'Webdav'; -$wb['Website quota (Harddisk)'] = 'Website quota (Harddisk)'; +$wb['Website quota (Harddisk)'] = 'Quota sito web (Harddisk)'; ?> diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng index 8921c1173..62a452d4f 100644 --- a/interface/web/sites/lib/lang/it_database.lng +++ b/interface/web/sites/lib/lang/it_database.lng @@ -5,11 +5,11 @@ $wb['database_name_txt'] = 'Nome Database'; $wb['database_user_txt'] = 'Utente Database'; $wb['database_password_txt'] = 'Password Database'; $wb['password_strength_txt'] = 'Sicurezza della Password'; -$wb['database_charset_txt'] = 'Database charset'; +$wb['database_charset_txt'] = 'Charset database'; $wb['remote_access_txt'] = 'Accesso remoto'; $wb['client_txt'] = 'Cliente'; $wb['active_txt'] = 'Attivo'; -$wb['database_name_error_empty'] = 'Database name is empty.'; +$wb['database_name_error_empty'] = 'Il nome database è vuoto.'; $wb['database_name_error_unique'] = 'There is already a database with this name on the server. To get a unique name, e.g. prepend your domain name to the database name.'; $wb['database_name_error_regex'] = 'Invalid database name. The database name may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.'; $wb['database_user_error_empty'] = 'Database user is empty.'; diff --git a/interface/web/sites/lib/lang/it_shell_user.lng b/interface/web/sites/lib/lang/it_shell_user.lng index 804919021..2e9bdbd40 100644 --- a/interface/web/sites/lib/lang/it_shell_user.lng +++ b/interface/web/sites/lib/lang/it_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.'; $wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/it_user_quota_stats_list.lng b/interface/web/sites/lib/lang/it_user_quota_stats_list.lng index 716760b17..adfcb4f7c 100644 --- a/interface/web/sites/lib/lang/it_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/it_user_quota_stats_list.lng @@ -1,8 +1,8 @@ diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng index 6749cb4fa..c6e68ace8 100644 --- a/interface/web/sites/lib/lang/it_web_domain.lng +++ b/interface/web/sites/lib/lang/it_web_domain.lng @@ -24,7 +24,7 @@ $wb['hd_quota_txt'] = 'Quota Harddisk'; $wb['traffic_quota_txt'] = 'Quota Traffico'; $wb['cgi_txt'] = 'CGI'; $wb['ssi_txt'] = 'SSI'; -$wb['errordocs_txt'] = 'Erorri personalizzati'; +$wb['errordocs_txt'] = 'Errori personalizzati'; $wb['ssl_txt'] = 'SSL'; $wb['suexec_txt'] = 'SuEXEC'; $wb['php_txt'] = 'PHP'; @@ -65,6 +65,7 @@ $wb['stats_user_txt'] = 'Webstatistics username'; $wb['stats_type_txt'] = 'Webstatistics program'; $wb['custom_php_ini_txt'] = 'Custom php.ini settings'; $wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty'; +$wb['ipv6_address_txt'] = 'IPv6-Address'; $wb['none_txt'] = 'None'; $wb['disabled_txt'] = 'Disabled'; $wb['no_redirect_txt'] = 'No redirect'; @@ -72,7 +73,6 @@ $wb['no_flag_txt'] = 'No flag'; $wb['save_certificate_txt'] = 'Save certificate'; $wb['create_certificate_txt'] = 'Create certificate'; $wb['delete_certificate_txt'] = 'Delete certificate'; -$wb['ipv6_address_txt'] = 'IPv6-Address'; $wb['nginx_directives_txt'] = 'nginx Directives'; $wb['seo_redirect_txt'] = 'SEO Redirect'; $wb['non_www_to_www_txt'] = 'Non-www -> www'; diff --git a/interface/web/sites/lib/lang/ja_shell_user.lng b/interface/web/sites/lib/lang/ja_shell_user.lng index 6e59be969..61ccb10b5 100644 --- a/interface/web/sites/lib/lang/ja_shell_user.lng +++ b/interface/web/sites/lib/lang/ja_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Shellユーザーが最大数に達しました $wb['parent_domain_id_error_empty'] = 'ウェブサイトを選択してください。'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng index f60e6354c..8aef6655d 100644 --- a/interface/web/sites/lib/lang/nl_shell_user.lng +++ b/interface/web/sites/lib/lang/nl_shell_user.lng @@ -19,4 +19,5 @@ $wb['uid_error_empty'] = 'GID is niet ingvuld.'; $wb['directory_error_empty'] = 'Directory is niet ingvuld.'; $wb['limit_shell_user_txt'] = 'Het max. aantal shell-gebruikers is bereikt.'; $wb['parent_domain_id_error_empty'] = 'Geen website geselecteerd.'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng index 031a83a70..0285428a3 100644 --- a/interface/web/sites/lib/lang/pl_shell_user.lng +++ b/interface/web/sites/lib/lang/pl_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Maksymalna liczba użytkowników shell została p $wb['parent_domain_id_error_empty'] = 'Nie wybrano żadnej strony www.'; $wb['puser_txt'] = 'Nazwa użytkownika strony www'; $wb['pgroup_txt'] = 'Nazwa grupy strony www'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/pt_shell_user.lng b/interface/web/sites/lib/lang/pt_shell_user.lng index 3bdeda638..223f65ad1 100644 --- a/interface/web/sites/lib/lang/pt_shell_user.lng +++ b/interface/web/sites/lib/lang/pt_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'O número máximo de utilizadors shell para a con $wb['parent_domain_id_error_empty'] = 'Nenhum website seleccionado.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/ro_shell_user.lng b/interface/web/sites/lib/lang/ro_shell_user.lng index 2e0cec4eb..20c9a0467 100644 --- a/interface/web/sites/lib/lang/ro_shell_user.lng +++ b/interface/web/sites/lib/lang/ro_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Numarul maxim de Shell-uri a fost atins'; $wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/ru_shell_user.lng b/interface/web/sites/lib/lang/ru_shell_user.lng index 38289567f..586d9babb 100644 --- a/interface/web/sites/lib/lang/ru_shell_user.lng +++ b/interface/web/sites/lib/lang/ru_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Достигнуто допустимое кол $wb['parent_domain_id_error_empty'] = 'Web-сайт не выбран'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/se_shell_user.lng b/interface/web/sites/lib/lang/se_shell_user.lng index 804919021..2e9bdbd40 100644 --- a/interface/web/sites/lib/lang/se_shell_user.lng +++ b/interface/web/sites/lib/lang/se_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'The max number of shell users is reached.'; $wb['parent_domain_id_error_empty'] = 'No website selected.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/sk_shell_user.lng b/interface/web/sites/lib/lang/sk_shell_user.lng index 80d1386a9..7c56b7e00 100644 --- a/interface/web/sites/lib/lang/sk_shell_user.lng +++ b/interface/web/sites/lib/lang/sk_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Maximálny počet shell Užívateľov je dosiahnu $wb['parent_domain_id_error_empty'] = 'Žiadna zvolená webstránka.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/lib/lang/tr_shell_user.lng b/interface/web/sites/lib/lang/tr_shell_user.lng index 2f65479a1..50d98fd62 100644 --- a/interface/web/sites/lib/lang/tr_shell_user.lng +++ b/interface/web/sites/lib/lang/tr_shell_user.lng @@ -19,4 +19,5 @@ $wb['limit_shell_user_txt'] = 'Max. Shell kullanıcısı limitine ulaşıldı.'; $wb['parent_domain_id_error_empty'] = 'Seçili websitesi yok.'; $wb['puser_txt'] = 'Web Username'; $wb['pgroup_txt'] = 'Web Group'; +$wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)'; ?> diff --git a/interface/web/sites/shell_user_edit.php b/interface/web/sites/shell_user_edit.php index cf4a585a9..bb93bf222 100644 --- a/interface/web/sites/shell_user_edit.php +++ b/interface/web/sites/shell_user_edit.php @@ -112,6 +112,8 @@ class page_action extends tform_actions { if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'
'; if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'
'; + if(isset($this->dataRecord['ssh_rsa'])) $this->dataRecord['ssh_rsa'] = trim($this->dataRecord['ssh_rsa']); + parent::onSubmit(); } diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 45bdcc408..3924d39e7 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -44,8 +44,8 @@

 MB

- - + +

{tmpl_var name='active_txt'}

diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm index 3f3b38d21..e4f5cd192 100644 --- a/interface/web/sites/templates/web_aliasdomain_edit.htm +++ b/interface/web/sites/templates/web_aliasdomain_edit.htm @@ -55,14 +55,19 @@
\ No newline at end of file diff --git a/remoting_client/examples/sites_web_domain_add.php b/remoting_client/examples/sites_web_domain_add.php index ba0cfea18..2905db0a0 100644 --- a/remoting_client/examples/sites_web_domain_add.php +++ b/remoting_client/examples/sites_web_domain_add.php @@ -21,12 +21,9 @@ try { 'server_id' => 0, 'ip_address' => '', 'domain' => 'test2.int', - 'type' => '', + 'type' => 'vhost', 'parent_domain_id' => 0, - 'vhost_type' => '', - 'document_root' => '/web/dom', - 'system_user' => 'benutzer', - 'system_group' => 'gruppe', + 'vhost_type' => 'name', 'hd_quota' => 100000, 'traffic_quota' => -1, 'cgi' => 'y', @@ -54,7 +51,7 @@ try { 'stats_type' => 'webalizer', 'allow_override' => 'All', 'apache_directives' => '', - 'php_open_basedir' => '/php', + 'php_open_basedir' => '/', 'custom_php_ini' => '', 'backup_interval' => '', 'backup_copies' => 1, diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master index 90cf90921..00175e7a9 100644 --- a/server/conf/awstats_index.php.master +++ b/server/conf/awstats_index.php.master @@ -16,7 +16,12 @@ if ($handle = opendir('.')) { if (substr($file,0,1) != "." && is_dir($file)) { - $awprev[] = $file; + $orderkey = substr($file,0,4).substr($file,5,2); + if (substr($file,5,2) < 10 ) + { + $orderkey = substr($file,0,4)."0".substr($file,5,2); + } + $awprev[$orderkey] = $file; } } @@ -25,15 +30,16 @@ if ($handle = opendir('.')) if (date("d") == 1) { - $awmonth = date("m")-1; + $month = date("m")-1; if (date("m") == 1) { - $awyear = date("Y")-1; - $awmonth = "12"; + $year = date("Y")-1; + $month = "12"; } } - $awprev[] = $year."-".$month; + $current = $year.$month; + $awprev[$current] = $year."-".$month; closedir($handle); } @@ -41,11 +47,11 @@ if ($handle = opendir('.')) echo '
' .$aw["aw_jump_text"]. ''; echo "