From edf806b98d675a2037b019644aff76b7e8b7738c Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 21 Nov 2011 07:33:09 +0000 Subject: [PATCH] Merged revisions 2741-2788 from SVN stable branch. --- install/apps/bastille-firewall | 9 +- install/autoupdate.php | 6 +- install/dist/lib/fedora.lib.php | 5 + install/dist/lib/gentoo.lib.php | 6 + install/dist/lib/opensuse.lib.php | 6 + install/lib/install.lib.php | 4 +- install/lib/installer_base.lib.php | 14 +- install/lib/update.lib.php | 14 +- install/sql/ispconfig3.sql | 2 +- install/tpl/config.inc.php.master | 2 +- install/tpl/debian6_dovecot-sql.conf.master | 20 +-- install/tpl/debian_dovecot-sql.conf.master | 2 +- install/tpl/fedora_dovecot-sql.conf.master | 2 +- install/tpl/opensuse_dovecot-sql.conf.master | 3 +- install/update.php | 17 ++- interface/lib/classes/listform.inc.php | 2 +- interface/lib/classes/remoting.inc.php | 7 + interface/lib/lang/el.lng | 137 +++++++++--------- interface/web/admin/lib/lang/el.lng | 7 +- interface/web/admin/lib/lang/el_firewall.lng | 1 + .../web/admin/lib/lang/el_firewall_list.lng | 3 +- interface/web/admin/lib/lang/el_groups.lng | 1 + .../web/admin/lib/lang/el_groups_list.lng | 1 + interface/web/admin/lib/lang/el_iptables.lng | 21 +-- .../web/admin/lib/lang/el_iptables_list.lng | 23 +-- .../web/admin/lib/lang/el_language_add.lng | 1 + .../admin/lib/lang/el_language_complete.lng | 1 + .../web/admin/lib/lang/el_language_edit.lng | 1 + .../web/admin/lib/lang/el_language_export.lng | 1 + .../web/admin/lib/lang/el_language_import.lng | 1 + .../web/admin/lib/lang/el_language_list.lng | 1 + .../web/admin/lib/lang/el_package_install.lng | 1 + .../web/admin/lib/lang/el_remote_action.lng | 1 + .../web/admin/lib/lang/el_remote_user.lng | 3 +- .../admin/lib/lang/el_remote_user_list.lng | 1 + interface/web/admin/lib/lang/el_server.lng | 1 + .../web/admin/lib/lang/el_server_config.lng | 31 ++-- .../admin/lib/lang/el_server_config_list.lng | 1 + interface/web/admin/lib/lang/el_server_ip.lng | 1 + .../web/admin/lib/lang/el_server_ip_list.lng | 7 +- .../web/admin/lib/lang/el_server_list.lng | 5 +- .../lib/lang/el_software_package_install.lng | 1 + .../lib/lang/el_software_package_list.lng | 3 +- .../web/admin/lib/lang/el_software_repo.lng | 1 + .../admin/lib/lang/el_software_repo_list.lng | 1 + .../lib/lang/el_software_update_list.lng | 1 + .../web/admin/lib/lang/el_system_config.lng | 3 +- interface/web/admin/lib/lang/el_users.lng | 3 +- .../web/admin/lib/lang/el_users_list.lng | 1 + interface/web/client/lib/lang/el.lng | 1 + interface/web/client/lib/lang/el_client.lng | 13 +- .../web/client/lib/lang/el_client_del.lng | 1 + .../client/lib/lang/el_client_template.lng | 19 +-- .../lib/lang/el_client_template_list.lng | 1 + .../web/client/lib/lang/el_clients_list.lng | 1 + interface/web/client/lib/lang/el_reseller.lng | 17 ++- .../web/client/lib/lang/el_resellers_list.lng | 1 + interface/web/dashboard/dashboard.php | 12 +- interface/web/dashboard/lib/lang/el.lng | 1 + .../dashboard/lib/lang/el_dashlet_limits.lng | 1 + .../dashboard/lib/lang/el_dashlet_modules.lng | 1 + interface/web/designer/lib/lang/el.lng | 1 + .../web/designer/lib/lang/el_form_edit.lng | 1 + .../web/designer/lib/lang/el_form_list.lng | 1 + .../web/designer/lib/lang/el_form_show.lng | 1 + .../web/designer/lib/lang/el_module_edit.lng | 1 + .../web/designer/lib/lang/el_module_list.lng | 1 + .../designer/lib/lang/el_module_nav_edit.lng | 1 + .../lib/lang/el_module_nav_item_edit.lng | 3 +- .../web/designer/lib/lang/el_module_show.lng | 1 + interface/web/dns/dns_import.php | 30 ++++ interface/web/dns/lib/lang/el.lng | 7 +- interface/web/dns/lib/lang/el_dns_a.lng | 1 + interface/web/dns/lib/lang/el_dns_a_list.lng | 1 + interface/web/dns/lib/lang/el_dns_aaaa.lng | 1 + interface/web/dns/lib/lang/el_dns_alias.lng | 1 + interface/web/dns/lib/lang/el_dns_cname.lng | 1 + interface/web/dns/lib/lang/el_dns_hinfo.lng | 1 + interface/web/dns/lib/lang/el_dns_mx.lng | 1 + interface/web/dns/lib/lang/el_dns_ns.lng | 1 + interface/web/dns/lib/lang/el_dns_ptr.lng | 1 + interface/web/dns/lib/lang/el_dns_rp.lng | 1 + interface/web/dns/lib/lang/el_dns_slave.lng | 5 +- .../web/dns/lib/lang/el_dns_slave_list.lng | 3 +- interface/web/dns/lib/lang/el_dns_soa.lng | 15 +- .../web/dns/lib/lang/el_dns_soa_list.lng | 1 + interface/web/dns/lib/lang/el_dns_srv.lng | 1 + .../web/dns/lib/lang/el_dns_template.lng | 1 + .../web/dns/lib/lang/el_dns_template_list.lng | 1 + interface/web/dns/lib/lang/el_dns_txt.lng | 1 + interface/web/dns/lib/lang/el_dns_wizard.lng | 1 + interface/web/dns/templates/dns_wizard.htm | 2 +- interface/web/domain/lib/lang/el.lng | 1 + interface/web/domain/lib/lang/el_domain.lng | 1 + .../web/domain/lib/lang/el_domain_list.lng | 1 + .../web/help/lib/lang/ar_help_faq_list.lng | 3 + .../web/help/lib/lang/bg_help_faq_list.lng | 3 + .../web/help/lib/lang/br_help_faq_list.lng | 3 + .../web/help/lib/lang/cz_help_faq_list.lng | 3 + .../web/help/lib/lang/de_help_faq_list.lng | 3 + interface/web/help/lib/lang/el.lng | 11 +- interface/web/help/lib/lang/el_faq_form.lng | 9 +- .../lib/lang/el_faq_manage_questions_list.lng | 15 +- .../help/lib/lang/el_faq_sections_form.lng | 3 +- .../web/help/lib/lang/el_help_faq_list.lng | 3 + .../lib/lang/el_help_faq_sections_list.lng | 13 +- .../web/help/lib/lang/el_support_message.lng | 3 +- .../help/lib/lang/el_support_message_list.lng | 1 + .../web/help/lib/lang/en_help_faq_list.lng | 3 + .../web/help/lib/lang/es_help_faq_list.lng | 3 + .../web/help/lib/lang/fi_help_faq_list.lng | 3 + .../web/help/lib/lang/fr_help_faq_list.lng | 3 + .../web/help/lib/lang/hr_help_faq_list.lng | 3 + .../web/help/lib/lang/hu_help_faq_list.lng | 3 + .../web/help/lib/lang/id_help_faq_list.lng | 3 + .../web/help/lib/lang/it_help_faq_list.lng | 3 + .../web/help/lib/lang/ja_help_faq_list.lng | 3 + .../web/help/lib/lang/nl_help_faq_list.lng | 3 + .../web/help/lib/lang/pl_help_faq_list.lng | 3 + .../web/help/lib/lang/pt_help_faq_list.lng | 3 + .../web/help/lib/lang/ro_help_faq_list.lng | 3 + .../web/help/lib/lang/ru_help_faq_list.lng | 3 + .../web/help/lib/lang/se_help_faq_list.lng | 3 + .../web/help/lib/lang/sk_help_faq_list.lng | 3 + .../web/help/lib/lang/tr_help_faq_list.lng | 3 + .../web/help/templates/help_faq_list.htm | 2 +- interface/web/login/lib/lang/el.lng | 1 + interface/web/mail/lib/lang/el.lng | 1 + interface/web/mail/lib/lang/el_mail_alias.lng | 1 + .../web/mail/lib/lang/el_mail_alias_list.lng | 1 + .../web/mail/lib/lang/el_mail_aliasdomain.lng | 5 +- .../lib/lang/el_mail_aliasdomain_list.lng | 1 + .../web/mail/lib/lang/el_mail_blacklist.lng | 1 + .../mail/lib/lang/el_mail_blacklist_list.lng | 1 + .../mail/lib/lang/el_mail_content_filter.lng | 1 + .../lib/lang/el_mail_content_filter_list.lng | 1 + .../web/mail/lib/lang/el_mail_domain.lng | 1 + .../lib/lang/el_mail_domain_admin_list.lng | 1 + .../mail/lib/lang/el_mail_domain_catchall.lng | 1 + .../lib/lang/el_mail_domain_catchall_list.lng | 1 + .../web/mail/lib/lang/el_mail_domain_list.lng | 1 + .../web/mail/lib/lang/el_mail_forward.lng | 1 + .../mail/lib/lang/el_mail_forward_list.lng | 1 + interface/web/mail/lib/lang/el_mail_get.lng | 3 +- .../web/mail/lib/lang/el_mail_get_list.lng | 1 + .../web/mail/lib/lang/el_mail_mailinglist.lng | 27 ++-- .../lib/lang/el_mail_mailinglist_list.lng | 3 +- .../mail/lib/lang/el_mail_relay_recipient.lng | 1 + .../lib/lang/el_mail_relay_recipient_list.lng | 1 + .../web/mail/lib/lang/el_mail_spamfilter.lng | 1 + .../mail/lib/lang/el_mail_spamfilter_list.lng | 1 + .../web/mail/lib/lang/el_mail_transport.lng | 1 + .../mail/lib/lang/el_mail_transport_list.lng | 1 + interface/web/mail/lib/lang/el_mail_user.lng | 85 +++++------ .../web/mail/lib/lang/el_mail_user_filter.lng | 19 +-- .../lib/lang/el_mail_user_filter_list.lng | 1 + .../web/mail/lib/lang/el_mail_user_list.lng | 1 + .../mail/lib/lang/el_mail_user_stats_list.lng | 1 + .../web/mail/lib/lang/el_mail_whitelist.lng | 1 + .../mail/lib/lang/el_mail_whitelist_list.lng | 1 + .../mail/lib/lang/el_spamfilter_blacklist.lng | 1 + .../lib/lang/el_spamfilter_blacklist_list.lng | 1 + .../mail/lib/lang/el_spamfilter_config.lng | 11 +- .../lib/lang/el_spamfilter_config_list.lng | 1 + .../mail/lib/lang/el_spamfilter_policy.lng | 1 + .../lib/lang/el_spamfilter_policy_list.lng | 1 + .../web/mail/lib/lang/el_spamfilter_users.lng | 1 + .../lib/lang/el_spamfilter_users_list.lng | 1 + .../mail/lib/lang/el_spamfilter_whitelist.lng | 1 + .../lib/lang/el_spamfilter_whitelist_list.lng | 1 + .../lib/lang/el_user_quota_stats_list.lng | 1 + interface/web/monitor/lib/lang/el.lng | 7 +- .../web/monitor/lib/lang/el_syslog_list.lng | 1 + interface/web/monitor/show_sys_state.php | 2 +- .../web/monitor/templates/show_sys_state.htm | 50 +++---- interface/web/monitor/tools.inc.php | 2 +- .../web/sites/form/web_folder_user.tform.php | 4 +- interface/web/sites/lib/lang/el.lng | 3 +- interface/web/sites/lib/lang/el_cron.lng | 1 + interface/web/sites/lib/lang/el_cron_list.lng | 1 + interface/web/sites/lib/lang/el_database.lng | 3 +- .../sites/lib/lang/el_database_admin_list.lng | 1 + .../web/sites/lib/lang/el_database_list.lng | 1 + interface/web/sites/lib/lang/el_ftp_user.lng | 3 +- .../web/sites/lib/lang/el_ftp_user_list.lng | 1 + .../web/sites/lib/lang/el_shell_user.lng | 3 +- .../web/sites/lib/lang/el_shell_user_list.lng | 1 + .../lib/lang/el_user_quota_stats_list.lng | 1 + .../lib/lang/el_web_aliasdomain_list.lng | 1 + .../web/sites/lib/lang/el_web_domain.lng | 21 +-- .../lib/lang/el_web_domain_admin_list.lng | 1 + .../web/sites/lib/lang/el_web_domain_list.lng | 1 + .../web/sites/lib/lang/el_web_folder.lng | 7 +- .../web/sites/lib/lang/el_web_folder_list.lng | 7 +- .../web/sites/lib/lang/el_web_folder_user.lng | 11 +- .../lib/lang/el_web_folder_user_list.lng | 9 +- .../lib/lang/el_web_sites_stats_list.lng | 1 + .../web/sites/lib/lang/el_web_subdomain.lng | 5 +- .../sites/lib/lang/el_web_subdomain_list.lng | 1 + .../web/sites/lib/lang/el_webdav_user.lng | 1 + .../sites/lib/lang/el_webdav_user_list.lng | 1 + .../web/sites/list/web_folder_user.list.php | 4 +- .../lib/lang/el_strengthmeter.lng | 1 + .../default/css/screen/content_ispc.css | 1 + interface/web/tools/lib/lang/el.lng | 3 +- .../web/tools/lib/lang/el_usersettings.lng | 1 + interface/web/vm/lib/lang/el.lng | 5 +- .../web/vm/lib/lang/el_openvz_action.lng | 27 ++-- interface/web/vm/lib/lang/el_openvz_ip.lng | 11 +- .../web/vm/lib/lang/el_openvz_ip_list.lng | 5 +- .../web/vm/lib/lang/el_openvz_ostemplate.lng | 17 ++- .../vm/lib/lang/el_openvz_ostemplate_list.lng | 7 +- .../web/vm/lib/lang/el_openvz_template.lng | 23 +-- .../vm/lib/lang/el_openvz_template_list.lng | 7 +- interface/web/vm/lib/lang/el_openvz_vm.lng | 65 +++++---- .../web/vm/lib/lang/el_openvz_vm_list.lng | 9 +- .../API-docs/{main.html => index.html} | 0 server/conf/sieve_filter.master | 11 +- server/conf/sieve_filter_1.2.master | 39 +++++ server/conf/vhost.conf.master | 4 +- server/lib/classes/monitor_tools.inc.php | 11 +- .../monitor_core_module.inc.php | 13 ++ .../plugins-available/apache2_plugin.inc.php | 101 ++++++------- .../maildeliver_plugin.inc.php | 18 ++- .../shelluser_base_plugin.inc.php | 4 +- .../shelluser_jailkit_plugin.inc.php | 10 +- server/scripts/create_jailkit_chroot.sh | 2 +- server/server.php | 13 -- 228 files changed, 887 insertions(+), 542 deletions(-) create mode 100644 interface/web/help/lib/lang/ar_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/bg_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/br_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/cz_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/de_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/el_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/en_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/es_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/fi_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/fr_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/hr_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/hu_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/id_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/it_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/ja_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/nl_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/pl_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/pt_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/ro_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/ru_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/se_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/sk_help_faq_list.lng create mode 100644 interface/web/help/lib/lang/tr_help_faq_list.lng rename remoting_client/API-docs/{main.html => index.html} (100%) create mode 100644 server/conf/sieve_filter_1.2.master diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall index 86da005ac..d5723dbdb 100644 --- a/install/apps/bastille-firewall +++ b/install/apps/bastille-firewall @@ -58,7 +58,7 @@ ### END INIT INFO -REALSCRIPT=/sbin/bastille-ipchains +REALSCRIPT=/sbin/bastille-netfilter PATH=/sbin:/bin:/usr/sbin:/usr/bin # exit function to be called in place of regular Bourne exit @@ -78,13 +78,6 @@ if [ $? -ne 0 ]; then exit 1 fi -if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then - # We are using Linux 2.3 or newer; use the netfilter script if available - if [ -x /sbin/bastille-netfilter ]; then - REALSCRIPT=/sbin/bastille-netfilter - fi -fi - if [ ! -x ${REALSCRIPT} ]; then echo "ERROR: \"${REALSCRIPT}\" not available!" clean_exit 1 diff --git a/install/autoupdate.php b/install/autoupdate.php index a9863cee2..ba5b1a1e6 100644 --- a/install/autoupdate.php +++ b/install/autoupdate.php @@ -144,6 +144,11 @@ if( empty($conf["mysql"]["admin_password"]) ) { die("internal error - MYSQL-Root passord not known"); } +//** Test mysql root connection +if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) { + die("internal error - MYSQL-Root passord wrong"); +} + /* * Check all tables */ @@ -156,7 +161,6 @@ prepareDBDump(); //* initialize the database $inst->db = new db(); -$inst->db->dbName = $conf["mysql"]["database"]; /* * The next line is a bit tricky! diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 4efb6fc3b..51f2dff82 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -1029,6 +1029,11 @@ class installer_dist extends installer_base { // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0); + if(is_file($install_dir.'/interface/invoices')) { + chmod($install_dir.'/interface/invoices', 0770); + chown($install_dir.'/interface/invoices', 'ispconfig'); + chgrp($install_dir.'/interface/invoices', 'ispconfig'); + } } diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index ffe5ef2c2..c5fdad0e7 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -866,6 +866,12 @@ class installer extends installer_base chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); } + if(is_file($install_dir.'/interface/invoices')) { + chmod($install_dir.'/interface/invoices', 0770); + chown($install_dir.'/interface/invoices', 'ispconfig'); + chgrp($install_dir.'/interface/invoices', 'ispconfig'); + } + // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. // Later this must run as own apache server or via suexec! diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 22438cc59..eed222634 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -1060,6 +1060,12 @@ class installer_dist extends installer_base { exec('chmod 744 /usr/local/bin/run-getmail.sh'); } + if(is_file($install_dir.'/interface/invoices')) { + chmod($install_dir.'/interface/invoices', 0770); + chown($install_dir.'/interface/invoices', 'ispconfig'); + chgrp($install_dir.'/interface/invoices', 'ispconfig'); + } + } diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 318cda923..0d8eb400b 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -582,8 +582,8 @@ function removeLine($filename,$search_pattern,$strict = 0) { } function is_installed($appname) { - exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out); - if(isset($out[0]) && stristr($out[0],$appname)) { + exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode); + if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) { return true; } else { return false; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index b0cbfd650..0021057cc 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -514,6 +514,10 @@ class installer_base { copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init); copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh); } + + //* help jailkit fo find its ini files + if(!is_link('/usr/jk_socketd.ini')) exec('ln -s /etc/jailkit/jk_socketd.ini /usr/jk_socketd.ini'); + if(!is_link('/usr/jk_init.ini')) exec('ln -s /etc/jailkit/jk_init.ini /usr/jk_init.ini'); } @@ -903,7 +907,7 @@ class installer_base { if(is_file($config_dir.'/'.$configfile)) { copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~'); } - chmod($config_dir.'/'.$configfile.'~', 0400); + if(is_file($config_dir.'/'.$configfile.'~')) chmod($config_dir.'/'.$configfile.'~', 0400); $content = rf('tpl/debian_dovecot-sql.conf.master'); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); @@ -1758,6 +1762,12 @@ class installer_base { chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); } + + if(is_file($install_dir.'/interface/invoices')) { + chmod($install_dir.'/interface/invoices', 0770); + chown($install_dir.'/interface/invoices', 'ispconfig'); + chgrp($install_dir.'/interface/invoices', 'ispconfig'); + } // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing // and must be fixed as this will allow the apache user to read the ispconfig files. @@ -1952,7 +1962,7 @@ class installer_base { wf($install_dir.'/server/lib/mysql_clientdb.conf',$content); chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600); chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); - chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); + chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root'); } diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index d95bbf804..729ee04d8 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -113,7 +113,7 @@ function updateDbAndIni() { $ini_array = ini_to_array(stripslashes($tmp['config'])); $current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0; - if(count($ini_array) == 0) die('Unable to read server configuration from database.'); + if(!is_array($ini_array) or count($ini_array) == 0) die('Unable to read server configuration from database.'); $conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false; $conf['services']['web'] = ($tmp['web_server'] == 1)?true:false; @@ -231,7 +231,7 @@ function updateDbAndIni() { //** Update server ini - $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']); + $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']); $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config'])); unset($tmp_server_rec); $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master')); @@ -286,7 +286,7 @@ function updateDbAndIni() { } $new_ini = array_to_ini($tpl_ini_array); - $sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']; + $sql = "UPDATE ".$conf["mysql"]["database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id']; $inst->db->query($sql); unset($old_ini_array); unset($tpl_ini_array); @@ -294,7 +294,7 @@ function updateDbAndIni() { //** Update system ini - $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1"); + $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".sys_ini WHERE sysini_id = 1"); $old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config'])); unset($tmp_server_rec); $tpl_ini_array = ini_to_array(rf('tpl/system.ini.master')); @@ -309,11 +309,11 @@ function updateDbAndIni() { } $new_ini = array_to_ini($tpl_ini_array); - $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1'); + $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM '.$conf["mysql"]["database"].'.sys_ini WHERE 1'); if($tmp['number'] == 0) { - $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')"); + $inst->db->query("INSERT INTO ".$conf["mysql"]["database"].".sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')"); } else { - $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1"); + $inst->db->query("UPDATE ".$conf["mysql"]["database"].".sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1"); } unset($old_ini_array); unset($tpl_ini_array); diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index fd6264855..11d1b6c65 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -1919,6 +1919,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4'); +INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.1'); SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master index 99d4402c4..a6abb12a6 100644 --- a/install/tpl/config.inc.php.master +++ b/install/tpl/config.inc.php.master @@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); //** Application define('ISPC_APP_TITLE', 'ISPConfig'); -define('ISPC_APP_VERSION', '3.0.4'); +define('ISPC_APP_VERSION', '3.0.4.1'); define('DEVSYSTEM', 0); diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master index b04abdebc..380c86b47 100644 --- a/install/tpl/debian6_dovecot-sql.conf.master +++ b/install/tpl/debian6_dovecot-sql.conf.master @@ -13,20 +13,6 @@ driver = mysql connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password} default_pass_scheme = CRYPT -password_query = SELECT password FROM mail_user \ - WHERE login = '%u' AND disable%Ls = 'n' - -# Old user query quota part -# CONCAT('*:storage=', quota , 'B') AS quota_rule -# Old user query with email instead of login -# WHERE email = '%u' AND disable%Ls = 'n' - -user_query = SELECT email as user, \ - maildir as home, \ - CONCAT('maildir:', maildir, '/Maildir') as mail, \ - uid, \ - gid, \ - CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, \ - CONCAT(maildir, '/.sieve') as sieve \ - FROM mail_user \ - WHERE email = '%u' AND disable%Ls = 'n' +password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' +# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' +user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master index 969a9ed99..8b110e92d 100644 --- a/install/tpl/debian_dovecot-sql.conf.master +++ b/install/tpl/debian_dovecot-sql.conf.master @@ -122,6 +122,6 @@ default_pass_scheme = CRYPT password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' # user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' -user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' +user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master index 6d7cf62b6..de28a7cf5 100644 --- a/install/tpl/fedora_dovecot-sql.conf.master +++ b/install/tpl/fedora_dovecot-sql.conf.master @@ -135,4 +135,4 @@ default_pass_scheme = CRYPT password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' # user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' -user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' +user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master index 6d7cf62b6..66bcdc87b 100644 --- a/install/tpl/opensuse_dovecot-sql.conf.master +++ b/install/tpl/opensuse_dovecot-sql.conf.master @@ -134,5 +134,4 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se default_pass_scheme = CRYPT password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' -# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n' -user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' +user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' diff --git a/install/update.php b/install/update.php index 74764ce4e..769cdce59 100644 --- a/install/update.php +++ b/install/update.php @@ -139,11 +139,17 @@ $clientdb_host = ''; $clientdb_user = ''; $clientdb_password = ''; -//** Ask user for mysql admin_password if empty -if( empty($conf["mysql"]["admin_password"]) ) { - - $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']); -} +//** Test mysql root connection +$finished = false; +do { + if(@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) { + $finished = true; + } else { + swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error()); + $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']); + } +} while ($finished == false); +unset($finished); /* * Prepare the dump of the database @@ -152,7 +158,6 @@ prepareDBDump(); //* initialize the database $inst->db = new db(); -$inst->db->dbName = $conf["mysql"]["database"]; //* initialize the master DB, if we have a multiserver setup if($conf['mysql']['master_slave_setup'] == 'y') { diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index a5843d660..d4b1390c8 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) && count($record) > 0) { + if(is_array($record) && count($record) > 0 && is_array($this->listDef['item'])) { foreach($this->listDef['item'] as $field){ $key = $field['field']; if(isset($record[$key])) { diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php index 8d043a430..33d84aba9 100644 --- a/interface/lib/classes/remoting.inc.php +++ b/interface/lib/classes/remoting.inc.php @@ -1372,6 +1372,13 @@ class remoting { $this->server->fault('permission_denied', 'You do not have the permissions to access this function.'); return false; } + + //* 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; + $affected_rows = $this->updateQuery('../sites/form/web_domain.tform.php',$client_id,$primary_id,$params); return $affected_rows; } diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng index dca047499..add04e6a4 100644 --- a/interface/lib/lang/el.lng +++ b/interface/lib/lang/el.lng @@ -1,70 +1,71 @@ + diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng index a705cb717..732f71645 100644 --- a/interface/web/admin/lib/lang/el.lng +++ b/interface/web/admin/lib/lang/el.lng @@ -30,7 +30,7 @@ $wb['Language Editor'] = 'Επεξεργαστής Γλώσσας'; $wb['Software'] = 'Εφαρμογές & Πρόσθετα'; $wb['Repositories'] = 'Αποθετήρια'; $wb['Server Services'] = 'Υπηρεσίες Server'; -$wb['Interface Config'] = 'Ρύθμιση Εμφάνισης'; +$wb['Interface Config'] = 'Ρυθμίσεις Εμφάνισης'; $wb['Packages'] = 'Πακέτα'; $wb['Updates'] = 'Ενημερώσεις'; $wb['Merge'] = 'Συγχώνευση'; @@ -38,6 +38,7 @@ $wb['Remote Users'] = 'Απομακρυσμένοι Χρήστες'; $wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες'; $wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος'; $wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig'; -$wb['1001'] = 'Username or password is empty.'; -$wb['1002'] = 'Username or password is wrong.'; +$wb['1001'] = 'Το όνομα χρήστη ή το συνθηματικό είναι κενό.'; +$wb['1002'] = 'Το όνομα χρήστη ή το συνθηματικό είναι λάθος.'; ?> + diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng index ff31bab28..83260ed3a 100644 --- a/interface/web/admin/lib/lang/el_firewall.lng +++ b/interface/web/admin/lib/lang/el_firewall.lng @@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή fire $wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.'; $wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.'; ?> + diff --git a/interface/web/admin/lib/lang/el_firewall_list.lng b/interface/web/admin/lib/lang/el_firewall_list.lng index 0b092e5af..91cab725f 100644 --- a/interface/web/admin/lib/lang/el_firewall_list.lng +++ b/interface/web/admin/lib/lang/el_firewall_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng index 68057608f..b50df7981 100644 --- a/interface/web/admin/lib/lang/el_groups.lng +++ b/interface/web/admin/lib/lang/el_groups.lng @@ -3,3 +3,4 @@ $wb['description_txt'] = 'Περιγραφή'; $wb['name_txt'] = 'Ομάδα'; $wb['name_err'] = 'Η ομάδα πρέπει να έχει από 1 μέχρι 30 χαρακτήρες.'; ?> + diff --git a/interface/web/admin/lib/lang/el_groups_list.lng b/interface/web/admin/lib/lang/el_groups_list.lng index 977e8032d..10ce5ebce 100644 --- a/interface/web/admin/lib/lang/el_groups_list.lng +++ b/interface/web/admin/lib/lang/el_groups_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Ομάδα'; $wb['add_new_record_txt'] = 'Νέα ομάδα'; $wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; ?> + diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng index 40760b949..9236d4778 100644 --- a/interface/web/admin/lib/lang/el_iptables.lng +++ b/interface/web/admin/lib/lang/el_iptables.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng index 15c8baddc..a2da45d82 100644 --- a/interface/web/admin/lib/lang/el_iptables_list.lng +++ b/interface/web/admin/lib/lang/el_iptables_list.lng @@ -1,15 +1,16 @@ + diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng index 604f3a7ab..f783f913c 100644 --- a/interface/web/admin/lib/lang/el_language_add.lng +++ b/interface/web/admin/lib/lang/el_language_add.lng @@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = 'Κωδικός γλώσσας 2 χαρακτήρ $wb['btn_save_txt'] = 'Νέα ομάδα αρχείων γλώσσας'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_complete.lng b/interface/web/admin/lib/lang/el_language_complete.lng index 629d3b2e5..cf10cabc3 100644 --- a/interface/web/admin/lib/lang/el_language_complete.lng +++ b/interface/web/admin/lib/lang/el_language_complete.lng @@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Επιλογή Γλώσσας'; $wb['btn_save_txt'] = 'Συγχώνευση Γλώσσας τώρα'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_edit.lng b/interface/web/admin/lib/lang/el_language_edit.lng index 5a76f63a0..6faa60e6b 100644 --- a/interface/web/admin/lib/lang/el_language_edit.lng +++ b/interface/web/admin/lib/lang/el_language_edit.lng @@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Αρχείο γλώσσας'; $wb['btn_save_txt'] = 'Αποθήκευση'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_export.lng b/interface/web/admin/lib/lang/el_language_export.lng index 354b886d4..4ff092fc1 100644 --- a/interface/web/admin/lib/lang/el_language_export.lng +++ b/interface/web/admin/lib/lang/el_language_export.lng @@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Επιλογή Γλώσσας'; $wb['btn_save_txt'] = 'Εξαγωγή της επιλεγμένης λίστας αρχείων γλώσσας'; $wb['btn_cancel_txt'] = 'Επιστροφή'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng index 4bb61c4ef..e30eb1ff3 100644 --- a/interface/web/admin/lib/lang/el_language_import.lng +++ b/interface/web/admin/lib/lang/el_language_import.lng @@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Αντικατάσταση αρχείου, αν $wb['btn_cancel_txt'] = 'Επιστροφή'; $wb['ignore_version_txt'] = 'Παράλειψη ελέγχου έκδοσης ISPConfig'; ?> + diff --git a/interface/web/admin/lib/lang/el_language_list.lng b/interface/web/admin/lib/lang/el_language_list.lng index fa5307319..a9cfee171 100644 --- a/interface/web/admin/lib/lang/el_language_list.lng +++ b/interface/web/admin/lib/lang/el_language_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Άρθρωμα'; $wb['lang_file_txt'] = 'Αρχείο Γλώσσας'; $wb['lang_file_date_txt'] = 'Τελευταία τροποποίηση'; ?> + diff --git a/interface/web/admin/lib/lang/el_package_install.lng b/interface/web/admin/lib/lang/el_package_install.lng index 468a82230..1c9858907 100644 --- a/interface/web/admin/lib/lang/el_package_install.lng +++ b/interface/web/admin/lib/lang/el_package_install.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Όνομα Χρήστη (προαιρετικό)'; $wb['repo_password_txt'] = 'Συνθηματικό (προαιρετικό)'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng index 7458f5851..59b017c4c 100644 --- a/interface/web/admin/lib/lang/el_remote_action.lng +++ b/interface/web/admin/lib/lang/el_remote_action.lng @@ -8,3 +8,4 @@ $wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβά $wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση'; $wb['select_all_server'] = 'Σε όλους τους servers'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng index 232d2ce86..4033a3425 100644 --- a/interface/web/admin/lib/lang/el_remote_user.lng +++ b/interface/web/admin/lib/lang/el_remote_user.lng @@ -39,5 +39,6 @@ $wb['DNS ptr functions'] = 'Ενέργειες εγγραφών ptr του DNS'; $wb['DNS rp functions'] = 'Ενέργειες εγγραφών rp του DNS'; $wb['DNS srv functions'] = 'Ενέργειες εγγραφών srv του DNS'; $wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS'; -$wb['Mail mailing list functions'] = 'Mail mailinglist functions'; +$wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist'; ?> + diff --git a/interface/web/admin/lib/lang/el_remote_user_list.lng b/interface/web/admin/lib/lang/el_remote_user_list.lng index 95522db7d..93fc165af 100644 --- a/interface/web/admin/lib/lang/el_remote_user_list.lng +++ b/interface/web/admin/lib/lang/el_remote_user_list.lng @@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Νέος Χρήστης'; $wb['parent_remote_userid_txt'] = 'ID'; $wb['username_txt'] = 'Όνομα Χρήστη'; ?> + diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng index 637ee62bd..2f961c64c 100644 --- a/interface/web/admin/lib/lang/el_server.lng +++ b/interface/web/admin/lib/lang/el_server.lng @@ -13,3 +13,4 @@ $wb['- None -'] = '- Κανενός -'; $wb['proxy_server_txt'] = 'Proxy-Server'; $wb['firewall_server_txt'] = 'Firewall-Server'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 8a9096c32..1f2a86e89 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications'; $wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications'; $wb['website_path_txt'] = 'Διαδρομή Website'; $wb['website_symlinks_txt'] = 'Website symlinks'; -$wb['website_symlinks_rel_txt'] = 'Make relative symlinks'; +$wb['website_symlinks_rel_txt'] = 'Δημιουργία σχετικών symlinks'; $wb['website_basedir_txt'] = 'Βασικός φάκελος Website'; $wb['vhost_conf_dir_txt'] = 'Φάκελος ρυθμίσεων Vhost'; $wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος ρυθμίσεων (ενεργών) Vhost'; @@ -75,26 +75,26 @@ $wb['named_conf_local_path_txt'] = 'Διαδρομή του named.conf.local τ $wb['php_ini_path_cgi_txt'] = 'Διαδρομή του php.ini για CGI'; $wb['php_ini_path_apache_txt'] = 'Διαδρομή του php.ini για Apache'; $wb['check_apache_config_txt'] = 'Έλεγχος των ρυθμίσεων του apache ή επαννεκίνηση'; -$wb['CA_path_txt'] = 'CA Path'; -$wb['CA_pass_txt'] = 'CA passphrase'; +$wb['CA_path_txt'] = 'Διαδρομή CA'; +$wb['CA_pass_txt'] = 'Συνθηματική φράση CA'; $wb['ufw_enable_txt'] = 'Enable'; -$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules'; -$wb['ufw_ipv6_txt'] = 'Enable IPv6'; -$wb['ufw_default_input_policy_txt'] = 'Default Input Policy'; -$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['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['ufw_manage_builtins_txt'] = 'Διαχείριση ενσωματωμένων κανόνων'; +$wb['ufw_ipv6_txt'] = 'Ενεργοποίηση IPv6'; +$wb['ufw_default_input_policy_txt'] = 'Προκαθορισμένη Πολιτική Εισόδου'; +$wb['ufw_default_output_policy_txt'] = 'Προκαθορισμένη Πολιτική Εξόδου'; +$wb['ufw_default_forward_policy_txt'] = 'Προκαθορισμένη Πολιτική Προώθησης'; +$wb['ufw_default_application_policy_txt'] = 'Προκαθορισμένη Πολιτική Εφαρμογών'; +$wb['ufw_log_level_txt'] = 'Επίπεδο Καταγραφής'; +$wb['network_config_warning_txt'] = 'Η επιλογή για την παραμετροποίηση του δικτύου είναι διαθέσιμη μόνο για Debian και Ubuntu Servers. Μην ενεργοποιείτε αυτή την επιλογή αν η (διεπαφή) κάρτα δικτύου δεν είναι η eth0.'; $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax'; $wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.'; -$wb['server_type_txt'] = 'Server Type'; +$wb['server_type_txt'] = 'Τύπος Server'; $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir'; $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir'; -$wb['nginx_user_txt'] = 'Nginx user'; -$wb['nginx_group_txt'] = 'Nginx group'; +$wb['nginx_user_txt'] = 'Χρήστης Nginx'; +$wb['nginx_group_txt'] = 'Ομάδα Nginx'; $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket'; -$wb['backup_dir_error_empty'] = 'Backup directory is empty.'; +$wb['backup_dir_error_empty'] = 'Ο φάκελος Backup είναι άδειος.'; $wb['maildir_path_error_empty'] = 'Maildir Path is empty.'; $wb['homedir_path_error_empty'] = 'Homedir Path is empty.'; $wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.'; @@ -150,3 +150,4 @@ $wb['rescue_description_txt'] = 'Information: If you want to shut down my $wb['enable_sni_txt'] = 'Enable SNI'; $wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_config_list.lng b/interface/web/admin/lib/lang/el_server_config_list.lng index 038e32976..e75bda011 100644 --- a/interface/web/admin/lib/lang/el_server_config_list.lng +++ b/interface/web/admin/lib/lang/el_server_config_list.lng @@ -2,3 +2,4 @@ $wb['list_head_txt'] = 'Ρυθμίσεις Server'; $wb['server_name_txt'] = 'Server'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_ip.lng b/interface/web/admin/lib/lang/el_server_ip.lng index 1a677861b..00185a1f1 100644 --- a/interface/web/admin/lib/lang/el_server_ip.lng +++ b/interface/web/admin/lib/lang/el_server_ip.lng @@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Type'; $wb['virtualhost_port_txt'] = 'HTTP Ports'; $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_ip_list.lng b/interface/web/admin/lib/lang/el_server_ip_list.lng index 9d24f06df..f19dc824b 100644 --- a/interface/web/admin/lib/lang/el_server_ip_list.lng +++ b/interface/web/admin/lib/lang/el_server_ip_list.lng @@ -3,8 +3,9 @@ $wb['list_head_txt'] = 'Διευθύνσεις IP'; $wb['server_id_txt'] = 'Server'; $wb['ip_address_txt'] = 'Διεύθυνση IP'; $wb['add_new_record_txt'] = 'Νέα διεύθυνση IP'; -$wb['client_id_txt'] = 'Client'; +$wb['client_id_txt'] = 'Πελάτης'; $wb['virtualhost_txt'] = 'HTTP Vhost'; -$wb['virtualhost_port_txt'] = 'HTTP Ports'; -$wb['ip_type_txt'] = 'Type'; +$wb['virtualhost_port_txt'] = 'Θύρες HTTP'; +$wb['ip_type_txt'] = 'Τύπος'; ?> + diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng index fa6c78eff..2f7b5695f 100644 --- a/interface/web/admin/lib/lang/el_server_list.lng +++ b/interface/web/admin/lib/lang/el_server_list.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng index 5e3d0fd40..5e1f63023 100644 --- a/interface/web/admin/lib/lang/el_software_package_install.lng +++ b/interface/web/admin/lib/lang/el_software_package_install.lng @@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Εισαγωγή κλειδιού εγκατάστασ $wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης'; $wb['btn_cancel_txt'] = 'Ακύρωση'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng index 463c46196..f3e22fbf1 100644 --- a/interface/web/admin/lib/lang/el_software_package_list.lng +++ b/interface/web/admin/lib/lang/el_software_package_list.lng @@ -6,5 +6,6 @@ $wb['package_description_txt'] = 'Περιγραφή'; $wb['action_txt'] = 'Ενέργεια'; $wb['toolsarea_head_txt'] = 'Πακέτα'; $wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων'; -$wb['package_id_txt'] = 'local App-ID'; +$wb['package_id_txt'] = 'τοπικό App-ID'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng index 5b1e2228e..d52666dec 100644 --- a/interface/web/admin/lib/lang/el_software_repo.lng +++ b/interface/web/admin/lib/lang/el_software_repo.lng @@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Χρήστης (Προαιρετικό)'; $wb['repo_password_txt'] = 'Συνθηματικό (Προαιρετικό)'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng index deb896a71..cb3f2c45d 100644 --- a/interface/web/admin/lib/lang/el_software_repo_list.lng +++ b/interface/web/admin/lib/lang/el_software_repo_list.lng @@ -4,3 +4,4 @@ $wb['active_txt'] = 'Ενεργό'; $wb['repo_name_txt'] = 'Αποθετήριο'; $wb['repo_url_txt'] = 'URL'; ?> + diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng index 7bdc66102..50a4b47e1 100644 --- a/interface/web/admin/lib/lang/el_software_update_list.lng +++ b/interface/web/admin/lib/lang/el_software_update_list.lng @@ -6,3 +6,4 @@ $wb['update_title_txt'] = 'Ενημέρωση'; $wb['version_txt'] = 'Έκδοση'; $wb['action_txt'] = 'Ενέργεια'; ?> + diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index 0f929c42e..6c5b8b53a 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -24,7 +24,8 @@ $wb['webftp_url_txt'] = 'URL του WebFTP'; $wb['enable_custom_login_txt'] = 'Allow custom login name'; $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list'; $wb['mailmailinglist_url_txt'] = 'Mailing list URL'; -$wb['admin_mail_txt'] = 'Administrators e-mail'; +$wb['admin_mail_txt'] = 'e-mail Διαχειριστών'; $wb['monitor_key_txt'] = 'Monitor keyword'; $wb['admin_name_txt'] = 'Administrators name'; ?> + diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng index db913587c..eacd3853f 100644 --- a/interface/web/admin/lib/lang/el_users.lng +++ b/interface/web/admin/lib/lang/el_users.lng @@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Συνθηματικό'; $wb['password_strength_txt'] = 'Δύναμη Συνθηματικού'; $wb['modules_txt'] = 'Άρθρωμα'; $wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης'; -$wb['app_theme_txt'] = 'Design'; +$wb['app_theme_txt'] = 'Θεματική Παραλλαγή'; $wb['typ_txt'] = 'Τύπος'; $wb['active_txt'] = 'Ενεργός'; $wb['language_txt'] = 'Γλώσσα'; @@ -26,3 +26,4 @@ $wb['groups_txt'] = 'Ομάδες'; $wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα'; $wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.'; ?> + diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng index eee43054f..69b640db7 100644 --- a/interface/web/admin/lib/lang/el_users_list.lng +++ b/interface/web/admin/lib/lang/el_users_list.lng @@ -7,3 +7,4 @@ $wb['ort_txt'] = 'πόλη'; $wb['add_new_record_txt'] = 'Νέος Χρήστης'; $wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!'; ?> + diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng index ee89b2e30..e2bb0ab1f 100644 --- a/interface/web/client/lib/lang/el.lng +++ b/interface/web/client/lib/lang/el.lng @@ -11,3 +11,4 @@ $wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή'; $wb['Resellers'] = 'Μεταπωλητές'; $wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.'; ?> + diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index a79478d7f..44e2bf1f9 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -98,10 +98,11 @@ $wb['limit_trafficquota_error_notint'] = 'Το Όριο κίνησης δεδο $wb['customer_no_txt'] = 'Κωδ. Πελάτη'; $wb['vat_id_txt'] = 'Α.Φ.Μ'; $wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['company_id_txt'] = 'Company/Entrepreneur ID'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.'; +$wb['company_id_txt'] = 'ID Εταιρίας/Επιχείρησης'; +$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers'; +$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server'; +$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; ?> + diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng index ef21bfe21..7bd428457 100644 --- a/interface/web/client/lib/lang/el_client_del.lng +++ b/interface/web/client/lib/lang/el_client_del.lng @@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Η ενέργεια θα διαγράψει τις $wb['btn_save_txt'] = 'Διαγραφή πελάτη'; $wb['btn_cancel_txt'] = 'Ακύρωση χωρίς διαγραφή πελάτη'; ?> + diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index b3a282d2d..c2e604463 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -60,13 +60,14 @@ $wb['limit_web_quota_txt'] = 'Όριο Web'; $wb['limit_traffic_quota_txt'] = 'Όριο Κίνησης δεδομένων'; $wb['limit_trafficquota_error_notint'] = 'Το Όριο Κίνησης δεδομένων πρέπει να είναι αριθμός.'; $wb['template_del_aborted_txt'] = 'Η διαγραφή ακυρώθηκε. Υπάρχει τουλάχιστον ένας πελάτης που έχει το πρότυπο ενεργοποιημένο.'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; -$wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; -$wb['web_php_options_txt'] = 'PHP Options'; -$wb['template_type_txt'] = 'Template type'; -$wb['template_name_txt'] = 'Template name'; +$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.'; +$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers'; +$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server'; +$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; +$wb['ssh_chroot_txt'] = 'Επιλογές SSH-Chroot'; +$wb['web_php_options_txt'] = 'Επιλογές PHP'; +$wb['template_type_txt'] = 'Τύπος προτύπου'; +$wb['template_name_txt'] = 'Όνομα προτύπου'; ?> + diff --git a/interface/web/client/lib/lang/el_client_template_list.lng b/interface/web/client/lib/lang/el_client_template_list.lng index 1ce866d23..30e6969e3 100644 --- a/interface/web/client/lib/lang/el_client_template_list.lng +++ b/interface/web/client/lib/lang/el_client_template_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Πρότυπα Πελάτη'; $wb['template_type_txt'] = 'Τύπος'; $wb['template_name_txt'] = 'Όνομα Προτύπου'; ?> + diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng index 5b80e283d..dd652bfd6 100644 --- a/interface/web/client/lib/lang/el_clients_list.lng +++ b/interface/web/client/lib/lang/el_clients_list.lng @@ -8,3 +8,4 @@ $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νέος Πελάτης'; $wb['username_txt'] = 'Username'; ?> + diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index 9a4751afc..f3e2dffd9 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -96,12 +96,13 @@ $wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρ $wb['customer_no_txt'] = 'Α/Α Πελάτη'; $wb['vat_id_txt'] = 'Α.Φ.Μ.'; $wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία'; -$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['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_webdav_user_txt'] = 'Μέγιστο πλήθος χρηστών Webdav'; +$wb['limit_webdav_user_error_notint'] = 'Το όριο χρηστών webdav user πρέπει να είναι αριθμός.'; +$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists'; +$wb['limit_mailaliasdomain_txt'] = 'Μέγιστο πλήθος ψευδονύμων domain'; +$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.'; +$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers'; +$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server'; +$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.'; ?> + diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng index 78f7c2389..53eecc98d 100644 --- a/interface/web/client/lib/lang/el_resellers_list.lng +++ b/interface/web/client/lib/lang/el_resellers_list.lng @@ -7,3 +7,4 @@ $wb['city_txt'] = 'Πόλη'; $wb['country_txt'] = 'Χώρα'; $wb['add_new_record_txt'] = 'Νεός Μεταπωλητής'; ?> + diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php index e1828aa4a..88d459f33 100644 --- a/interface/web/dashboard/dashboard.php +++ b/interface/web/dashboard/dashboard.php @@ -98,16 +98,16 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { $v2 = $_SESSION['s']['new_ispconfig_version']; $this_version = explode(".",$v1); $this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) . - (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . - (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . - (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]); + ((isset($this_version[1]) && $this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . + ((isset($this_version[2]) && $this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . + ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]); $new_version = explode(".",$v2); $new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) . - (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . - (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . - (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]); + ((isset($new_version[1]) && $new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . + ((isset($new_version[2]) && $new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . + ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]); if($new_fullversion > $this_fullversion) { $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available!
' . 'This Version: ' . $v1 . '
' . diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng index 144becd21..39bf4b868 100644 --- a/interface/web/dashboard/lib/lang/el.lng +++ b/interface/web/dashboard/lib/lang/el.lng @@ -2,3 +2,4 @@ $wb['welcome_user_txt'] = 'Καλωσήρθατε %s'; $wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα'; ?> + diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng index 13940bd52..351e98231 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng @@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Πλήθος Πελατών'; $wb['limit_database_txt'] = 'Πλήθος Databases'; $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists'; ?> + diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng index 95f750a58..17d42ed2e 100644 --- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng index acb6c3546..29f4a51ef 100644 --- a/interface/web/designer/lib/lang/el.lng +++ b/interface/web/designer/lib/lang/el.lng @@ -1,2 +1,3 @@ + diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng index 04ebc02db..1e653873f 100644 --- a/interface/web/designer/lib/lang/el_form_edit.lng +++ b/interface/web/designer/lib/lang/el_form_edit.lng @@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Perm. User'; $wb['auth_preset_perm_group_txt'] = 'Perm. Group'; $wb['auth_preset_perm_other_txt'] = 'Perm. Other'; ?> + diff --git a/interface/web/designer/lib/lang/el_form_list.lng b/interface/web/designer/lib/lang/el_form_list.lng index 4cf043aef..f428b6935 100644 --- a/interface/web/designer/lib/lang/el_form_list.lng +++ b/interface/web/designer/lib/lang/el_form_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Άρθρωμα'; $wb['title_txt'] = 'Τίτλος'; $wb['description_txt'] = 'Περιγραφή'; ?> + diff --git a/interface/web/designer/lib/lang/el_form_show.lng b/interface/web/designer/lib/lang/el_form_show.lng index cf51060a2..1cedf2676 100644 --- a/interface/web/designer/lib/lang/el_form_show.lng +++ b/interface/web/designer/lib/lang/el_form_show.lng @@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Διαγραφή αρθρώματος και όλων $wb['menu_del_txt'] = 'Διαγραφή μενού και όλων των στοιχείων;'; $wb['item_del_txt'] = 'Διαγραφή του στοιχείου μενού'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_edit.lng b/interface/web/designer/lib/lang/el_module_edit.lng index 733e2aec8..a253cbc0b 100644 --- a/interface/web/designer/lib/lang/el_module_edit.lng +++ b/interface/web/designer/lib/lang/el_module_edit.lng @@ -10,3 +10,4 @@ $wb['cancel_txt'] = 'Ακύρωση'; $wb['header_txt'] = 'Ιδιότητες αρθρώματος'; $wb['description_txt'] = 'Περιγραφή

Όνομα αρθρώματος: Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.
Τίτλος Αρθώματος: Θα εμφανιστεί στο βασικό μενού (επάνω).
Αρχείο προτύπου: Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.
NaviFrame: Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.
Προεπιλεγμένη Σελίδα: Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.
Πλάτος Καρτέλας:Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).
Βοήθεια: Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο '; ?> + diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng index 1edbed0f7..c5c484d16 100644 --- a/interface/web/designer/lib/lang/el_module_list.lng +++ b/interface/web/designer/lib/lang/el_module_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend Άρθρωμα'; $wb['module_txt'] = 'Άρθρωμα'; $wb['title_txt'] = 'Τίτλος'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_nav_edit.lng b/interface/web/designer/lib/lang/el_module_nav_edit.lng index 02104add2..b41f138a2 100644 --- a/interface/web/designer/lib/lang/el_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/el_module_nav_edit.lng @@ -4,3 +4,4 @@ $wb['header_txt'] = 'Ιδιότητες Navi'; $wb['save_txt'] = 'Αποθήκευση'; $wb['cancel_txt'] = 'Άκυρο'; ?> + diff --git a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng index 82a9ecff5..af3c434ac 100644 --- a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng index 12895ccc6..be99c925b 100644 --- a/interface/web/designer/lib/lang/el_module_show.lng +++ b/interface/web/designer/lib/lang/el_module_show.lng @@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Θέλετε να διαγράψετε το άρθωμ $wb['menu_del_txt'] = 'Θέλετε να διαγράψετε το μενού και όλα τα στοιχεία του;'; $wb['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;'; ?> + diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php index 8ad327559..3aaaf3f87 100644 --- a/interface/web/dns/dns_import.php +++ b/interface/web/dns/dns_import.php @@ -256,6 +256,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); break; + case 'txt': + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1); + if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1); + break; default: $dns_rr[$r]['aux'] = 0; $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); @@ -274,6 +280,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); break; + case 'txt': + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1); + if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1); + break; default: $dns_rr[$r]['aux'] = 0; $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); @@ -292,6 +304,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); break; + case 'txt': + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1); + if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1); + break; default: $dns_rr[$r]['aux'] = 0; $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); @@ -310,6 +328,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); break; + case 'txt': + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1); + if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1); + break; default: $dns_rr[$r]['aux'] = 0; $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); @@ -330,6 +354,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name' $dns_rr[$r]['aux'] = intval($parts[$pkey+1]); $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2)); break; + case 'txt': + $dns_rr[$r]['aux'] = 0; + $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); + if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1); + if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1); + break; default: $dns_rr[$r]['aux'] = 0; $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1)); diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng index 071cac295..45144226e 100644 --- a/interface/web/dns/lib/lang/el.lng +++ b/interface/web/dns/lib/lang/el.lng @@ -17,7 +17,8 @@ $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'; +$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης εισήχθηκε επιτυχώς!'; +$wb['error_no_valid_zone_file_txt'] = 'Το αρχείο ζώνης φαίνεται να μην είναι έγκυρο!'; +$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_a.lng b/interface/web/dns/lib/lang/el_dns_a.lng index 4f20e9e68..7772b5ff0 100644 --- a/interface/web/dns/lib/lang/el_dns_a.lng +++ b/interface/web/dns/lib/lang/el_dns_a.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Η διεύθυνση IP είναι κενή'; $wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση'; $wb['data_error_duplicate'] = 'Διπλή εγγραφή A-Record ή CNAME-Record'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_a_list.lng b/interface/web/dns/lib/lang/el_dns_a_list.lng index 30b3143b9..05ed36039 100644 --- a/interface/web/dns/lib/lang/el_dns_a_list.lng +++ b/interface/web/dns/lib/lang/el_dns_a_list.lng @@ -12,3 +12,4 @@ $wb['page_txt'] = 'Σελίδα'; $wb['page_of_txt'] = 'από'; $wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγγραφή;'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_aaaa.lng b/interface/web/dns/lib/lang/el_dns_aaaa.lng index 77728e3c3..76a46877c 100644 --- a/interface/web/dns/lib/lang/el_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/el_dns_aaaa.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ $wb['data_error_empty'] = 'Διεύθυνση IP κενή'; $wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng index 9d2935402..46bcfe284 100644 --- a/interface/web/dns/lib/lang/el_dns_alias.lng +++ b/interface/web/dns/lib/lang/el_dns_alias.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname έχει λάθος μορφοποίη $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί'; $wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_cname.lng b/interface/web/dns/lib/lang/el_dns_cname.lng index cc10beb11..4a8cc63ab 100644 --- a/interface/web/dns/lib/lang/el_dns_cname.lng +++ b/interface/web/dns/lib/lang/el_dns_cname.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει ο $wb['data_error_regex'] = 'Hostname Προορισμός με μη έγκυρη μορφοποίηση'; $wb['data_error_duplicate'] = 'Διπλοεγγραφή A-Record ή CNAME-Record'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng index 457213e60..8c869537a 100644 --- a/interface/web/dns/lib/lang/el_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ $wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές'; $wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng index 890cfc921..85718b7ca 100644 --- a/interface/web/dns/lib/lang/el_dns_mx.lng +++ b/interface/web/dns/lib/lang/el_dns_mx.lng @@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ $wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί'; $wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_ns.lng b/interface/web/dns/lib/lang/el_dns_ns.lng index 02e157265..06ad7cf87 100644 --- a/interface/web/dns/lib/lang/el_dns_ns.lng +++ b/interface/web/dns/lib/lang/el_dns_ns.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Η ζώνη δεν έχει σωστή μορφοπο $wb['data_error_empty'] = 'Ο Nameserver δεν έχει οριστεί'; $wb['data_error_regex'] = 'Η μορφοποίηση του Nameserver δεν είναι σωστή'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_ptr.lng b/interface/web/dns/lib/lang/el_dns_ptr.lng index bcd431ecd..ceb8b1389 100644 --- a/interface/web/dns/lib/lang/el_dns_ptr.lng +++ b/interface/web/dns/lib/lang/el_dns_ptr.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το όνομα δεν έχει σωστή μορφο $wb['data_error_empty'] = 'Το Κανονικοποιημένο hostname δεν έχει οριστεί'; $wb['data_error_regex'] = 'Κανονικοποιημένο hostname με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_rp.lng b/interface/web/dns/lib/lang/el_dns_rp.lng index 83fd36d02..b63597c85 100644 --- a/interface/web/dns/lib/lang/el_dns_rp.lng +++ b/interface/web/dns/lib/lang/el_dns_rp.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ $wb['data_error_empty'] = 'Το πρόσωπο επικοινωνίας δεν έχει οριστεί.'; $wb['data_error_regex'] = 'Η μορφοποίηση του υπεύθυνου δεν είναι έγκυρη'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng index 469362845..ae3f5d004 100644 --- a/interface/web/dns/lib/lang/el_dns_slave.lng +++ b/interface/web/dns/lib/lang/el_dns_slave.lng @@ -11,6 +11,7 @@ $wb['origin_error_empty'] = 'Η ζώνη είναι κενή.'; $wb['origin_error_unique'] = 'Υπάρχει ήδη μια εγγραφή για αυτή την ζώνη.'; $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφοποίηση.'; $wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.'; -$wb['eg_domain_tld'] = 'e.g. domain.tld.'; -$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4'; +$wb['eg_domain_tld'] = 'π.χ. domain.tld.'; +$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_slave_list.lng b/interface/web/dns/lib/lang/el_dns_slave_list.lng index a20a32859..aa50cae6f 100644 --- a/interface/web/dns/lib/lang/el_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/el_dns_slave_list.lng @@ -5,5 +5,6 @@ $wb['server_id_txt'] = 'Server'; $wb['origin_txt'] = 'Ζώνη'; $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Νέα Δευτερεύουσα ζώνη DNS'; -$wb['eg_domain_tld'] = 'e.g. domain.tld.'; +$wb['eg_domain_tld'] = 'π.χ. domain.tld.'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng index c4dd31138..a05a49e2c 100644 --- a/interface/web/dns/lib/lang/el_dns_soa.lng +++ b/interface/web/dns/lib/lang/el_dns_soa.lng @@ -21,11 +21,12 @@ $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφο $wb['ns_error_regex'] = 'NS με μη έγκυρη μορφοποίηση.'; $wb['mbox_error_empty'] = 'Το Email δεν έχει οριστεί.'; $wb['mbox_error_regex'] = 'Email με μη έγκυρη μορφοποίηση.'; -$wb['also_notify_txt'] = 'Also Notify'; -$wb['also_notify_error_regex'] = 'Please use an IP address.'; -$wb['update_acl_txt'] = 'Update ACL'; -$wb['seconds_txt'] = 'Seconds'; -$wb['eg_domain_tld'] = 'e.g. domain.tld'; -$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld'; -$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld'; +$wb['also_notify_txt'] = 'Ειδοποίηση επίσης σε'; +$wb['also_notify_error_regex'] = 'Παρακαλούμε χρησιμοποιείστε μια διεύθυνση IP.'; +$wb['update_acl_txt'] = 'Ανανέωση ACL'; +$wb['seconds_txt'] = 'Δευτερόλεπτα'; +$wb['eg_domain_tld'] = 'π.χ. domain.tld'; +$wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld'; +$wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng index 99c1d73d9..17446da45 100644 --- a/interface/web/dns/lib/lang/el_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng @@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'Email'; $wb['add_new_record_wizard_txt'] = 'Νέα ζώνη DNS με Οδηγό'; $wb['add_new_record_txt'] = 'Νέα ζώνη DNS (χειροκίνητα)'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng index 01901ce6a..1dc24f902 100644 --- a/interface/web/dns/lib/lang/el_dns_srv.lng +++ b/interface/web/dns/lib/lang/el_dns_srv.lng @@ -15,3 +15,4 @@ $wb['data_error_empty'] = 'Η εγγραφή Server είναι κενή'; $wb['data_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση'; $wb['srv_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση. Η εγγραφή Server πρέπει να περιέχει 3 λέξεις χωρισμένες με κενά.'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng index 20e9bf81b..2ba9b4dab 100644 --- a/interface/web/dns/lib/lang/el_dns_template.lng +++ b/interface/web/dns/lib/lang/el_dns_template.lng @@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Πεδία'; $wb['template_txt'] = 'Πρότυπο'; $wb['visible_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_template_list.lng b/interface/web/dns/lib/lang/el_dns_template_list.lng index ff676a1c1..64da2e810 100644 --- a/interface/web/dns/lib/lang/el_dns_template_list.lng +++ b/interface/web/dns/lib/lang/el_dns_template_list.lng @@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Ορατός'; $wb['name_txt'] = 'Όνομα'; $wb['add_new_record_txt'] = 'Νέα εγγραφή'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_txt.lng b/interface/web/dns/lib/lang/el_dns_txt.lng index 62c2dc8be..c98ceca5d 100644 --- a/interface/web/dns/lib/lang/el_dns_txt.lng +++ b/interface/web/dns/lib/lang/el_dns_txt.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ $wb['data_error_empty'] = 'Το κείμενο δεν έχει οριστεί'; $wb['data_error_regex'] = 'Κείμενο με μη έγκυρη μορφοποίηση'; ?> + diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng index 6275c5619..6ed6d91a3 100644 --- a/interface/web/dns/lib/lang/el_dns_wizard.lng +++ b/interface/web/dns/lib/lang/el_dns_wizard.lng @@ -27,3 +27,4 @@ $wb['error_ns1_regex'] = 'Ο NS1 περιέχει μη επιτρεπόμενο $wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.'; ?> + diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 5d563310b..b353094de 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -11,7 +11,7 @@
DNS Zone
- {tmpl_var name='template_id_option'}
diff --git a/interface/web/domain/lib/lang/el.lng b/interface/web/domain/lib/lang/el.lng index c1f1284fb..aab3355e1 100644 --- a/interface/web/domain/lib/lang/el.lng +++ b/interface/web/domain/lib/lang/el.lng @@ -7,3 +7,4 @@ $wb['error_domain_in webuse'] = 'Αυτό το domain δεν μπορεί να $wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain'; $wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε πελάτη
'; ?> + diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng index 696d10da4..79bf5a86d 100644 --- a/interface/web/domain/lib/lang/el_domain.lng +++ b/interface/web/domain/lib/lang/el_domain.lng @@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Το όνομα domain υπάρχει'; $wb['domain_error_regex'] = 'Το όνομα domain δεν επιτρέπεται'; $wb['Domain'] = 'Domain'; ?> + diff --git a/interface/web/domain/lib/lang/el_domain_list.lng b/interface/web/domain/lib/lang/el_domain_list.lng index 943003863..7d3a53bdd 100644 --- a/interface/web/domain/lib/lang/el_domain_list.lng +++ b/interface/web/domain/lib/lang/el_domain_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Domains'; $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/help/lib/lang/ar_help_faq_list.lng b/interface/web/help/lib/lang/ar_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/ar_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/bg_help_faq_list.lng b/interface/web/help/lib/lang/bg_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/bg_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/br_help_faq_list.lng b/interface/web/help/lib/lang/br_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/br_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/de_help_faq_list.lng b/interface/web/help/lib/lang/de_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/de_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/el.lng b/interface/web/help/lib/lang/el.lng index 2a379411e..1a690af19 100644 --- a/interface/web/help/lib/lang/el.lng +++ b/interface/web/help/lib/lang/el.lng @@ -6,9 +6,10 @@ $wb['View messages'] = 'Προβολή μηνυμάτων'; $wb['Support'] = 'Υποστήριξη'; $wb['About ISPConfig'] = 'Πληροφορίες για το ISPConfig'; $wb['Version'] = 'Έκδοση'; -$wb['Frequently Asked Questions'] = 'Frequently Asked Questions'; -$wb['FAQ Sections'] = 'FAQ Sections'; -$wb['Manage Sections'] = 'Manage Sections'; -$wb['Add a Question & Answer Pair'] = 'Add a Question & Answer Pair'; -$wb['Manage Questions'] = 'Manage Questions'; +$wb['Frequently Asked Questions'] = 'Συχνές Ερωτήσεις'; +$wb['FAQ Sections'] = 'Ενότητες Ερωτήσεων'; +$wb['Manage Sections'] = 'Διαχείριση Ενοτήτων'; +$wb['Add a Question & Answer Pair'] = 'Προσθήκη ζεύγους Ερώτησης - Απάντησης'; +$wb['Manage Questions'] = 'Διαχείριση Ερωτήσεων'; ?> + diff --git a/interface/web/help/lib/lang/el_faq_form.lng b/interface/web/help/lib/lang/el_faq_form.lng index dfc4e8799..9f84708f2 100644 --- a/interface/web/help/lib/lang/el_faq_form.lng +++ b/interface/web/help/lib/lang/el_faq_form.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng index 54e727dea..a05a0a824 100644 --- a/interface/web/help/lib/lang/el_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/el_faq_manage_questions_list.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/help/lib/lang/el_faq_sections_form.lng b/interface/web/help/lib/lang/el_faq_sections_form.lng index dab0863b8..e8fdc0a2c 100644 --- a/interface/web/help/lib/lang/el_faq_sections_form.lng +++ b/interface/web/help/lib/lang/el_faq_sections_form.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/el_help_faq_list.lng b/interface/web/help/lib/lang/el_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/el_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/el_help_faq_sections_list.lng b/interface/web/help/lib/lang/el_help_faq_sections_list.lng index cb6ce84c0..081162991 100644 --- a/interface/web/help/lib/lang/el_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/el_help_faq_sections_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/help/lib/lang/el_support_message.lng b/interface/web/help/lib/lang/el_support_message.lng index 7ac0adfdf..1613a71e5 100644 --- a/interface/web/help/lib/lang/el_support_message.lng +++ b/interface/web/help/lib/lang/el_support_message.lng @@ -4,5 +4,6 @@ $wb['sender_id_txt'] = 'ID Αποστολέα'; $wb['subject_txt'] = 'Θέμα'; $wb['message_txt'] = 'Μήνυμα'; $wb['tstamp_txt'] = 'Ημερομηνία/Ώρα'; -$wb['reply_txt'] = 'Reply'; +$wb['reply_txt'] = 'Απάντηση'; ?> + diff --git a/interface/web/help/lib/lang/el_support_message_list.lng b/interface/web/help/lib/lang/el_support_message_list.lng index e8b2cf338..97381d836 100644 --- a/interface/web/help/lib/lang/el_support_message_list.lng +++ b/interface/web/help/lib/lang/el_support_message_list.lng @@ -4,3 +4,4 @@ $wb['sender_id_txt'] = 'Αποστολέας'; $wb['subject_txt'] = 'Θέμα'; $wb['add_new_record_txt'] = 'Νέο μήνυμα υποστήριξης'; ?> + diff --git a/interface/web/help/lib/lang/en_help_faq_list.lng b/interface/web/help/lib/lang/en_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/en_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/es_help_faq_list.lng b/interface/web/help/lib/lang/es_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/es_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/fi_help_faq_list.lng b/interface/web/help/lib/lang/fi_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/fi_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/fr_help_faq_list.lng b/interface/web/help/lib/lang/fr_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/fr_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/hr_help_faq_list.lng b/interface/web/help/lib/lang/hr_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/hr_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/hu_help_faq_list.lng b/interface/web/help/lib/lang/hu_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/hu_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/id_help_faq_list.lng b/interface/web/help/lib/lang/id_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/id_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/it_help_faq_list.lng b/interface/web/help/lib/lang/it_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/it_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/ja_help_faq_list.lng b/interface/web/help/lib/lang/ja_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/ja_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/nl_help_faq_list.lng b/interface/web/help/lib/lang/nl_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/nl_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/pl_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/pt_help_faq_list.lng b/interface/web/help/lib/lang/pt_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/pt_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/ro_help_faq_list.lng b/interface/web/help/lib/lang/ro_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/ro_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/ru_help_faq_list.lng b/interface/web/help/lib/lang/ru_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/ru_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/se_help_faq_list.lng b/interface/web/help/lib/lang/se_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/se_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/sk_help_faq_list.lng b/interface/web/help/lib/lang/sk_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/sk_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/lib/lang/tr_help_faq_list.lng b/interface/web/help/lib/lang/tr_help_faq_list.lng new file mode 100644 index 000000000..b6c7b460b --- /dev/null +++ b/interface/web/help/lib/lang/tr_help_faq_list.lng @@ -0,0 +1,3 @@ + diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index cba74d2ae..2451c9f41 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -11,7 +11,7 @@ href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpses > Delete -Edit +{tmpl_var name="edit_txt"}


diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng index e9056a43e..849537b27 100644 --- a/interface/web/login/lib/lang/el.lng +++ b/interface/web/login/lib/lang/el.lng @@ -15,3 +15,4 @@ $wb['username_txt'] = 'Όνομα χρήστη'; $wb['password_txt'] = 'Συνθηματικό'; $wb['login_button_txt'] = 'Είσοδος'; ?> + diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng index d3d25ffad..5180b8d9e 100644 --- a/interface/web/mail/lib/lang/el.lng +++ b/interface/web/mail/lib/lang/el.lng @@ -45,3 +45,4 @@ $wb['Global Filters'] = 'Καθολικά Φίλτρα'; $wb['Domain Alias'] = 'Ψευδώνυμο Domain'; $wb['Relay Recipients'] = 'Παραλήπτες Relay'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng index 767b35a85..8b8a3ae3f 100644 --- a/interface/web/mail/lib/lang/el_mail_alias.lng +++ b/interface/web/mail/lib/lang/el_mail_alias.lng @@ -10,3 +10,4 @@ $wb['limit_mailalias_txt'] = 'Έχετε φτάσει το μέγιστο πλή $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email'; $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_alias_list.lng b/interface/web/mail/lib/lang/el_mail_alias_list.lng index f6dc4576b..b3e1f7ef4 100644 --- a/interface/web/mail/lib/lang/el_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/el_mail_alias_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Προορισμός'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέο Ψευδώνυμο Email'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng index d4a165815..52f26a057 100644 --- a/interface/web/mail/lib/lang/el_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/el_mail_aliasdomain.lng @@ -4,8 +4,9 @@ $wb['destination_txt'] = 'Προορισμός'; $wb['active_txt'] = 'Ενεργό'; $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα σε αυτό το domain.'; $wb['limit_mailaliasdomain_txt'] = 'Το μέγιστο πλήθος των ψευδωνύμων email domains για τον λογαριασμό σας, έχει εξαντληθεί'; -$wb['source_destination_identical_txt'] = 'Τα Domain Πηγή και Προορισμός είναι ίδια'; +$wb['source_destination_identical_txt'] = 'Τα Domain Εκκίνησης και Προορισμού είναι ίδια'; $wb['source_error_empty'] = 'Το Domain Πηγή δεν έχει οριστεί'; $wb['source_error_unique'] = 'Το Domain Πηγή πρέπει να είναι μοναδικό'; -$wb['source_error_regex'] = 'Μή έγκυρο όνομα για το Domain Πηγή'; +$wb['source_error_regex'] = 'Μή έγκυρο όνομα για το Domain Εκκίνησης'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng index fa50e87bb..dbbe30060 100644 --- a/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng @@ -5,3 +5,4 @@ $wb['source_txt'] = 'Πηγή'; $wb['destination_txt'] = 'Προορισμός'; $wb['add_new_record_txt'] = 'Νέο ψευδωνύμο Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng index 479a3deb0..75485e4f1 100644 --- a/interface/web/mail/lib/lang/el_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή.'; $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng index a2f23fd05..3f3a4d288 100644 --- a/interface/web/mail/lib/lang/el_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_blacklist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Παραλήπτης'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist'; $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_content_filter.lng b/interface/web/mail/lib/lang/el_mail_content_filter.lng index 46c6d8007..c974878b0 100644 --- a/interface/web/mail/lib/lang/el_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/el_mail_content_filter.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Ενέργεια'; $wb['active_txt'] = 'Ενεργό'; $wb['pattern_error_empty'] = 'Το μοτίβο δεν έχει οριστεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng index 2103b5cd1..200058fcf 100644 --- a/interface/web/mail/lib/lang/el_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_content_filter_list.lng @@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Μοτίβο'; $wb['action_txt'] = 'Ενέργεια'; $wb['add_new_record_txt'] = 'Νέο φίλτρο περιεχομένου'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng index 7e825ad4b..9c29f4755 100644 --- a/interface/web/mail/lib/lang/el_mail_domain.lng +++ b/interface/web/mail/lib/lang/el_mail_domain.lng @@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλ $wb['policy_txt'] = 'Spamfilter'; $wb['no_policy'] = '- ανενεργό -'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng index b3be224d5..4a1a84ed8 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_admin_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['active_txt'] = 'Ενεργό'; $wb['sys_groupid_txt'] = 'Πελάτης'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng index 2465af0d3..fdf5e4082 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng @@ -7,3 +7,4 @@ $wb['no_domain_perm'] = 'Δεν έχετε δικαιώματα για αυτό $wb['domain_error_regex'] = 'Μη έγκρυρο όνομα domain ή το όνομα περιέχει μη επιτρεπόμενους χαρακτήρες'; $wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email catchall για τον λογαριασμό σας, έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng index e21ecb7f7..55d0e08bd 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο Catchall'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_domain_list.lng b/interface/web/mail/lib/lang/el_mail_domain_list.lng index 89fb44aa2..393171c43 100644 --- a/interface/web/mail/lib/lang/el_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/el_mail_domain_list.lng @@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο Domain'; $wb['active_txt'] = 'Ενεργό'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng index d9066d275..024507096 100644 --- a/interface/web/mail/lib/lang/el_mail_forward.lng +++ b/interface/web/mail/lib/lang/el_mail_forward.lng @@ -6,3 +6,4 @@ $wb['limit_mailforward_txt'] = 'Το μέγιστο πλήθος των email fo $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email'; $wb['domain_txt'] = 'Domain'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_forward_list.lng b/interface/web/mail/lib/lang/el_mail_forward_list.lng index 623c4f266..11e5650dc 100644 --- a/interface/web/mail/lib/lang/el_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/el_mail_forward_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Προορισμός'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέα προώθηση Email'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_get.lng b/interface/web/mail/lib/lang/el_mail_get.lng index 66d2cb3dc..4cba32614 100644 --- a/interface/web/mail/lib/lang/el_mail_get.lng +++ b/interface/web/mail/lib/lang/el_mail_get.lng @@ -13,5 +13,6 @@ $wb['source_username_error_isempty'] = 'Το Όνομα Χρήστη δεν έχ $wb['source_password_error_isempty'] = 'Το Συνθηματικό δεν έχει οριστεί.'; $wb['destination_error_isemail'] = 'Δεν επιλέχθηκε προορισμός.'; $wb['source_server_error_regex'] = 'Το όνομα του Pop3/Imap Server δεν είναι έγκυρο.'; -$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)'; +$wb['source_read_all_txt'] = 'Ανάκτηση όλων των emails (συμπερ. αναγνωσμένων mails)'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_get_list.lng b/interface/web/mail/lib/lang/el_mail_get_list.lng index 049088974..658e6b27e 100644 --- a/interface/web/mail/lib/lang/el_mail_get_list.lng +++ b/interface/web/mail/lib/lang/el_mail_get_list.lng @@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'Όνομα Χρήστη'; $wb['destination_txt'] = 'Προορισμός'; $wb['add_new_record_txt'] = 'Νέος Λογαρισμός'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist.lng b/interface/web/mail/lib/lang/el_mail_mailinglist.lng index d9c3059f1..485d7a1b7 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist.lng @@ -1,15 +1,16 @@ + diff --git a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng index dac225ad9..4701821ca 100644 --- a/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_mailinglist_list.lng @@ -1,5 +1,6 @@ + diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng index 8a643627f..769e30661 100644 --- a/interface/web/mail/lib/lang/el_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/el_mail_relay_recipient.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή'; $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας, εξαντλήθηκε.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng index 80298c1e6..1028112c9 100644 --- a/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng @@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Παραλήπτης'; $wb['add_new_record_txt'] = 'Νέος παραλήπτης relay'; $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter.lng b/interface/web/mail/lib/lang/el_mail_spamfilter.lng index 48c4eaa4c..b6cd7197a 100644 --- a/interface/web/mail/lib/lang/el_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/el_mail_spamfilter.lng @@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Υπάρχει ήδη μια εγγραφή φίλ $wb['spam_redirect_maildir_purge_txt'] = 'Εκκαθάριση φακέλου mail μετά'; $wb['days_txt'] = 'Ημέρες.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng index 9468e4e9d..4b2f141cc 100644 --- a/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_spamfilter_list.lng @@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'Όνομα Server'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή φίλτρου Spam'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_transport.lng b/interface/web/mail/lib/lang/el_mail_transport.lng index ab097e31d..34c779dbf 100644 --- a/interface/web/mail/lib/lang/el_mail_transport.lng +++ b/interface/web/mail/lib/lang/el_mail_transport.lng @@ -8,3 +8,4 @@ $wb['sort_order_txt'] = 'Ταξινόμηση κατά'; $wb['active_txt'] = 'Ενεργό'; $wb['limit_mailrouting_txt'] = 'Το μέγιστο πλήθος των δρομολογήσεων email για τον λογαριασμό σας, εξαντλήθηκε.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_transport_list.lng b/interface/web/mail/lib/lang/el_mail_transport_list.lng index 249eee9e5..72ae994ea 100644 --- a/interface/web/mail/lib/lang/el_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/el_mail_transport_list.lng @@ -7,3 +7,4 @@ $wb['transport_txt'] = 'Μεταφορά'; $wb['sort_order_txt'] = 'Ταξινόμηση κατά'; $wb['add_new_record_txt'] = 'Νέα μεταφορά'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng index a2ea16026..dd2e6847c 100644 --- a/interface/web/mail/lib/lang/el_mail_user.lng +++ b/interface/web/mail/lib/lang/el_mail_user.lng @@ -1,44 +1,45 @@ 1'; -$wb['move_junk_txt'] = 'Μετακίνηση των Spam Emails στο φάκελο Junk'; -$wb['name_txt'] = 'Πραγματικό Όνομα'; -$wb['name_optional_txt'] = '(Προαιρετικό)'; -$wb['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης'; -$wb['cc_txt'] = 'Αποστολή αντιγράφου σε '; -$wb['cc_error_isemail'] = 'Το '; -$wb['domain_txt'] = 'Domain'; -$wb['now_txt'] = 'Now'; -$wb['login_error_unique'] = 'Login is already taken.'; -$wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.'; -$wb['login_txt'] = 'Login (optional)'; -$wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.'; +$wb['custom_mailfilter_txt'] = "Προσαρμοσμένο φίλτρο"; +$wb['email_txt'] = "Email"; +$wb['cryptpwd_txt'] = "Συνθηματικό"; +$wb['password_strength_txt'] = "Δύναμη Συνθηματικού"; +$wb['active_txt'] = "Ενεργό"; +$wb['email_error_isemail'] = "Η διεύθυνση Email δεν είναι έγκυρη."; +$wb['email_error_unique'] = "Διπλή διεύθυνση Email."; +$wb['autoresponder_text_txt'] = "Κείμενο"; +$wb['autoresponder_txt'] = "Ενεργό"; +$wb['autoresponder_start_date_txt'] = "Έναρξη"; +$wb['autoresponder_start_date_isfuture'] = "Η ημερ. εκκίνησης δεν μπορεί να είναι στο παρελθόν."; +$wb['autoresponder_end_date_txt'] = "Λήξη"; +$wb['autoresponder_end_date_isgreater'] = "Η ημερ. τέλους πρέπει να δωθεί και να είναι μεταγενέστερη της ημερ. εκκίνησης"; +$wb['no_domain_perm'] = "Δεν έχετε δικαιώματα σε αυτό το domain."; +$wb['error_no_pwd'] = "Το συνθηματικό δεν έχει οριστεί."; +$wb['quota_error_isint'] = "Το μέγεθος της θυρίδας πρέπει να είναι αριθμός."; +$wb['quota_txt'] = "Όριο χώρου"; +$wb['server_id_txt'] = "Aerver_id"; +$wb['password_txt'] = "Συνθηματικό"; +$wb['maildir_txt'] = "Maildir"; +$wb['postfix_txt'] = "Ενεργοποίηση Λήψης"; +$wb['access_txt'] = "Ενεργοποίηση Πρόσβασης"; +$wb['policy_txt'] = "Φίλτρο Spam"; +$wb['no_policy'] = "- ανενεργή -"; +$wb['limit_mailbox_txt'] = "Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας."; +$wb['limit_mailquota_txt'] = "Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι"; +$wb['disableimap_txt'] = "Απενεργοποίηση IMAP"; +$wb['disablepop3_txt'] = "Απενεργοποίηση POP3"; +$wb['duplicate_alias_or_forward_txt'] = "Υπάρχει ήδη ένα ψευδωνύμο ή μία προώθηση με αυτή τη διεύθυνση email."; +$wb['quota_error_value'] = "Μη έγκυρη τιμή ορίου χώρου. Επιτρεπόμενες τιμές είναι: 0 για απεριόριστο ή αριθμοί > 1"; +$wb['move_junk_txt'] = "Μετακίνηση των Spam Emails στο φάκελο Junk"; +$wb['name_txt'] = "Πραγματικό Όνομα"; +$wb['name_optional_txt'] = "(Προαιρετικό)"; +$wb['autoresponder_active'] = "Ενεργοποίηση αυτόματης απάντησης"; +$wb['cc_txt'] = "Αποστολή αντιγράφου σε "; +$wb['cc_error_isemail'] = "Προς"; +$wb['domain_txt'] = "Domain"; +$wb['now_txt'] = "Τώρα"; +$wb['login_error_unique'] = "Το όνομα χρησιμοποιείται ήδη"; +$wb['login_error_regex'] = "Έγγυροι χαρακτήρες είναι οι A-Z, a-z, 0-9, ., _ και -."; +$wb['login_txt'] = "Login (προαιτερικά)"; +$wb['error_login_email_txt'] = "Το όνομα δεν επιτρέπεται. Παρακαλούμε εισάγεται ένα διαφορετικό όνομα ή χρησιμοποιείστε την διεύθυνση e-mail."; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng index cee6a0582..39ad5eae0 100644 --- a/interface/web/mail/lib/lang/el_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng @@ -8,13 +8,14 @@ $wb['searchterm_is_empty'] = 'Ο όρος αναζήτησης δεν έχει $wb['source_txt'] = 'Πηγή'; $wb['target_error_regex'] = 'Ο προορισμός μπορεί να περιέχει μόνο αυτούς τους χαρακτήρες: a-z, 0-9, -, ., _, και {κενό}'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων mail.'; -$wb['subject_txt'] = 'Subject'; -$wb['from_txt'] = 'From'; -$wb['to_txt'] = 'To'; -$wb['contains_txt'] = 'Contains'; -$wb['is_txt'] = 'Is'; -$wb['begins_with_txt'] = 'Begins with'; -$wb['ends_with_txt'] = 'Ends with'; -$wb['move_to_txt'] = 'Move to'; -$wb['delete_txt'] = 'Delete'; +$wb['subject_txt'] = 'Θέμα'; +$wb['from_txt'] = 'Από'; +$wb['to_txt'] = 'Προς'; +$wb['contains_txt'] = 'Περιλαμβάνει'; +$wb['is_txt'] = 'είναι'; +$wb['begins_with_txt'] = 'Ξεκινά με'; +$wb['ends_with_txt'] = 'Τελειώνει σε'; +$wb['move_to_txt'] = 'Μετακίνηση σε'; +$wb['delete_txt'] = 'Διαγραφή'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng index 63efeb4fb..9f2aa4000 100644 --- a/interface/web/mail/lib/lang/el_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_filter_list.lng @@ -5,3 +5,4 @@ $wb['page_txt'] = 'Σελίδα'; $wb['page_of_txt'] = 'από'; $wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε το φίλτρο mail;'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng index 7e3f57bb7..aa82d04b2 100644 --- a/interface/web/mail/lib/lang/el_mail_user_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Νέα Θυρίδα'; $wb['name_txt'] = 'Πραγματικό Όνομα'; $wb['login_txt'] = 'Login'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng index 5cfd25e48..e51cbd3ce 100644 --- a/interface/web/mail/lib/lang/el_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/el_mail_user_stats_list.lng @@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Τον τελευταίο μήνα'; $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng index 6c477f60c..80f7c8ff2 100644 --- a/interface/web/mail/lib/lang/el_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Η διεύθυνση είναι κενή'; $wb['type_txt'] = 'Τύπος'; $wb['limit_mailfilter_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των φίλτρων email για τον λογαριασμό σας.'; ?> + diff --git a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng index 5fe38d979..f744f3515 100644 --- a/interface/web/mail/lib/lang/el_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/el_mail_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Παραλήπτης'; $wb['add_new_record_txt'] = 'Νέα εγγραφή στην λίστα των επιτρεπόμενων διευθύνσεων'; $wb['access_txt'] = 'πρόσβαση'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng index 2bf1e289a..a2377487e 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Προτεραιότητα'; $wb['active_txt'] = 'Ενεργό'; $wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των Whitelist ή Blacklist εγγραφών για τον λογαριασμό σας, έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng index c47087167..169c21a52 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Θυρίδα Χρήστη'; $wb['email_txt'] = 'Blacklisted Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Blacklist'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_config.lng b/interface/web/mail/lib/lang/el_spamfilter_config.lng index aa8b52e54..4654dd2dd 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_config.lng @@ -6,15 +6,16 @@ $wb['gateway_txt'] = 'Gateway'; $wb['hostname_txt'] = 'Hostname'; $wb['nameservers_txt'] = 'Nameservers'; $wb['module_txt'] = 'Άρθρωμα Server'; -$wb['maildir_path_txt'] = 'Maildir Path'; -$wb['homedir_path_txt'] = 'Homedir Path'; +$wb['maildir_path_txt'] = 'Διαδρομή Maildir'; +$wb['homedir_path_txt'] = 'Διαδρομή Homedir'; $wb['mailuser_uid_txt'] = 'Mailuser UID'; $wb['mailuser_gid_txt'] = 'Mailuser GID'; -$wb['mailuser_name_txt'] = 'Mailuser Name'; -$wb['mailuser_group_txt'] = 'Mailuser Group'; +$wb['mailuser_name_txt'] = 'Όνομα Mailuser'; +$wb['mailuser_group_txt'] = 'Ομάδα Mailuser'; $wb['relayhost_txt'] = 'Relayhost'; -$wb['relayhost_user_txt'] = 'Relayhost User'; +$wb['relayhost_user_txt'] = 'Χρήστης Relayhost'; $wb['relayhost_password_txt'] = 'Συνθηματικό Relayhost'; $wb['mailbox_size_limit_txt'] = 'Όριο μεγέθους θυρίδας'; $wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng index 94cd6d815..84bd401c8 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Ρυθμίσεις Server'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'server_id'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy.lng b/interface/web/mail/lib/lang/el_spamfilter_policy.lng index 4ab729169..f928816d3 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_policy.lng @@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'SPAM admin'; $wb['message_size_limit_txt'] = 'Όριο μεγέθους μηνύματος'; $wb['banned_rulenames_txt'] = 'Banned rulenames'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng index 3d10f4dca..4b894093c 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_policy_list.lng @@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Αποδοχή μπλοκαρισμένων α $wb['bad_header_lover_txt'] = 'Αποδοχή κακών κεφαλίδων'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Πολιτικής'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_users.lng b/interface/web/mail/lib/lang/el_spamfilter_users.lng index 39a927363..e5b6d0428 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_users.lng @@ -6,3 +6,4 @@ $wb['email_txt'] = 'Email (Μοτίβο)'; $wb['fullname_txt'] = 'Όνομα'; $wb['local_txt'] = 'Τοπικός'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng index a18e6ce42..1176465b3 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_users_list.lng @@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Όνομα'; $wb['email_txt'] = 'Email'; $wb['add_new_record_txt'] = 'Νέος χρήστης Spamfilter'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng index 1ee4470e9..acbe6cca4 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Προτεραιότητα'; $wb['active_txt'] = 'Ενεργό'; $wb['limit_spamfilter_wblist_txt'] = 'Το μέγιστο πλήθος των White η Blacklist εγγραφών έχει εξαντληθεί.'; ?> + diff --git a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng index 24febf7b7..811ebea0c 100644 --- a/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Όνομα Χρήστη'; $wb['email_txt'] = 'Whitelisted Email'; $wb['add_new_record_txt'] = 'Νέα εγγραφή Whitelist'; ?> + diff --git a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng index 95fff21ab..dde63a052 100755 --- a/interface/web/mail/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/el_user_quota_stats_list.lng @@ -5,3 +5,4 @@ $wb['name_txt'] = 'Name'; $wb['email_txt'] = 'Email Address'; $wb['used_txt'] = 'Used space'; ?> + diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index e7e20e63d..829a661d4 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -142,8 +142,9 @@ $wb['monitor_title_fail2ban_txt'] = 'Αρχείο καταγραφής Fail2Ban' $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['monitor_title_iptables_txt'] = 'Κανόνες IPTables'; +$wb['Show fail2ban-Log'] = 'Εμφάνιση fail2ban-Log'; +$wb['Show IPTables'] = 'Εμφάνιση IPTables'; $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter'; ?> + diff --git a/interface/web/monitor/lib/lang/el_syslog_list.lng b/interface/web/monitor/lib/lang/el_syslog_list.lng index c2db4823d..8789a4336 100644 --- a/interface/web/monitor/lib/lang/el_syslog_list.lng +++ b/interface/web/monitor/lib/lang/el_syslog_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['loglevel_txt'] = 'Επίπεδο καταγραφής'; $wb['message_txt'] = 'Μήνυμα'; ?> + diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index 20f0b05e8..88fa3c9d4 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -196,7 +196,7 @@ function _getServerState($serverId, $serverName) { $ispcData = null; foreach($records as $record) { /* get the state from the db-data */ - _processDbState($record['type'], $serverId, $serverState, $messages); + _processDbState($record['type'], $serverId, &$serverState, &$messages); /* if we have the os-info, get it */ if ($record['type'] == 'os_info') { $osData = unserialize($record['data']); diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm index 122d8e34f..904361cb1 100644 --- a/interface/web/monitor/templates/show_sys_state.htm +++ b/interface/web/monitor/templates/show_sys_state.htm @@ -1,25 +1,25 @@ -

-

- -
- -
-
-
-
- - -
-
-
-
- -
-
-
-
-
- -
+

+

+ +
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+ +
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php index 46ccaada4..60d006ad8 100644 --- a/interface/web/monitor/tools.inc.php +++ b/interface/web/monitor/tools.inc.php @@ -314,7 +314,7 @@ function showSystemUpdate() { } else { $data = unserialize($record['data']); - $html .= nl2br($data['output']); + $html .= nl2br(html_entity_decode($data['output'])); } $html .= ''; } else { diff --git a/interface/web/sites/form/web_folder_user.tform.php b/interface/web/sites/form/web_folder_user.tform.php index de22b3d46..6f94c6267 100644 --- a/interface/web/sites/form/web_folder_user.tform.php +++ b/interface/web/sites/form/web_folder_user.tform.php @@ -50,6 +50,8 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete +$auth_sql = $app->tform->getAuthSQL('r', 'web_domain'); + $form["tabs"]['user'] = array ( 'title' => "Folder", 'width' => 100, @@ -74,7 +76,7 @@ $form["tabs"]['user'] = array ( 'formtype' => 'SELECT', 'default' => '', 'datasource' => array ( 'type' => 'SQL', - 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain", + 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain", 'keyfield'=> 'web_folder_id', 'valuefield'=> 'name' ), diff --git a/interface/web/sites/lib/lang/el.lng b/interface/web/sites/lib/lang/el.lng index d66ee86ee..da8b1a53c 100644 --- a/interface/web/sites/lib/lang/el.lng +++ b/interface/web/sites/lib/lang/el.lng @@ -21,5 +21,6 @@ $wb['Cron'] = 'Cron'; $wb['Cron Jobs'] = 'Εργασίες Cron'; $wb['Statistics'] = 'Στατιστικά'; $wb['Web traffic'] = 'Κίνηση Web'; -$wb['Website quota (Harddisk)'] = 'Website quota (Harddisk)'; +$wb['Website quota (Harddisk)'] = 'Όριο δίσκου Website (Harddisk)'; ?> + diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng index 3e8f7eb70..dbc8eccf6 100644 --- a/interface/web/sites/lib/lang/el_cron.lng +++ b/interface/web/sites/lib/lang/el_cron.lng @@ -19,3 +19,4 @@ $wb['run_wday_error_format'] = 'Η μορφοποίηση για τις ημέρ $wb['command_error_format'] = 'Η μορφοποίηση για την εντολή δεν είναι έγκυρη. Παρακαλούμε σημειώστε ότι στην περίπτωση του url μόνο τα http/https επιτρέπονται.'; $wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστός τύπος πεδίου.'; ?> + diff --git a/interface/web/sites/lib/lang/el_cron_list.lng b/interface/web/sites/lib/lang/el_cron_list.lng index a43b9daa9..b629b8900 100644 --- a/interface/web/sites/lib/lang/el_cron_list.lng +++ b/interface/web/sites/lib/lang/el_cron_list.lng @@ -11,3 +11,4 @@ $wb['command_txt'] = 'Εντολή'; $wb['add_new_cron_txt'] = 'Νέα εργασία Cron'; $wb['parent_domain_id_txt'] = 'Website'; ?> + diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index 39f6fa0b6..78190bd63 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -16,10 +16,11 @@ $wb['database_name_error_unique'] = 'Υπάρχει ήδη μία βάση δε $wb['database_name_error_regex'] = 'Μή έγκυρο όνομα βάσης δεδομένων. Το όνομα της βάσης μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.'; $wb['database_user_error_empty'] = 'Το όνομα της βάσης δεδομένων δεν έχει οριστεί.'; $wb['database_user_error_unique'] = 'Υπάρχει ήδη ένας χρήστης με αυτό το όνομα στον server. Για να φτιάξετε ένα μοναδικό όνομα, π.χ. βάλτε μπροστά από το όνομα, το όνομα του domain.'; -$wb['database_user_error_regex'] = 'Μή έγκυρο όνομα χρήστη. Το όνομα χρήστη μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.'; +$wb['database_user_error_regex'] = 'Μη έγκυρο όνομα χρήστη. Το όνομα χρήστη μπορεί να περιέχει αυτούς τους χαρακτήρες: a-z, A-Z, 0-9 και την κάτω παύλα. Μέγεθος: 2 - 64 χαρακτήρες.'; $wb['limit_database_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των βάσεων δεδομένων.'; $wb['database_name_change_txt'] = 'Το όνομα της βάσης δεδομένων δεν μπορεί να αλλαχθεί'; $wb['database_charset_change_txt'] = 'Η κωδικοποίηση χαρακτήρων δεν μπορεί να αλλάξει'; $wb['database_name_error_len'] = 'Το όνομα της βάσης δεδομένων - {db} - είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 64 χαρακτήρες.'; $wb['database_user_error_len'] = 'Το όνομα χρήστη της βάσης δεδομένων - {user}- είναι πολύ μεγάλο. Το συνολικό μέγιστο μέγεθος δεν μπορεί να ξεπερνά τους 16 χαρακτήρες.'; ?> + diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng index f41420074..404162248 100644 --- a/interface/web/sites/lib/lang/el_database_admin_list.lng +++ b/interface/web/sites/lib/lang/el_database_admin_list.lng @@ -8,3 +8,4 @@ $wb['database_name_txt'] = 'Όνομα βάσης'; $wb['add_new_record_txt'] = 'Νέα βάση δεδομένων'; $wb['sys_groupid_txt'] = 'Πελάτης'; ?> + diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng index ce5413429..20f1320cb 100644 --- a/interface/web/sites/lib/lang/el_database_list.lng +++ b/interface/web/sites/lib/lang/el_database_list.lng @@ -7,3 +7,4 @@ $wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένω $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων'; $wb['add_new_record_txt'] = 'Νέα Βάσης Δεδομένων'; ?> + diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng index a5bca9dd7..863d82279 100644 --- a/interface/web/sites/lib/lang/el_ftp_user.lng +++ b/interface/web/sites/lib/lang/el_ftp_user.lng @@ -24,5 +24,6 @@ $wb['uid_error_empty'] = 'Το GID δεν έχει οριστεί.'; $wb['directory_error_empty'] = 'Ο Φάκελος δεν έχει οριστεί.'; $wb['directory_error_notinweb'] = 'Ο φάκελος δεν βρίσκεται μέσα στον ριζικό φάκελο web.'; $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; -$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0'; +$wb['quota_size_error_regex'] = 'Όριο: εισάγετε -1 για απεριόριστα ή έναν αριθμό > 0'; ?> + diff --git a/interface/web/sites/lib/lang/el_ftp_user_list.lng b/interface/web/sites/lib/lang/el_ftp_user_list.lng index 96c98d3dd..66db7de7e 100644 --- a/interface/web/sites/lib/lang/el_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/el_ftp_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης FTP'; ?> + diff --git a/interface/web/sites/lib/lang/el_shell_user.lng b/interface/web/sites/lib/lang/el_shell_user.lng index 8b126393f..ab7e321c0 100644 --- a/interface/web/sites/lib/lang/el_shell_user.lng +++ b/interface/web/sites/lib/lang/el_shell_user.lng @@ -19,5 +19,6 @@ $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)'; +$wb['ssh_rsa_txt'] = 'Δημόσιο Κλειδί SSH-RSA (για key-based logins)'; ?> + diff --git a/interface/web/sites/lib/lang/el_shell_user_list.lng b/interface/web/sites/lib/lang/el_shell_user_list.lng index 5468905bb..71db71542 100644 --- a/interface/web/sites/lib/lang/el_shell_user_list.lng +++ b/interface/web/sites/lib/lang/el_shell_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Site'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης Shell'; ?> + diff --git a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng index d93169cce..1e1072bdc 100644 --- a/interface/web/sites/lib/lang/el_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/el_user_quota_stats_list.lng @@ -6,3 +6,4 @@ $wb['used_txt'] = 'Χρησιμοποιούμενος χώρος'; $wb['hard_txt'] = 'Απόλυτο όριο'; $wb['soft_txt'] = 'Διαλακτικό όριο'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng index b12aba2a5..6ad7f1af5 100644 --- a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng @@ -12,3 +12,4 @@ $wb['no_redirect_txt'] = 'No redirect'; $wb['no_flag_txt'] = 'No flag'; $wb['none_txt'] = 'None'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng index c085c9288..240ed48d9 100644 --- a/interface/web/sites/lib/lang/el_web_domain.lng +++ b/interface/web/sites/lib/lang/el_web_domain.lng @@ -65,16 +65,16 @@ $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web'; $wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web'; $wb['custom_php_ini_txt'] = 'Προσαρμοσμένες ρυθμίσεις php.ini'; -$wb['none_txt'] = 'None'; -$wb['disabled_txt'] = 'Disabled'; -$wb['no_redirect_txt'] = 'No redirect'; -$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['none_txt'] = 'Κανάνα'; +$wb['disabled_txt'] = 'Απενεργοπ.'; +$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; +$wb['no_flag_txt'] = 'Χωρίς Σημαία'; +$wb['save_certificate_txt'] = 'Αποθήκευση Πιστοποιητικού'; +$wb['create_certificate_txt'] = 'Δημιουργία Πιστοποιητικού'; +$wb['delete_certificate_txt'] = 'Διαγραφή Πιστοποιητικού'; +$wb['ipv6_address_txt'] = 'Διεύθυνση IPv6'; +$wb['nginx_directives_txt'] = 'Ντιρεκτίβες nginx'; +$wb['seo_redirect_txt'] = 'Ανακατεύθυνση SEO'; $wb['non_www_to_www_txt'] = 'Non-www -> www'; $wb['www_to_non_www_txt'] = 'www -> non-www'; $wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM'; @@ -90,3 +90,4 @@ $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positi $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.'; $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng index 9b2091447..155393393 100644 --- a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο website'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_domain_list.lng index c3f42a94a..a35fad5e7 100644 --- a/interface/web/sites/lib/lang/el_web_domain_list.lng +++ b/interface/web/sites/lib/lang/el_web_domain_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'Domain'; $wb['add_new_record_txt'] = 'Νέο website'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_folder.lng b/interface/web/sites/lib/lang/el_web_folder.lng index 93cd40a08..410cd3f0d 100644 --- a/interface/web/sites/lib/lang/el_web_folder.lng +++ b/interface/web/sites/lib/lang/el_web_folder.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/sites/lib/lang/el_web_folder_list.lng b/interface/web/sites/lib/lang/el_web_folder_list.lng index 76d97029b..761a6c1b4 100644 --- a/interface/web/sites/lib/lang/el_web_folder_list.lng +++ b/interface/web/sites/lib/lang/el_web_folder_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/sites/lib/lang/el_web_folder_user.lng b/interface/web/sites/lib/lang/el_web_folder_user.lng index f877df209..c10412c2f 100644 --- a/interface/web/sites/lib/lang/el_web_folder_user.lng +++ b/interface/web/sites/lib/lang/el_web_folder_user.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/sites/lib/lang/el_web_folder_user_list.lng b/interface/web/sites/lib/lang/el_web_folder_user_list.lng index 9a7286a95..4f6ec2080 100644 --- a/interface/web/sites/lib/lang/el_web_folder_user_list.lng +++ b/interface/web/sites/lib/lang/el_web_folder_user_list.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng index 0e8c50aae..b7e9d5962 100644 --- a/interface/web/sites/lib/lang/el_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/el_web_sites_stats_list.lng @@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Το τελευταίο μήνα'; $wb['this_year_txt'] = 'Αυτό το χρόνο'; $wb['last_year_txt'] = 'Τον τελευταίο χρόνο'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng index 93dd79178..0b0167fbd 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain.lng @@ -37,6 +37,7 @@ $wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή sub / alia $wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι έγκυρο.'; $wb['host_txt'] = 'Host'; $wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης δεν είναι έγκυρη. Έγκυρες διαδρομές είναι για παράδειγμα οι: /test/ ή http://www.domain.tld/test/'; -$wb['no_redirect_txt'] = 'No redirect'; -$wb['no_flag_txt'] = 'No flag'; +$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση'; +$wb['no_flag_txt'] = 'Χωρίς Σημαία'; ?> + diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng index a4426cf3c..b24ae4daf 100644 --- a/interface/web/sites/lib/lang/el_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/el_web_subdomain_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website'; $wb['domain_txt'] = 'Subdomain'; $wb['add_new_record_txt'] = 'Νέο subdomain'; ?> + diff --git a/interface/web/sites/lib/lang/el_webdav_user.lng b/interface/web/sites/lib/lang/el_webdav_user.lng index 423bad521..dd052b031 100644 --- a/interface/web/sites/lib/lang/el_webdav_user.lng +++ b/interface/web/sites/lib/lang/el_webdav_user.lng @@ -13,3 +13,4 @@ $wb['username_error_regex'] = 'Το Όνομα Χρήστη περιέχει μ $wb['directory_error_empty'] = 'Ο φάκελος δεν έχει οριστεί.'; $wb['parent_domain_id_error_empty'] = 'Δεν επιλέχθηκε website.'; ?> + diff --git a/interface/web/sites/lib/lang/el_webdav_user_list.lng b/interface/web/sites/lib/lang/el_webdav_user_list.lng index bf19b31bf..565012752 100644 --- a/interface/web/sites/lib/lang/el_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/el_webdav_user_list.lng @@ -6,3 +6,4 @@ $wb['parent_domain_id_txt'] = 'Website'; $wb['username_txt'] = 'Όνομα Χρήστη'; $wb['add_new_record_txt'] = 'Νεός χρήστης Webdav'; ?> + diff --git a/interface/web/sites/list/web_folder_user.list.php b/interface/web/sites/list/web_folder_user.list.php index 2ee448105..5b8324ace 100644 --- a/interface/web/sites/list/web_folder_user.list.php +++ b/interface/web/sites/list/web_folder_user.list.php @@ -42,6 +42,8 @@ $liste["paging_tpl"] = "templates/paging.tpl.htm"; // Enable auth $liste["auth"] = "yes"; +$auth_sql = $app->tform->getAuthSQL('r', 'web_domain'); + /***************************************************** * Suchfelder @@ -65,7 +67,7 @@ $liste["item"][] = array( 'field' => "web_folder_id", 'prefix' => "", 'suffix' => "", 'datasource' => array ( 'type' => 'SQL', - 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain", + 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain", 'keyfield'=> 'web_folder_id', 'valuefield'=> 'name' ), diff --git a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng index 3e62f1d33..036a6afc1 100644 --- a/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/el_strengthmeter.lng @@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Καλό'; $wb['password_strength_4_txt'] = 'Δυνατό'; $wb['password_strength_5_txt'] = 'Πολύ δυνατό'; ?> + diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css index faeb4ab2b..2a1a64dc4 100644 --- a/interface/web/themes/default/css/screen/content_ispc.css +++ b/interface/web/themes/default/css/screen/content_ispc.css @@ -261,6 +261,7 @@ .dashboard-modules.help { background-image: url('../../icons/x32/help.png') !important; } .dashboard-modules.domain { background-image: url('../../icons/x32/domain.png') !important; } .dashboard-modules.sites { background-image: url('../../icons/x32/sites.png') !important; } + .dashboard-modules.billing { background-image: url('../../icons/x32/calculator.png') !important; } .panel_dashboard h2 { font-size:20px; diff --git a/interface/web/tools/lib/lang/el.lng b/interface/web/tools/lib/lang/el.lng index 32bcea3c2..29fea410d 100644 --- a/interface/web/tools/lib/lang/el.lng +++ b/interface/web/tools/lib/lang/el.lng @@ -3,5 +3,6 @@ $wb['User Settings'] = 'Ρυθμίσεις Χρήστη'; $wb['Settings'] = 'Ρυθμίσεις'; $wb['ISPConfig Tools'] = 'Εργαλεία ISPConfig'; $wb['Password and Language'] = 'Συνθηματικό και Γλώσσα'; -$wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.'; +$wb['ispconfig_tools_note'] = 'Το άρθρωμα σας επιτρέπει να αλλάξετε το συνθηματικό και την γλώσσα και να ξεκινήσετε έναν επανασυγχρονισμό των εγγραφών DNS.'; ?> + diff --git a/interface/web/tools/lib/lang/el_usersettings.lng b/interface/web/tools/lib/lang/el_usersettings.lng index ce9c95511..103489c3e 100644 --- a/interface/web/tools/lib/lang/el_usersettings.lng +++ b/interface/web/tools/lib/lang/el_usersettings.lng @@ -6,3 +6,4 @@ $wb['password_mismatch'] = 'Το συνθηματικό στο δεύτερο π $wb['Form to edit the user password and language.'] = 'Φόρμα επεξεργασίας συνθηματικού και γλώσσας'; $wb['Settings'] = 'Ρυθμίσεις'; ?> + diff --git a/interface/web/vm/lib/lang/el.lng b/interface/web/vm/lib/lang/el.lng index 4167e14a8..1a8468176 100644 --- a/interface/web/vm/lib/lang/el.lng +++ b/interface/web/vm/lib/lang/el.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_action.lng b/interface/web/vm/lib/lang/el_openvz_action.lng index 52f732858..96a735242 100644 --- a/interface/web/vm/lib/lang/el_openvz_action.lng +++ b/interface/web/vm/lib/lang/el_openvz_action.lng @@ -1,16 +1,17 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng index 6016681df..a0252fc95 100644 --- a/interface/web/vm/lib/lang/el_openvz_ip.lng +++ b/interface/web/vm/lib/lang/el_openvz_ip.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_ip_list.lng b/interface/web/vm/lib/lang/el_openvz_ip_list.lng index c5f06013b..388df1997 100644 --- a/interface/web/vm/lib/lang/el_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_ip_list.lng @@ -1,6 +1,7 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng index 256750f19..802ed8274 100644 --- a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng @@ -1,11 +1,12 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng index 6471ec0e2..a950faad1 100644 --- a/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng @@ -1,8 +1,9 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng index d285512dc..023aa0713 100644 --- a/interface/web/vm/lib/lang/el_openvz_template.lng +++ b/interface/web/vm/lib/lang/el_openvz_template.lng @@ -29,13 +29,13 @@ $wb['template_name_txt'] = 'Template name'; $wb['diskspace_txt'] = 'Diskspace'; $wb['ram_txt'] = 'RAM (guaranteed)'; $wb['ram_burst_txt'] = 'RAM (burst)'; -$wb['cpu_units_txt'] = 'CPU units'; -$wb['cpu_num_txt'] = 'CPU cores'; -$wb['cpu_limit_txt'] = 'CPU limit %'; -$wb['io_priority_txt'] = 'I/O priority'; +$wb['cpu_units_txt'] = 'Μονάδες CPU'; +$wb['cpu_num_txt'] = 'Αριθμός CPU'; +$wb['cpu_limit_txt'] = 'Όριο CPU %'; +$wb['io_priority_txt'] = 'Προτεραιότητα Ε/Ε'; $wb['active_txt'] = 'Active'; -$wb['description_txt'] = 'Description'; -$wb['numproc_desc_txt'] = 'Number of processes and threads.'; +$wb['description_txt'] = 'Περιγραφή'; +$wb['numproc_desc_txt'] = 'Πλήθος διεργασιών και νημάτων.'; $wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.'; $wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.'; $wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.'; @@ -49,15 +49,15 @@ $wb['privvmpages_desc_txt'] = 'Memory allocation limit, in pages.'; $wb['lockedpages_desc_txt'] = 'Process pages not allowed to be swapped out (pages locked by mlock(2)).'; $wb['shmpages_desc_txt'] = 'Total size of shared memory (IPC, shared anonymous mappings and tmpfs objects), in pages.'; $wb['physpages_desc_txt'] = 'Total number of RAM pages used by processes.'; -$wb['numfile_desc_txt'] = 'Number of open files.'; -$wb['numflock_desc_txt'] = 'Number of file locks.'; -$wb['numpty_desc_txt'] = 'Number of pseudo-terminals.'; +$wb['numfile_desc_txt'] = 'Αριθμός ανοιχτών αρχείων.'; +$wb['numflock_desc_txt'] = 'Αριθμός κλειδωμάτων αρχείων.'; +$wb['numpty_desc_txt'] = 'Αριθμός ψευδο-τερματικών'; $wb['numsiginfo_desc_txt'] = 'Number of siginfo structures.'; $wb['dcachesize_desc_txt'] = 'Total size of dentry and inode structures locked in memory.'; $wb['numiptent_desc_txt'] = 'Number of NETFILTER (IP packet filtering) entries.'; $wb['swappages_desc_txt'] = 'Amount of swap space to show in container.'; -$wb['create_dns_txt'] = 'Create DNS for hostname'; -$wb['template_name_error_empty'] = 'Template name is empty.'; +$wb['create_dns_txt'] = 'Δημιουργία DNS για το hostname'; +$wb['template_name_error_empty'] = 'Το όνομα του προτύπου είναι κενό.'; $wb['diskspace_error_empty'] = 'Diskspace is empty.'; $wb['ram_error_empty'] = 'RAM (guaranteed) is empty.'; $wb['ram_burst_error_empty'] = 'RAM (burst) is empty.'; @@ -91,3 +91,4 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; ?> + diff --git a/interface/web/vm/lib/lang/el_openvz_template_list.lng b/interface/web/vm/lib/lang/el_openvz_template_list.lng index de4045c36..781ef0af5 100644 --- a/interface/web/vm/lib/lang/el_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_template_list.lng @@ -1,5 +1,6 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng index f2be022dd..a4f6a2ebf 100644 --- a/interface/web/vm/lib/lang/el_openvz_vm.lng +++ b/interface/web/vm/lib/lang/el_openvz_vm.lng @@ -1,40 +1,41 @@ + diff --git a/interface/web/vm/lib/lang/el_openvz_vm_list.lng b/interface/web/vm/lib/lang/el_openvz_vm_list.lng index 2238e2b8f..dee8b9d22 100644 --- a/interface/web/vm/lib/lang/el_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/el_openvz_vm_list.lng @@ -1,10 +1,11 @@ + diff --git a/remoting_client/API-docs/main.html b/remoting_client/API-docs/index.html similarity index 100% rename from remoting_client/API-docs/main.html rename to remoting_client/API-docs/index.html diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master index e68046276..acc62e5f7 100644 --- a/server/conf/sieve_filter.master +++ b/server/conf/sieve_filter.master @@ -1,4 +1,4 @@ -require ["fileinto", "regex", "date", "relational", "vacation"]; +require ["fileinto", "regex", "vacation"]; # Send a copy of email to @@ -28,11 +28,8 @@ if header :contains "X-Spam-Flag" "YES" { # Stop here so that we do not reply on spams stop; } - -if allof(currentdate :value "ge" "iso8601" "", currentdate :value "le" "iso8601" "") { vacation :days 1 - :subject "" - + :subject "Out of office reply" + # :addresses ["test@test.int", "till@test.int"] ""; -} - + \ No newline at end of file diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master new file mode 100644 index 000000000..78a935516 --- /dev/null +++ b/server/conf/sieve_filter_1.2.master @@ -0,0 +1,39 @@ +require ["fileinto", "regex", "date", "relational", "vacation"]; + + +# Send a copy of email to +redirect ""; +keep; + + + +# Move spam to spam folder +if header :contains "X-Spam-Flag" "YES" { + fileinto "Junk"; + # Stop here so that we do not reply on spams + stop; +} + + + + + +################################################################# +# Autoreply +################################################################# + +# Move spam to spam folder +if header :contains "X-Spam-Flag" "YES" { + fileinto "Junk"; + # Stop here so that we do not reply on spams + stop; +} + +if allof(currentdate :value "ge" "iso8601" "", currentdate :value "le" "iso8601" "") { +vacation :days 1 + :subject "" + + ""; +} + + diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index ae1287dc1..3345e0b38 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -176,7 +176,7 @@ FcgidIdleTimeout 300 FcgidProcessLifeTime 3600 - FcgidMaxProcesses 1000 + # FcgidMaxProcesses 1000 FcgidMinProcessesPerClass 0 FcgidMaxProcessesPerClass 100 FcgidConnectTimeout 3 @@ -215,7 +215,7 @@ RewriteEngine on RewriteCond %{HTTP_HOST} ^$ [NC] - RewriteRule ^(.*)$ http:///$1 [R=301,L] + RewriteRule ^(.*)$ http://$1 [R=301,L] RewriteCond %{HTTP_HOST} $ [NC] diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index 26768c3e9..f120bcb3a 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -175,7 +175,13 @@ class monitor_tools { $quotafile = file($filename); $data[$email]['used'] = trim($quotafile['1']); unset($quotafile); - } + } else { + exec('du -s '.escapeshellcmd('/var/vmail/'.$email_parts[1].'/'.$email_parts[0]),$out); + $parts = explode(' ',$out[0]); + $data[$email]['used'] = intval($parts[0])*1024; + unset($out); + unset($parts); + } } } @@ -887,9 +893,6 @@ class monitor_tools { $state = 'no_state'; $data['output'] = ''; } - - //* Encode data - $data['output'] = htmlentities($data['output']); /* * Return the Result diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php index ec85bed32..bfb03be97 100644 --- a/server/mods-available/monitor_core_module.inc.php +++ b/server/mods-available/monitor_core_module.inc.php @@ -120,6 +120,13 @@ class monitor_core_module { global $app; /* + * This monitoring is expensive, so do it only every 15 minutes + */ + $min = @date('i'); + if ($min % 15 != 0) return; + + + /* * First we get the Monitoring-data from the tools */ $res = $this->_tools->monitorEmailQuota(); @@ -406,6 +413,9 @@ class monitor_core_module { * First we get the Monitoring-data from the tools */ $res = $this->_tools->monitorSystemUpdate(); + + //* Ensure that output is encoded so that it does not break the serialize + $res['data']['output'] = htmlentities($res['data']['output']); /* * Insert the data into the database @@ -692,6 +702,9 @@ class monitor_core_module { * First we get the Monitoring-data from the tools */ $res = $this->_tools->monitorISPCCronLog(); + + //* Ensure that output is encoded so that it does not break the serialize + $res['data']['output'] = htmlentities($res['data']['output']); /* * Insert the data into the database diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index fbf91b9e0..7dc07fe74 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -190,7 +190,7 @@ class apache2_plugin { //* Save a SSL certificate to disk if($data["new"]["ssl_action"] == 'save') { $ssl_dir = $data["new"]["document_root"]."/ssl"; - $domain = $data["new"]["ssl_domain"]; + $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"]; $csr_file = $ssl_dir.'/'.$domain.".csr"; $crt_file = $ssl_dir.'/'.$domain.".crt"; $bundle_file = $ssl_dir.'/'.$domain.".bundle"; @@ -207,7 +207,7 @@ class apache2_plugin { //* Delete a SSL certificate if($data['new']['ssl_action'] == 'del') { $ssl_dir = $data['new']['document_root'].'/ssl'; - $domain = $data['new']['ssl_domain']; + $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"]; $csr_file = $ssl_dir.'/'.$domain.'.csr'; $crt_file = $ssl_dir.'/'.$domain.'.crt'; $bundle_file = $ssl_dir.'/'.$domain.'.bundle'; @@ -228,7 +228,6 @@ class apache2_plugin { $app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG); } - } @@ -542,74 +541,76 @@ class apache2_plugin { if($this->action == 'insert' || $data["new"]["system_user"] != $data["old"]["system_user"]) { // Chown and chmod the directories below the document root - $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chown -R '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web'); // The document root itself has to be owned by root in normal level and by the web owner in security level 20 if($web_config['security_level'] == 20) { - $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']).'/web'); } else { - $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root']).'/web'); } } //* If the security level is set to high - if($web_config['security_level'] == 20) { + if($this->action == 'insert' && $data['new']['type'] == 'vhost') { + if($web_config['security_level'] == 20) { - $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root'])); - $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*'); - $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web')); + $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chmod 751 '.escapeshellcmd($data['new']['document_root']).'/*'); + $this->_exec('chmod 710 '.escapeshellcmd($data['new']['document_root'].'/web')); - // make tmp directory writable for Apache and the website users - $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp')); + // make tmp directory writable for Apache and the website users + $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp')); - // Set Log symlink to 755 to make the logs accessible by the FTP user - $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log"); - - $command = 'usermod'; - $command .= ' --groups sshusers'; - $command .= ' '.escapeshellcmd($data['new']['system_user']); - $this->_exec($command); - - //* if we have a chrooted Apache environment - if($apache_chrooted) { - $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); + // Set Log symlink to 755 to make the logs accessible by the FTP user + $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"])."/log"); + + $command = 'usermod'; + $command .= ' --groups sshusers'; + $command .= ' '.escapeshellcmd($data['new']['system_user']); + $this->_exec($command); + + //* if we have a chrooted Apache environment + if($apache_chrooted) { + $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); + + //* add the apache user to the client group in the chroot environment + $tmp_groupfile = $app->system->server_conf['group_datei']; + $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group'; + $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user'])); + $app->system->server_conf['group_datei'] = $tmp_groupfile; + unset($tmp_groupfile); + } - //* add the apache user to the client group in the chroot environment - $tmp_groupfile = $app->system->server_conf['group_datei']; - $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group'; + //* add the Apache user to the client group $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user'])); - $app->system->server_conf['group_datei'] = $tmp_groupfile; - unset($tmp_groupfile); - } - //* add the Apache user to the client group - $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user'])); + $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'])); - $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root'])); + /* + * Workaround for jailkit: If jailkit is enabled for the site, the + * website root has to be owned by the root user and we have to chmod it to 755 then + */ - /* - * Workaround for jailkit: If jailkit is enabled for the site, the - * website root has to be owned by the root user and we have to chmod it to 755 then - */ + //* Check if there is a jailkit user for this site + $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'"); + if($tmp['number'] > 0) { + $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'])); + } + unset($tmp); + + // If the security Level is set to medium + } else { - //* Check if there is a jailkit user for this site - $tmp = $app->db->queryOneRecord('SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = '.$data['new']['domain_id']." AND chroot = 'jailkit'"); - if($tmp['number'] > 0) { $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'])); + $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*')); $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'])); - } - unset($tmp); - - // If the security Level is set to medium - } else { - - $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'])); - $this->_exec('chmod 755 '.escapeshellcmd($data['new']['document_root'].'/*')); - $this->_exec('chown root:root '.escapeshellcmd($data['new']['document_root'])); - // make temp directory writable for Apache and the website users - $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp')); + // make temp directory writable for Apache and the website users + $this->_exec('chmod 777 '.escapeshellcmd($data['new']['document_root'].'/tmp')); + } } // Change the ownership of the error log to the owner of the website diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php index 5701799d4..25e4cf2c8 100644 --- a/server/plugins-available/maildeliver_plugin.inc.php +++ b/server/plugins-available/maildeliver_plugin.inc.php @@ -101,9 +101,23 @@ class maildeliver_plugin { if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN); $app->load('tpl'); - + + //* Select sieve filter file for dovecot version + exec('dovecot --version',$tmp); + if(substr($tmp[0],0,3) == '1.0') { + $filter_file_template = "sieve_filter.master"; + } elseif(substr($tmp[0],0,3) == '1.2') { + $filter_file_template = "sieve_filter_1.2.master"; + } elseif(substr($tmp[0],0,1) == '2') { + $filter_file_template = "sieve_filter_1.2.master"; + } else { + $filter_file_template = "sieve_filter.master"; + } + unset($tmp); + + //* Create new filter file based on template $tpl = new tpl(); - $tpl->newTemplate("sieve_filter.master"); + $tpl->newTemplate($filter_file_template); // cc Field $tpl->setVar('cc',$data["new"]["cc"]); diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php index 946aaaa4c..7677778ea 100755 --- a/server/plugins-available/shelluser_base_plugin.inc.php +++ b/server/plugins-available/shelluser_base_plugin.inc.php @@ -235,7 +235,7 @@ class shelluser_base_plugin { if (!file_exists($sshkeys)){ // add root's key $app->file->mkdirs($sshdir, '0755'); - file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); + if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); // Remove duplicate keys $existing_keys = file($sshkeys); @@ -273,7 +273,7 @@ class shelluser_base_plugin { $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG); } // set proper file permissions - exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir); + // exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir); exec("chmod 600 '$sshkeys'"); } diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index c1e2b2cd3..50d2b24b5 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -266,14 +266,14 @@ class shelluser_jailkit_plugin { exec($command); $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG); - - mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true); + + if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true); chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']); chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']); $this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); - mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true); + if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true); chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']); chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']); @@ -404,7 +404,7 @@ class shelluser_jailkit_plugin { if (!file_exists($sshkeys)){ // add root's key $app->file->mkdirs($sshdir, '0755'); - file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); + if(is_file('/root/.ssh/authorized_keys')) file_put_contents($sshkeys, file_get_contents('/root/.ssh/authorized_keys')); // Remove duplicate keys $existing_keys = file($sshkeys); @@ -442,7 +442,7 @@ class shelluser_jailkit_plugin { $this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG); } // set proper file permissions - exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir); + // exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$usrdir); exec("chmod 600 '$sshkeys'"); } diff --git a/server/scripts/create_jailkit_chroot.sh b/server/scripts/create_jailkit_chroot.sh index 312148db5..6ffa889cd 100755 --- a/server/scripts/create_jailkit_chroot.sh +++ b/server/scripts/create_jailkit_chroot.sh @@ -21,7 +21,7 @@ CHROOT_APP_SECTIONS=$2 chown root:root $CHROOT_HOMEDIR ## Initialize the chroot into the specified directory with the specified applications -jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS +jk_init -f -k -c /etc/jailkit/jk_init.ini -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS ## Create the temp directory if [ ! -d "$CHROOT_HOMEDIR/tmp" ] diff --git a/server/server.php b/server/server.php index c5ff5ac2f..5e27cb525 100644 --- a/server/server.php +++ b/server/server.php @@ -37,19 +37,6 @@ ini_set('error_reporting', E_ALL & ~E_NOTICE); // make sure server_id is always an int $conf['server_id'] = intval($conf['server_id']); -/* - // Get server record, if updates where available for this server - $server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf['server_id']); - if($server_db_record == false) { - $app->log('Nothing to update for server_id '.$conf['server_id']); - die(); - } else { - // Set update status to 0, so we dont start the update process twice - $app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf['server_id']); - $app->log('Begin update.'); - } - */ - /* * Try to Load the server configuration from the master-db */ -- GitLab