From edf806b98d675a2037b019644aff76b7e8b7738c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 21 Nov 2011 02:33:09 -0500
Subject: [PATCH] Merged revisions 2741-2788 from SVN stable branch.
---
interface/web/sites/lib/lang/el_web_folder_user.lng | 11
interface/web/admin/lib/lang/el_remote_user_list.lng | 1
interface/web/dns/lib/lang/el_dns_mx.lng | 1
interface/web/mail/lib/lang/el_mail_transport_list.lng | 1
interface/web/dashboard/lib/lang/el.lng | 1
interface/web/mail/lib/lang/el_mail_content_filter_list.lng | 1
interface/web/admin/lib/lang/el_server_list.lng | 5
interface/web/mail/lib/lang/el_mail_transport.lng | 1
interface/web/mail/lib/lang/el_mail_user_stats_list.lng | 1
remoting_client/API-docs/index.html | 0
interface/web/themes/default/css/screen/content_ispc.css | 1
interface/web/admin/lib/lang/el_remote_action.lng | 1
interface/web/admin/lib/lang/el_users.lng | 3
interface/web/client/lib/lang/el_client.lng | 13
interface/web/designer/lib/lang/el_module_list.lng | 1
interface/web/admin/lib/lang/el_language_list.lng | 1
interface/web/mail/lib/lang/el_mail_forward.lng | 1
interface/web/mail/lib/lang/el_spamfilter_config.lng | 11
interface/web/help/lib/lang/pl_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_web_subdomain_list.lng | 1
interface/web/mail/lib/lang/el_mail_alias_list.lng | 1
interface/web/mail/lib/lang/el_mail_aliasdomain_list.lng | 1
interface/web/admin/lib/lang/el_system_config.lng | 3
interface/web/mail/lib/lang/el_spamfilter_users_list.lng | 1
interface/web/help/lib/lang/el_help_faq_list.lng | 3
server/server.php | 13
install/tpl/debian_dovecot-sql.conf.master | 2
interface/web/mail/lib/lang/el_mail_blacklist.lng | 1
interface/web/monitor/tools.inc.php | 2
interface/web/admin/lib/lang/el_language_edit.lng | 1
server/lib/classes/monitor_tools.inc.php | 11
install/lib/update.lib.php | 14
interface/web/help/lib/lang/br_help_faq_list.lng | 3
interface/web/tools/lib/lang/el_usersettings.lng | 1
server/conf/sieve_filter.master | 11
interface/web/client/lib/lang/el.lng | 1
interface/web/dns/lib/lang/el_dns_template.lng | 1
interface/web/help/lib/lang/id_help_faq_list.lng | 3
interface/web/admin/lib/lang/el_language_export.lng | 1
interface/web/vm/lib/lang/el_openvz_template_list.lng | 7
interface/web/mail/lib/lang/el_mail_content_filter.lng | 1
install/lib/install.lib.php | 4
interface/web/help/lib/lang/sk_help_faq_list.lng | 3
interface/web/help/lib/lang/cz_help_faq_list.lng | 3
interface/web/help/lib/lang/ru_help_faq_list.lng | 3
interface/web/admin/lib/lang/el_firewall.lng | 1
interface/web/admin/lib/lang/el_iptables.lng | 21
interface/web/dns/lib/lang/el_dns_soa_list.lng | 1
interface/web/help/lib/lang/en_help_faq_list.lng | 3
interface/web/dns/lib/lang/el_dns_txt.lng | 1
server/plugins-available/shelluser_jailkit_plugin.inc.php | 10
interface/web/admin/lib/lang/el_server_ip.lng | 1
interface/lib/lang/el.lng | 137 ++--
interface/web/dns/lib/lang/el_dns_ptr.lng | 1
interface/web/dns/lib/lang/el.lng | 7
interface/web/help/templates/help_faq_list.htm | 2
interface/web/sites/lib/lang/el_web_domain_admin_list.lng | 1
install/apps/bastille-firewall | 9
interface/web/dns/lib/lang/el_dns_hinfo.lng | 1
interface/web/dns/lib/lang/el_dns_a_list.lng | 1
interface/web/help/lib/lang/fi_help_faq_list.lng | 3
interface/web/mail/lib/lang/el_mail_domain_catchall_list.lng | 1
interface/web/admin/lib/lang/el.lng | 7
interface/web/mail/lib/lang/el_user_quota_stats_list.lng | 1
interface/web/vm/lib/lang/el_openvz_template.lng | 23
interface/web/sites/lib/lang/el_cron_list.lng | 1
interface/web/admin/lib/lang/el_groups.lng | 1
interface/web/sites/list/web_folder_user.list.php | 4
interface/web/mail/lib/lang/el_mail_user.lng | 85 +-
interface/web/sites/lib/lang/el_web_folder_user_list.lng | 9
interface/web/admin/lib/lang/el_language_complete.lng | 1
interface/web/dns/lib/lang/el_dns_wizard.lng | 1
interface/web/client/lib/lang/el_client_template_list.lng | 1
interface/web/admin/lib/lang/el_language_add.lng | 1
install/sql/ispconfig3.sql | 2
interface/web/admin/lib/lang/el_server_config.lng | 31
server/plugins-available/apache2_plugin.inc.php | 97 ++--
interface/web/mail/lib/lang/el_mail_user_list.lng | 1
interface/web/sites/lib/lang/el_web_domain_list.lng | 1
interface/web/help/lib/lang/it_help_faq_list.lng | 3
install/autoupdate.php | 6
interface/web/mail/lib/lang/el_mail_relay_recipient_list.lng | 1
interface/web/dns/lib/lang/el_dns_ns.lng | 1
interface/web/mail/lib/lang/el_mail_mailinglist_list.lng | 3
interface/web/sites/lib/lang/el_cron.lng | 1
interface/web/mail/lib/lang/el_mail_alias.lng | 1
interface/web/dns/lib/lang/el_dns_alias.lng | 1
interface/web/mail/lib/lang/el_mail_whitelist_list.lng | 1
interface/web/dns/lib/lang/el_dns_aaaa.lng | 1
interface/web/admin/lib/lang/el_software_update_list.lng | 1
interface/web/dashboard/lib/lang/el_dashlet_limits.lng | 1
interface/web/client/lib/lang/el_client_template.lng | 19
interface/web/mail/lib/lang/el_spamfilter_blacklist.lng | 1
interface/web/dns/lib/lang/el_dns_soa.lng | 15
interface/web/mail/lib/lang/el_mail_relay_recipient.lng | 1
interface/web/sites/lib/lang/el_ftp_user.lng | 3
interface/web/mail/lib/lang/el_mail_get_list.lng | 1
interface/web/admin/lib/lang/el_groups_list.lng | 1
interface/web/help/lib/lang/el_support_message_list.lng | 1
interface/web/help/lib/lang/pt_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_user_quota_stats_list.lng | 1
interface/web/admin/lib/lang/el_firewall_list.lng | 3
interface/web/admin/lib/lang/el_users_list.lng | 1
interface/web/mail/lib/lang/el_mail_aliasdomain.lng | 5
install/tpl/opensuse_dovecot-sql.conf.master | 3
interface/web/admin/lib/lang/el_server.lng | 1
interface/web/admin/lib/lang/el_software_repo_list.lng | 1
interface/web/admin/lib/lang/el_server_ip_list.lng | 7
interface/web/help/lib/lang/el_help_faq_sections_list.lng | 13
interface/web/sites/form/web_folder_user.tform.php | 4
interface/web/mail/lib/lang/el_mail_get.lng | 3
interface/web/sites/lib/lang/el_ftp_user_list.lng | 1
interface/web/mail/lib/lang/el_mail_user_filter.lng | 19
interface/web/admin/lib/lang/el_package_install.lng | 1
interface/web/sites/lib/lang/el_web_aliasdomain_list.lng | 1
interface/web/sites/lib/lang/el_database.lng | 3
server/plugins-available/shelluser_base_plugin.inc.php | 4
interface/web/admin/lib/lang/el_language_import.lng | 1
interface/web/domain/lib/lang/el_domain.lng | 1
interface/web/mail/lib/lang/el_mail_user_filter_list.lng | 1
interface/web/monitor/templates/show_sys_state.htm | 50 +-
interface/web/mail/lib/lang/el_mail_domain_catchall.lng | 1
interface/web/help/lib/lang/el.lng | 11
interface/web/vm/lib/lang/el.lng | 5
interface/web/client/lib/lang/el_resellers_list.lng | 1
server/mods-available/monitor_core_module.inc.php | 13
interface/web/help/lib/lang/hu_help_faq_list.lng | 3
interface/web/help/lib/lang/el_support_message.lng | 3
interface/web/dns/lib/lang/el_dns_rp.lng | 1
interface/web/mail/lib/lang/el_spamfilter_users.lng | 1
server/conf/vhost.conf.master | 4
interface/web/dns/lib/lang/el_dns_srv.lng | 1
interface/web/designer/lib/lang/el_module_nav_item_edit.lng | 3
interface/web/login/lib/lang/el.lng | 1
interface/web/admin/lib/lang/el_iptables_list.lng | 23
interface/web/mail/lib/lang/el_mail_forward_list.lng | 1
interface/web/dns/templates/dns_wizard.htm | 2
interface/web/sites/lib/lang/el_shell_user_list.lng | 1
interface/web/vm/lib/lang/el_openvz_vm_list.lng | 9
interface/web/dns/dns_import.php | 30 +
interface/web/dns/lib/lang/el_dns_a.lng | 1
interface/web/sites/lib/lang/el_shell_user.lng | 3
interface/web/designer/lib/lang/el_module_nav_edit.lng | 1
install/tpl/debian6_dovecot-sql.conf.master | 20
interface/web/vm/lib/lang/el_openvz_ip.lng | 11
interface/web/strengthmeter/lib/lang/el_strengthmeter.lng | 1
interface/web/designer/lib/lang/el.lng | 1
interface/web/mail/lib/lang/el_mail_spamfilter.lng | 1
interface/web/vm/lib/lang/el_openvz_ostemplate.lng | 17
interface/web/dns/lib/lang/el_dns_cname.lng | 1
interface/web/domain/lib/lang/el_domain_list.lng | 1
interface/web/mail/lib/lang/el_spamfilter_blacklist_list.lng | 1
interface/web/dashboard/dashboard.php | 12
interface/web/help/lib/lang/fr_help_faq_list.lng | 3
interface/web/mail/lib/lang/el.lng | 1
interface/web/help/lib/lang/bg_help_faq_list.lng | 3
interface/web/help/lib/lang/hr_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_web_folder_list.lng | 7
interface/web/domain/lib/lang/el.lng | 1
interface/web/sites/lib/lang/el_web_folder.lng | 7
interface/web/sites/lib/lang/el_web_sites_stats_list.lng | 1
install/tpl/fedora_dovecot-sql.conf.master | 2
interface/web/dns/lib/lang/el_dns_slave_list.lng | 3
interface/web/help/lib/lang/el_faq_sections_form.lng | 3
interface/web/mail/lib/lang/el_mail_domain.lng | 1
server/scripts/create_jailkit_chroot.sh | 2
install/dist/lib/opensuse.lib.php | 6
interface/web/mail/lib/lang/el_spamfilter_policy.lng | 1
server/conf/sieve_filter_1.2.master | 39 +
interface/web/admin/lib/lang/el_software_package_install.lng | 1
interface/web/dns/lib/lang/el_dns_slave.lng | 5
interface/web/vm/lib/lang/el_openvz_action.lng | 27
interface/web/designer/lib/lang/el_form_list.lng | 1
interface/web/mail/lib/lang/el_mail_spamfilter_list.lng | 1
install/tpl/config.inc.php.master | 2
install/dist/lib/fedora.lib.php | 5
interface/web/dashboard/lib/lang/el_dashlet_modules.lng | 1
interface/web/mail/lib/lang/el_mail_whitelist.lng | 1
install/update.php | 17
interface/web/help/lib/lang/ar_help_faq_list.lng | 3
interface/web/mail/lib/lang/el_spamfilter_whitelist.lng | 1
interface/web/mail/lib/lang/el_mail_blacklist_list.lng | 1
interface/web/help/lib/lang/tr_help_faq_list.lng | 3
install/lib/installer_base.lib.php | 14
interface/web/help/lib/lang/el_faq_manage_questions_list.lng | 15
interface/web/vm/lib/lang/el_openvz_ip_list.lng | 5
interface/lib/classes/remoting.inc.php | 7
interface/web/mail/lib/lang/el_mail_domain_admin_list.lng | 1
interface/web/vm/lib/lang/el_openvz_vm.lng | 65 +-
interface/web/help/lib/lang/de_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_database_admin_list.lng | 1
interface/web/mail/lib/lang/el_mail_mailinglist.lng | 27
interface/web/help/lib/lang/ja_help_faq_list.lng | 3
interface/web/help/lib/lang/nl_help_faq_list.lng | 3
interface/web/client/lib/lang/el_client_del.lng | 1
interface/web/admin/lib/lang/el_software_package_list.lng | 3
interface/web/client/lib/lang/el_clients_list.lng | 1
interface/web/help/lib/lang/es_help_faq_list.lng | 3
interface/web/monitor/lib/lang/el.lng | 7
interface/web/dns/lib/lang/el_dns_template_list.lng | 1
interface/web/tools/lib/lang/el.lng | 3
interface/web/admin/lib/lang/el_software_repo.lng | 1
interface/web/designer/lib/lang/el_module_show.lng | 1
interface/web/mail/lib/lang/el_spamfilter_policy_list.lng | 1
interface/web/designer/lib/lang/el_form_edit.lng | 1
interface/web/help/lib/lang/el_faq_form.lng | 9
interface/web/mail/lib/lang/el_mail_domain_list.lng | 1
interface/web/client/lib/lang/el_reseller.lng | 17
interface/web/mail/lib/lang/el_spamfilter_config_list.lng | 1
interface/web/sites/lib/lang/el_webdav_user_list.lng | 1
interface/web/admin/lib/lang/el_server_config_list.lng | 1
interface/web/help/lib/lang/se_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_web_domain.lng | 21
interface/web/vm/lib/lang/el_openvz_ostemplate_list.lng | 7
interface/web/help/lib/lang/ro_help_faq_list.lng | 3
interface/web/sites/lib/lang/el_webdav_user.lng | 1
interface/web/sites/lib/lang/el.lng | 3
interface/web/monitor/lib/lang/el_syslog_list.lng | 1
interface/lib/classes/listform.inc.php | 2
interface/web/sites/lib/lang/el_database_list.lng | 1
install/dist/lib/gentoo.lib.php | 6
interface/web/monitor/show_sys_state.php | 2
interface/web/mail/lib/lang/el_spamfilter_whitelist_list.lng | 1
interface/web/admin/lib/lang/el_remote_user.lng | 3
interface/web/designer/lib/lang/el_module_edit.lng | 1
server/plugins-available/maildeliver_plugin.inc.php | 18
interface/web/sites/lib/lang/el_web_subdomain.lng | 5
interface/web/designer/lib/lang/el_form_show.lng | 1
228 files changed, 885 insertions(+), 540 deletions(-)
diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall
index 86da005..d5723db 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
@@ -76,13 +76,6 @@
echo "ERROR: bastille-firewall currently being reset or lock is stuck."
echo "To un-stick, remove the directory /var/lock/bastille-firewall"
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
diff --git a/install/autoupdate.php b/install/autoupdate.php
index a9863ce..ba5b1a1 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -144,6 +144,11 @@
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 @@
//* 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 4efb6fc..51f2dff 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1029,6 +1029,11 @@
// 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 ffe5ef2..c5fdad0 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -866,6 +866,12 @@
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 22438cc..eed2226 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1060,6 +1060,12 @@
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 318cda9..0d8eb40 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -582,8 +582,8 @@
}
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 b0cbfd6..0021057 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -514,6 +514,10 @@
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 @@
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 @@
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 @@
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 d95bbf8..729ee04 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -113,7 +113,7 @@
$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 @@
//** 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 @@
}
$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 @@
//** 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 @@
}
$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 fd62648..11d1b6c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1919,6 +1919,6 @@
-- 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 99d4402..a6abb12 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@
//** 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 b04abde..380c86b 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -13,20 +13,6 @@
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 969a9ed..8b110e9 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -122,6 +122,6 @@
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 6d7cf62..de28a7c 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -135,4 +135,4 @@
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 6d7cf62..66bcdc8 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -134,5 +134,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/update.php b/install/update.php
index 74764ce..769cdce 100644
--- a/install/update.php
+++ b/install/update.php
@@ -139,11 +139,17 @@
$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 @@
//* 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 a5843d6..d4b1390 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -282,7 +282,7 @@
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 8d043a4..33d84ab 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1372,6 +1372,13 @@
$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 dca0474..add04e6 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -1,70 +1,71 @@
<?php
-$wb['conf_format_dateshort'] = 'Y-m-d';
-$wb['conf_format_datelong'] = 'l dS από F Y';
-$wb['conf_format_timeshort'] = 'H:i';
-$wb['conf_format_timelong'] = 'H:i:s';
-$wb['conf_format_datetime'] = 'Y-m-d H:i';
-$wb['error_301'] = 'Απογόρευση χρήσης του αρθρώματος στον τρέχων χρήστη';
-$wb['error_302'] = 'Το άρθρωμα δεν είναι έγκυρο';
-$wb['error_1001'] = 'Το όνομα χρήστη και ο κωδικός δεν επιτρέπεται να είναι κενά!';
-$wb['error_1002'] = 'Το όνομα χρήστη και ο κωδικός δεν είναι σωστά!';
-$wb['error_1003'] = 'Το όνομα χρήστη είναι απενεργοποιημένο!';
-$wb['delete_confirmation'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε την εγγραφή;';
-$wb['error_no_view_permission'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε την εγγραφή ή η εγγραφή δεν υπάρχει!';
-$wb['error_no_delete_permission'] = 'Δεν έχετε τα απαραίτητα δικαιώματα για να διαγράψετε την εγγραφή !';
-$wb['page_txt'] = 'Σελίδα';
-$wb['page_of_txt'] = 'από';
-$wb['page_and_txt'] = 'και';
-$wb['page_next_txt'] = 'Επόμενη';
-$wb['page_back_txt'] = 'Επιστροφή';
-$wb['delete_txt'] = 'Διαγραφή';
-$wb['filter_txt'] = 'Φίλτρο';
-$wb['add_new_record_txt'] = 'Νέα εγγραφής';
-$wb['btn_save_txt'] = 'Αποθήκευση';
-$wb['btn_cancel_txt'] = 'Επιστροφή';
-$wb['top_menu_system'] = 'Σύστημα';
-$wb['top_menu_client'] = 'Πελάτης';
-$wb['top_menu_email'] = 'Email';
-$wb['top_menu_monitor'] = 'Εποπτεία';
-$wb['top_menu_sites'] = 'Sites';
-$wb['top_menu_dns'] = 'DNS';
-$wb['top_menu_tools'] = 'Εργαλεία';
-$wb['top_menu_help'] = 'Βοήθεια';
-$wb['top_menu_billing'] = 'Χρεώσεις';
-$wb['top_menu_domain'] = 'Domains';
-$wb['top_menu_dashboard'] = 'Αρχική';
-$wb['toolsarea_head_txt'] = 'Εργαλεία';
-$wb['latest_news_txt'] = 'Τελευταία Νέα';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
-$wb['number_format_thousands_sep'] = '';
-$wb['top_menu_vm'] = 'VServer';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
-$wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
+$wb['conf_format_dateshort'] = "Y-m-d";
+$wb['conf_format_datelong'] = "l dS από F Y";
+$wb['conf_format_timeshort'] = "H:i";
+$wb['conf_format_timelong'] = "H:i:s";
+$wb['conf_format_datetime'] = "Y-m-d H:i";
+$wb['error_301'] = "Απογόρευση χρήσης του αρθρώματος στον τρέχων χρήστη";
+$wb['error_302'] = "Το άρθρωμα δεν είναι έγκυρο";
+$wb['error_1001'] = "Το όνομα χρήστη και ο κωδικός δεν επιτρέπεται να είναι κενά!";
+$wb['error_1002'] = "Το όνομα χρήστη και ο κωδικός δεν είναι σωστά!";
+$wb['error_1003'] = "Το όνομα χρήστη είναι απενεργοποιημένο!";
+$wb['delete_confirmation'] = "Είστε σίγουροι ότι θέλετε να διαγράψετε την εγγραφή;";
+$wb['error_no_view_permission'] = "Δεν έχετε τα απαραίτητα δικαιώματα για να δείτε την εγγραφή ή η εγγραφή δεν υπάρχει!";
+$wb['error_no_delete_permission'] = "Δεν έχετε τα απαραίτητα δικαιώματα για να διαγράψετε την εγγραφή !";
+$wb['page_txt'] = "Σελίδα";
+$wb['page_of_txt'] = "από";
+$wb['page_and_txt'] = "και";
+$wb['page_next_txt'] = "Επόμενη";
+$wb['page_back_txt'] = "Επιστροφή";
+$wb['delete_txt'] = "Διαγραφή";
+$wb['filter_txt'] = "Φίλτρο";
+$wb['add_new_record_txt'] = "Νέα εγγραφή";
+$wb['btn_save_txt'] = "Αποθήκευση";
+$wb['btn_cancel_txt'] = "Επιστροφή";
+$wb['top_menu_system'] = "Σύστημα";
+$wb['top_menu_client'] = "Πελάτης";
+$wb['top_menu_email'] = "Email";
+$wb['top_menu_monitor'] = "Εποπτεία";
+$wb['top_menu_sites'] = "Sites";
+$wb['top_menu_dns'] = "DNS";
+$wb['top_menu_tools'] = "Εργαλεία";
+$wb['top_menu_help'] = "Βοήθεια";
+$wb['top_menu_billing'] = "Χρεώσεις";
+$wb['top_menu_domain'] = "Domains";
+$wb['top_menu_dashboard'] = "Αρχική";
+$wb['toolsarea_head_txt'] = "Εργαλεία";
+$wb['latest_news_txt'] = "Τελευταία Νέα";
+$wb['number_format_decimals'] = "2";
+$wb['number_format_dec_point'] = ".";
+$wb['number_format_thousands_sep'] = "";
+$wb['top_menu_vm'] = "VServer";
+$wb['datepicker_nextText'] = "Επόμ.";
+$wb['datepicker_prevText'] = "Προηγ.";
+$wb['daynamesmin_su'] = "Κυ";
+$wb['daynamesmin_mo'] = "Δε";
+$wb['daynamesmin_tu'] = "Τρ";
+$wb['daynamesmin_we'] = "Τε";
+$wb['daynamesmin_th'] = "Πε";
+$wb['daynamesmin_fr'] = "Πα";
+$wb['daynamesmin_sa'] = "Σα";
+$wb['daynames_sunday'] = "Κυριακή";
+$wb['daynames_monday'] = "Δευτέρα";
+$wb['daynames_tuesday'] = "Τρίτη";
+$wb['daynames_wednesday'] = "Τετάρτη";
+$wb['daynames_thursday'] = "Πέμπτη";
+$wb['daynames_friday'] = "Παρασκευή";
+$wb['daynames_saturday'] = "Σάββατο";
+$wb['monthnamesshort_jan'] = "Ιαν";
+$wb['monthnamesshort_feb'] = "Φεβ";
+$wb['monthnamesshort_mar'] = "Μαρ";
+$wb['monthnamesshort_apr'] = "Απρ";
+$wb['monthnamesshort_may'] = "Μαϊ";
+$wb['monthnamesshort_jun'] = "Ιουν";
+$wb['monthnamesshort_jul'] = "Ιουλ";
+$wb['monthnamesshort_aug'] = "Αυγ";
+$wb['monthnamesshort_sep'] = "Σεπ";
+$wb['monthnamesshort_oct'] = "Οκτ";
+$wb['monthnamesshort_nov'] = "Νοε";
+$wb['monthnamesshort_dec'] = "Δεκ";
?>
+
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index a705cb7..732f716 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -30,7 +30,7 @@
$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 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 ff31bab..83260ed 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -9,3 +9,4 @@
$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 0b092e5..91cab72 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 @@
<?php
$wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Ενεργό';
+$wb['active_txt'] = 'Ενεργή';
$wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Ανοιχτές θύρες TCP';
$wb['udp_port_txt'] = 'Ανοιχτές θύρες UDP';
$wb['add_new_record_txt'] = 'Νέα εγγραφή Firewall';
?>
+
diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng
index 6805760..b50df79 100644
--- a/interface/web/admin/lib/lang/el_groups.lng
+++ b/interface/web/admin/lib/lang/el_groups.lng
@@ -3,3 +3,4 @@
$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 977e803..10ce5eb 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['add_new_record_txt'] = 'Νέα ομάδα';
$wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng
index 40760b9..9236d47 100644
--- a/interface/web/admin/lib/lang/el_iptables.lng
+++ b/interface/web/admin/lib/lang/el_iptables.lng
@@ -1,13 +1,14 @@
<?php
$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Πολλαπλές Θύρες';
+$wb['singleport_txt'] = 'Μία Θύρα';
+$wb['protocol_txt'] = 'Πρωτόκολλο';
+$wb['table_txt'] = 'Πίνακας';
+$wb['target_txt'] = 'Στόχος';
+$wb['state_txt'] = 'Κατάσταση';
+$wb['destination_ip_txt'] = 'Διεύθυνση Προορισμού';
+$wb['source_ip_txt'] = 'Διεύθυνση Αφετηρίας';
+$wb['active_txt'] = 'Ενεργή';
+$wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή του firewall για αυτόν τον server.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng
index 15c8bad..a2da45d 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 @@
<?php
$wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
+$wb['add_new_rule_txt'] = 'Προσθήκη κανόνα IPTables';
$wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Πολλαπλές Θύρες';
+$wb['singleport_txt'] = 'Μονή Θύρα';
+$wb['protocol_txt'] = 'Πρωτόκολλο';
+$wb['table_txt'] = 'Πίνακας';
+$wb['target_txt'] = 'Στόχος';
+$wb['state_txt'] = 'Κατάσταση';
+$wb['destination_ip_txt'] = 'Διεύθυνση Προορισμού';
+$wb['source_ip_txt'] = 'Διεύθυνση Εκκίνησης';
+$wb['active_txt'] = 'Ενεργός';
+$wb['iptables_error_unique'] = 'Υπάρχει ήδη μια εγγραφή firewall για αυτόν τον server.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng
index 604f3a7..f783f91 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['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 629d3b2..cf10cab 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['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 5a76f63..6faa60e 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['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 354b886..4ff092f 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['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 4bb61c4..e30eb1f 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['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 fa53073..a9cfee1 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['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 468a822..1c98589 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_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 7458f58..59b017c 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['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 232d2ce..4033a34 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 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 95522db..93fc165 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['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 637ee62..2f961c6 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -13,3 +13,4 @@
$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 8a9096c..1f2a86e 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_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['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['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 038e329..e75bda0 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 1a67786..00185a1 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['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 9d24f06..f19dc82 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['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 fa6c78e..2f7b569 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 @@
<?php
$wb['list_head_txt'] = 'Server';
-$wb['server_name_txt'] = 'Name';
+$wb['server_name_txt'] = 'Όνομα';
$wb['mail_server_txt'] = 'Mail';
$wb['web_server_txt'] = 'Web';
$wb['dns_server_txt'] = 'DNS';
-$wb['file_server_txt'] = 'File';
+$wb['file_server_txt'] = 'Αρχείο';
$wb['db_server_txt'] = 'DB';
$wb['vserver_server_txt'] = 'VServer';
$wb['add_new_record_txt'] = 'Νέος Server';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
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 5e3d0fd..5e1f630 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['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 463c461..f3e22fb 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['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 5b1e222..d52666d 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_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 deb896a..cb3f2c4 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['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 7bdc661..50a4b47 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['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 0f929c4..6c5b8b5 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['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 db91358..eacd385 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -7,7 +7,7 @@
$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['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 eee4305..69b640d 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['add_new_record_txt'] = 'Νέος Χρήστης';
$wb['warning_txt'] = '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b>Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index ee89b2e..e2bb0ab 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -11,3 +11,4 @@
$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 a79478d..44e2bf1 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -98,10 +98,11 @@
$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 ef21bfe..7bd4284 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['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 b3a282d..c2e6044 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_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 1ce866d..30e6969 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['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 5b80e28..dd652bf 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['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 9a4751a..f3e2dff 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -96,12 +96,13 @@
$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 78f7c23..53eecc9 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['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νεός Μεταπωλητής';
?>
+
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index e1828aa..88d459f 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -98,16 +98,16 @@
$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!<br>' .
'This Version: ' . $v1 . '<br>' .
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 144becd..39bf4b8 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 13940bd..351e982 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_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 95f750a..17d42ed 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 @@
<?php
$wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
?>
+
diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng
index acb6c35..29f4a51 100644
--- a/interface/web/designer/lib/lang/el.lng
+++ b/interface/web/designer/lib/lang/el.lng
@@ -1,2 +1,3 @@
<?php
?>
+
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 04ebc02..1e65387 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_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 4cf043a..f428b69 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['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 cf51060..1cedf26 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['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 733e2ae..a253cbc 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['header_txt'] = 'Ιδιότητες αρθρώματος';
$wb['description_txt'] = '<b>Περιγραφή</b> <br><br> <b>Όνομα αρθρώματος:</b> Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.<br> <b>Τίτλος Αρθώματος:</b> Θα εμφανιστεί στο βασικό μενού (επάνω).<br> <b>Αρχείο προτύπου:</b> Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.<br> <b>NaviFrame:</b> Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.<br> <b>Προεπιλεγμένη Σελίδα:</b> Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.<br> <b>Πλάτος Καρτέλας:</b>Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).<br> <b>Βοήθεια:</b> Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο ';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng
index 1edbed0..c5c484d 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['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 02104ad..b41f138 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['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 82a9ecf..af3c434 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 @@
<?php
$wb['title_txt'] = 'Τίτλος';
-$wb['target_txt'] = 'Προορισμός';
+$wb['target_txt'] = 'Στόχος';
$wb['link_txt'] = 'Σύνδεσμος';
$wb['header_txt'] = 'Ιδιότητες Navi';
$wb['save_txt'] = 'Αποθήκευση';
$wb['cancel_txt'] = 'Ακύρωση';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng
index 12895cc..be99c92 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['menu_del_txt'] = 'Θέλετε να διαγράψετε το μενού και όλα τα στοιχεία του;';
$wb['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;';
?>
+
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 8ad3275..3aaaf3f 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -256,6 +256,12 @@
$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));
@@ -273,6 +279,12 @@
case 'srv':
$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;
@@ -292,6 +304,12 @@
$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));
@@ -309,6 +327,12 @@
case 'srv':
$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;
@@ -330,6 +354,12 @@
$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 071cac2..4514422 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,7 +17,8 @@
$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 4f20e9e..7772b5f 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_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 30b3143..05ed360 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_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 77728e3..76a4687 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['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 9d29354..46bcfe2 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['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 cc10beb..4a8cc63 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_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 457213e..8c86953 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['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 890cfc9..85718b7 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['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 02e1572..06ad7cf 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['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 bcd431e..ceb8b13 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['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 83fd36d..b63597c 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['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 4693628..ae3f5d0 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_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 a20a328..aa50cae 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['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 c4dd311..a05a49e 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['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 99c1d73..17446da 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['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 01901ce..1dc24f9 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_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 20e9bf8..2ba9b4d 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['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 ff676a1..64da2e8 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['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 62c2dc8..c98ceca 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['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 6275c56..6ed6d91 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_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 5d56331..b353094 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -11,7 +11,7 @@
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
<div class="ctrlHolder">
<label for="template_id">{tmpl_var name='template_id_txt'}</label>
- <select name="template_id" id="template_id" class="selectInput">
+ <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
{tmpl_var name='template_id_option'}
</select>
</div>
diff --git a/interface/web/domain/lib/lang/el.lng b/interface/web/domain/lib/lang/el.lng
index c1f1284..aab3355 100644
--- a/interface/web/domain/lib/lang/el.lng
+++ b/interface/web/domain/lib/lang/el.lng
@@ -7,3 +7,4 @@
$wb['error_client_can_not_add_domain'] = 'Δεν μπορείτε να προσθέσετε νέο domain';
$wb['error_client_group_id_empty'] = 'Πρέπει να επιλέξετε πελάτη<br>';
?>
+
diff --git a/interface/web/domain/lib/lang/el_domain.lng b/interface/web/domain/lib/lang/el_domain.lng
index 696d10d..79bf5a8 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_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 9430038..7d3a53b 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['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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/ar_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/bg_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/br_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/de_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/lib/lang/el.lng b/interface/web/help/lib/lang/el.lng
index 2a37941..1a690af 100644
--- a/interface/web/help/lib/lang/el.lng
+++ b/interface/web/help/lib/lang/el.lng
@@ -6,9 +6,10 @@
$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 dfc4e87..9f84708 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 @@
<?php
-$wb['faq_faq_txt'] = 'Frequently Asked Questions';
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_answer_txt'] = 'Answer';
-$wb['faq_section_txt'] = 'Section';
+$wb['faq_faq_txt'] = "Συχνές Ερωτήσεις";
+$wb['faq_question_txt'] = "Ερώτηση";
+$wb['faq_answer_txt'] = "Απάντηση";
+$wb['faq_section_txt'] = "Ενότητα";
?>
+
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 54e727d..a05a0a8 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 @@
<?php
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_section_name_txt'] = 'Section';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Section';
-$wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
-$wb['faq_new_question_txt'] = 'Add a new question & answer pair';
+$wb['faq_question_txt'] = 'Ερώτηση';
+$wb['faq_section_name_txt'] = 'Ενότητα';
+$wb['faq_delete_txt'] = 'Διαγραφή';
+$wb['faq_edit_txt'] = 'Επεξεργασία';
+$wb['faq_sections_txt'] = 'Ενότητα';
+$wb['faq_faq_questions_txt'] = 'Συχνές Ερωτήσεις';
+$wb['faq_new_question_txt'] = 'Προσθήκη ζεύγους Ερώτησης - Απάντησης';
?>
+
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 dab0863..e8fdc0a 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 @@
<?php
-$wb['faq_section_name_txt'] = 'Section Name';
+$wb['faq_section_name_txt'] = 'Όνομα Ενότητας';
?>
+
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/el_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 cb6ce84..0811629 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 @@
<?php
-$wb['faq_section_name_txt'] = 'Section Name';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Sections';
-$wb['faq_faq_sections_txt'] = 'FAQ Sections';
-$wb['faq_new_section_txt'] = 'Add a new section';
+$wb['faq_section_name_txt'] = 'Όνομα Ενότητας';
+$wb['faq_delete_txt'] = 'Διαγραφή';
+$wb['faq_edit_txt'] = 'Επεξεργασία';
+$wb['faq_sections_txt'] = 'Ενότητες';
+$wb['faq_faq_sections_txt'] = 'Ενότητες Ερωτήσεων';
+$wb['faq_new_section_txt'] = 'Προσθήκη Ενότητας';
?>
+
diff --git a/interface/web/help/lib/lang/el_support_message.lng b/interface/web/help/lib/lang/el_support_message.lng
index 7ac0adf..1613a71 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['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 e8b2cf3..97381d8 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['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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/en_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/es_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/fi_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/fr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/hr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/hu_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/id_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/it_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/ja_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/nl_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/pl_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/pt_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/ro_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/ru_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/se_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/sk_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
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 0000000..b6c7b46
--- /dev/null
+++ b/interface/web/help/lib/lang/tr_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm
index cba74d2..2451c9f 100644
--- a/interface/web/help/templates/help_faq_list.htm
+++ b/interface/web/help/templates/help_faq_list.htm
@@ -11,7 +11,7 @@
>
<span>Delete</span></a>
</div>
-<a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">Edit</a>
+<a href="#" onClick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
<br/>
<br/>
<br/>
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index e9056a4..849537b 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -15,3 +15,4 @@
$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 d3d25ff..5180b8d 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -45,3 +45,4 @@
$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 767b35a..8b8a3ae 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['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 f6dc457..b3e1f7e 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['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 d4a1658..52f26a0 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['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 fa50e87..dbbe300 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['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 479a3de..75485e4 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['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 a2f23fd..3f3a4d2 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['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 46c6d80..c974878 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['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 2103b5c..200058f 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['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 7e825ad..9c29f47 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['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 b3be224..4a1a84e 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['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 2465af0..fdf5e40 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['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 e21ecb7..55d0e08 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['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 89fb44a..393171c 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['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 d9066d2..0245070 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['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 623c4f2..11e5650 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['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 66d2cb3..4cba326 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_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 0490889..658e6b2 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['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 d9c3059..485d7a1 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 @@
<?php
-$wb['limit_mailmailinglist_txt'] = 'Limit reached';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['listname_error_empty'] = 'Listname is empty.';
-$wb['domain_error_regex'] = 'Invalid domain name.';
-$wb['email_in_use_txt'] = 'Email is in use';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
-$wb['client_txt'] = 'Client';
-$wb['email_txt'] = 'Email';
-$wb['password_txt'] = 'Password';
+$wb['limit_mailmailinglist_txt'] = "Το όριο ξεπεράστηκε.";
+$wb['domain_error_empty'] = "Το Domain είναι άδειο.";
+$wb['listname_error_empty'] = "Η λίστα είναι άδεια.";
+$wb['domain_error_regex'] = "Το όνομα domain δεν είναι έγκυρο/";
+$wb['email_in_use_txt'] = "Το email χρησιμοποιείται ήδη.";
+$wb['no_domain_perm'] = "Δεν έχετε δικαιώματα σε αυτό το domain.";
+$wb['password_strength_txt'] = "Δύναμη συνθηματικού";
+$wb['server_id_txt'] = "Server";
+$wb['domain_txt'] = "Domain";
+$wb['listname_txt'] = "Όνομα λίστας";
+$wb['client_txt'] = "Πελάτης";
+$wb['email_txt'] = "Email";
+$wb['password_txt'] = "Συνθηματικό";
?>
+
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 dac225a..4701821 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 @@
<?php
$wb['list_head_txt'] = 'Mailing List';
$wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
+$wb['listname_txt'] = 'Όνομα Λίστας';
?>
+
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 8a64362..769e306 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['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 80298c1..1028112 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['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 48c4eaa..b6cd719 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['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 9468e4e..4b2f141 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['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 ab097e3..34c779d 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['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 249eee9..72ae994 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['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 a2ea160..dd2e684 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 @@
<?php
-$wb['custom_mailfilter_txt'] = 'Προσαρμοσμένο φίλτρο';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Συνθηματικό';
-$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
-$wb['active_txt'] = 'Active';
-$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'] = 'You have no permission for this 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'] = 'Spamfilter';
-$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'] = '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 cee6a05..39ad5ea 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['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 63efeb4..9f2aa40 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_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 7e3f57b..aa82d04 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['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 5cfd25e..e51cbd3 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['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 6c477f6..80f7c8f 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['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 5fe38d9..f744f35 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['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 2bf1e28..a237748 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['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 c470871..169c21a 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['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 aa8b52e..4654dd2 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['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 94cd6d8..84bd401 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['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 4ab7291..f928816 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['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 3d10f4d..4b89409 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['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 39a9273..e5b6d04 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['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 a18e6ce..1176465 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['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 1ee4470..acbe6cc 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['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 24febf7..811ebea 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['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 95fff21..dde63a0 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['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 e7e20e6..829a661 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -142,8 +142,9 @@
$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 c2db482..8789a43 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['loglevel_txt'] = 'Επίπεδο καταγραφής';
$wb['message_txt'] = 'Μήνυμα';
?>
+
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 20f0b05..88fa3c9 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -196,7 +196,7 @@
$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 122d8e3..904361c 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -1,25 +1,25 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_sys_state">
-
- <div class="pnl_toolsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
- <div class="buttons">
- <div class="ctrlHolder">
- <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
- <select name="refreshinterval" id="refreshinterval" class="selectInput" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
- {tmpl_var name='refresh'}
- </select>
- </div>
- </div>
- </fieldset>
- </div>
-
- <div class="pnl_formarea">
- <fieldset><legend></legend>
- <div class="stateview"><tmpl_var name="state_data"></div>
- </fieldset>
- </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_sys_state">
+
+ <div class="pnl_toolsarea">
+ <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
+ <div class="buttons">
+ <div class="ctrlHolder">
+ <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
+ <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+ {tmpl_var name='refresh'}
+ </select>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+
+ <div class="pnl_formarea">
+ <fieldset><legend></legend>
+ <div class="stateview"><tmpl_var name="state_data"></div>
+ </fieldset>
+ </div>
+
+</div>
diff --git a/interface/web/monitor/tools.inc.php b/interface/web/monitor/tools.inc.php
index 46ccaad..60d006a 100644
--- a/interface/web/monitor/tools.inc.php
+++ b/interface/web/monitor/tools.inc.php
@@ -314,7 +314,7 @@
}
else {
$data = unserialize($record['data']);
- $html .= nl2br($data['output']);
+ $html .= nl2br(html_entity_decode($data['output']));
}
$html .= '</div></div>';
} else {
diff --git a/interface/web/sites/form/web_folder_user.tform.php b/interface/web/sites/form/web_folder_user.tform.php
index de22b3d..6f94c62 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_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 @@
'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 d66ee86..da8b1a5 100644
--- a/interface/web/sites/lib/lang/el.lng
+++ b/interface/web/sites/lib/lang/el.lng
@@ -21,5 +21,6 @@
$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 3e8f7eb..dbc8ecc 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -19,3 +19,4 @@
$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 a43b9da..b629b89 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['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 39f6fa0..78190bd 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_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 f414200..4041622 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['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 ce54134..20f1320 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_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 a5bca9d..863d822 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['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 96c98d3..66db7de 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['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 8b12639..ab7e321 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['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 5468905..71db715 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['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 d93169c..1e1072b 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['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 b12aba2..6ad7f1a 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_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 c085c92..240ed48 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['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_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 9b20914..1553933 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['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 c3f42a9..a35fad5 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['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 93cd40a..410cd3f 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 @@
<?php
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
-$wb['active_txt'] = 'Active';
-$wb['path_error_regex'] = 'Invalid folder path.';
+$wb['path_txt'] = 'Διαδρομή';
+$wb['active_txt'] = 'Ενεργό';
+$wb['path_error_regex'] = 'Μη έγκυρη διαδρομή φακέλου.';
?>
+
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 76d9702..761a6c1 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 @@
<?php
-$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Φάκελος';
+$wb['active_txt'] = 'Ενεργός';
$wb['server_id_txt'] = 'Server';
$wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
+$wb['path_txt'] = 'Διαδρομή';
?>
+
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 f877df2..c10412c 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 @@
<?php
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
-$wb['folder_error_empty'] = 'No web folder selecetd.';
+$wb['web_folder_id_txt'] = "Φάκελος";
+$wb['username_txt'] = "Όνομα Χρήστη";
+$wb['password_txt'] = "Συνθηματικό";
+$wb['active_txt'] = "Ενεργός";
+$wb['folder_error_empty'] = "Δεν επιλέχθηκε φάκελος web.";
?>
+
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 9a7286a..4f6ec20 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 @@
<?php
-$wb['list_head_txt'] = 'Folder User';
-$wb['active_txt'] = 'Active';
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
+$wb['list_head_txt'] = 'Χρήστης Φακέλου';
+$wb['active_txt'] = 'Ενεργός';
+$wb['web_folder_id_txt'] = 'Φάκελος';
+$wb['username_txt'] = 'Όνομα Χρήστη';
?>
+
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 0e8c50a..b7e9d59 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['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 93dd791..0b0167f 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_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 a4426cf..b24ae4d 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['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 423bad5..dd052b0 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['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 bf19b31..5650127 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['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 2ee4481..5b8324a 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 @@
// Enable auth
$liste["auth"] = "yes";
+$auth_sql = $app->tform->getAuthSQL('r', 'web_domain');
+
/*****************************************************
* Suchfelder
@@ -65,7 +67,7 @@
'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 3e62f1d..036a6af 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_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 faeb4ab..2a1a64d 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 32bcea3..29fea41 100644
--- a/interface/web/tools/lib/lang/el.lng
+++ b/interface/web/tools/lib/lang/el.lng
@@ -3,5 +3,6 @@
$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 ce9c955..103489c 100644
--- a/interface/web/tools/lib/lang/el_usersettings.lng
+++ b/interface/web/tools/lib/lang/el_usersettings.lng
@@ -6,3 +6,4 @@
$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 4167e14..1a84681 100644
--- a/interface/web/vm/lib/lang/el.lng
+++ b/interface/web/vm/lib/lang/el.lng
@@ -1,7 +1,8 @@
<?php
-$wb['Virtual Servers'] = 'Virtual Servers';
+$wb['Virtual Servers'] = 'Εικονικοί Servers';
$wb['OS Templates'] = 'OS Templates';
$wb['VM Templates'] = 'VM Templates';
-$wb['IP addresses'] = 'IP addresses';
+$wb['IP addresses'] = 'Διευθύνσεις IP';
$wb['OpenVZ'] = 'OpenVZ';
?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_action.lng b/interface/web/vm/lib/lang/el_openvz_action.lng
index 52f7328..96a7352 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 @@
<?php
$wb['head_txt'] = 'Virtual server actions for VM:';
-$wb['start_txt'] = 'Start virtual server';
-$wb['stop_txt'] = 'Stop virtual server';
-$wb['restart_txt'] = 'Restart virtual server';
-$wb['ostemplate_txt'] = 'Create OSTemplate';
-$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
-$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
-$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
-$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
-$wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characters.';
-$wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
-$wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
+$wb['start_txt'] = 'Εκκίνηση εικονικού server';
+$wb['stop_txt'] = 'Τερματισμός εικονικού server';
+$wb['restart_txt'] = 'Επαννεκίνηση εικονικού server';
+$wb['ostemplate_txt'] = 'Δημιουργία OSTemplate';
+$wb['ostemplate_desc_txt'] = '(παράδειγμα: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Εκτέλεση επιλεγμένης ενέργειας';
+$wb['btn_cancel_txt'] = 'Άκυρο';
+$wb['start_exec_txt'] = 'Η εντολή εκκίνησης εστάλει στον VM host server. Μπορεί να διαρκέσει περισσότερο από ένα λεπτό η εκκίνηση του VM.';
+$wb['stop_exec_txt'] = 'Η εντολή τερματισμού εστάλει στον VM host server. Μπορεί να διαρκέσει περισσότερο από ένα λεπτό ο τερματισμός του VM.';
+$wb['restart_exec_txt'] = 'Η εντολή επανεκκίνησης εστάλει στον VM host server. Μπορεί να διαρκέσει περισσότερο από ένα λεπτό η επανεκκίνηση του VM.';
+$wb['ostemplate_name_error'] = 'Το OSTemplate περιέχει μη επιτρεπτούς χαρακτήρες.';
+$wb['ostemplate_name_unique_error'] = 'Υπάρχει ήδη ένα OSTemplate με αυτό το όνομα.';
+$wb['ostemplate_exec_txt'] = 'Η εντολή δημιουργίας του OSTemplate εστάλει στον server. Μπορεί να διαρκέσει αρκετά λεπτά η πλήρης δημιουργία του OSTemplate.';
?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ip.lng b/interface/web/vm/lib/lang/el_openvz_ip.lng
index 6016681..a0252fc 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 @@
<?php
$wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
-$wb['vm_id_txt'] = 'Virtual server';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
+$wb['vm_id_txt'] = 'Εικονικός server';
$wb['reserved_txt'] = 'Reserved';
-$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
-$wb['ip_error_unique'] = 'This IP address does already exist.';
-$wb['IP address'] = 'IP address';
+$wb['ip_error_wrong'] = 'Παρακαλούμε συμπληρώστε μια έγκυρη διεύθυνση IPv4.';
+$wb['ip_error_unique'] = 'Η διεύθυνση IP υπάρχει ήδη.';
+$wb['IP address'] = 'Διεύθυνση IP';
?>
+
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 c5f0601..388df19 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 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
+$wb['list_head_txt'] = 'Διευθύνσεις IP OpenVZ';
$wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['reserved_txt'] = 'Reserved';
?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_ostemplate.lng b/interface/web/vm/lib/lang/el_openvz_ostemplate.lng
index 256750f..802ed82 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 @@
<?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
+$wb['template_name_txt'] = 'Όνομα προτύπυ';
+$wb['template_file_txt'] = 'Αρχείο προτύπου';
$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['template_file_error_empty'] = 'Template filename is empty.';
-$wb['Template'] = 'Template';
+$wb['allservers_txt'] = 'Υπάρχει σε όλους τους servers';
+$wb['active_txt'] = 'Ενεργό';
+$wb['description_txt'] = 'Περιγραφή';
+$wb['template_name_error_empty'] = 'Το όνομα του προτύπου είναι κενό.';
+$wb['template_file_error_empty'] = 'Το αρχείο του προτύπου δεν έχει καθοριστεί.';
+$wb['Template'] = 'Πρότυπο';
?>
+
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 6471ec0..a950faa 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 @@
<?php
$wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['active_txt'] = 'Ενεργό';
+$wb['template_name_txt'] = 'Όνομα προτύπου';
$wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['allservers_txt'] = 'Υπάρχει σε όλους τους servers';
$wb['ostemplate_id_txt'] = 'ID';
?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index d285512..023aa07 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['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['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['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 de4045c..781ef0a 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 @@
<?php
-$wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Πρότυπο Εικονικής Μηχανής OpenVZ';
+$wb['active_txt'] = 'Ενεργό';
+$wb['template_name_txt'] = 'Όνομα Προτύπου';
?>
+
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index f2be022..a4f6a2e 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 @@
<?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Χώρος Δίσκου';
+$wb['ram_txt'] = 'RAM (εγγυημένη)';
$wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU number';
-$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['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(διαχωριστικός χαρακτήρας το κενό)';
+$wb['capability_txt'] = 'Δυνατότητα';
$wb['server_id_txt'] = 'Hostserver';
$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['template_id_txt'] = 'Πρότυπο';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['hostname_txt'] = 'Hostname';
-$wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['client_group_id_txt'] = 'Client';
+$wb['vm_password_txt'] = 'Συνθηματικό VM';
+$wb['start_boot_txt'] = 'Εκκίνηση στο boot';
+$wb['active_txt'] = 'EΕνεργός';
+$wb['description_txt'] = 'Περιγραφή';
+$wb['client_group_id_txt'] = 'Πελάτης';
$wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['active_until_date_txt'] = 'Active until date';
-$wb['ip_address_error_empty'] = 'IP address is empty.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['vm_password_error_empty'] = 'VM Password is empty.';
-$wb['veid_error_empty'] = 'VEID is empty.';
-$wb['veid_error_unique'] = 'VEID does already exist.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU number is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['Virtual server'] = 'Virtual server';
-$wb['Advanced'] = 'Advanced';
+$wb['create_dns_txt'] = 'Δημιουργία DNS για το hostname';
+$wb['active_until_date_txt'] = 'Εν ενεργεία μέχρητ την ημερομηνία';
+$wb['ip_address_error_empty'] = 'Η διεύθυνση IP είναι κενή.';
+$wb['hostname_error_empty'] = 'Το Hostname είναι κενό.';
+$wb['vm_password_error_empty'] = 'Το συνθηματικό VM είναι κενό.';
+$wb['veid_error_empty'] = 'Το VEID είναι κενό.';
+$wb['veid_error_unique'] = 'Το VEID υπάρχει ήδη.';
+$wb['diskspace_error_empty'] = 'Το Diskspace είναι κενό.';
+$wb['ram_error_empty'] = 'Το RAM (εγγυημένη) είναι κενό.';
+$wb['ram_burst_error_empty'] = 'Το RAM (burst) είναι κενό.';
+$wb['cpu_units_error_empty'] = 'Το μονάδες CPU είναι κενό.';
+$wb['cpu_num_error_empty'] = 'Το αριθμός CPU είναι κενό.';
+$wb['cpu_limit_error_empty'] = 'Το όριο CPU είναι κενό.';
+$wb['io_priority_error_empty'] = 'Το Προτεραιότητα Ε/Ε είναι κενό.';
+$wb['template_nameserver_error_empty'] = 'Το Nameserver(s) είναι κενό.';
+$wb['Virtual server'] = 'Εικονικός server';
+$wb['Advanced'] = 'Για προχωρημένους';
?>
+
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 2238e2b..dee8b9d 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 @@
<?php
-$wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Εικονικός server';
+$wb['active_txt'] = 'Ενεργός';
$wb['server_id_txt'] = 'Hostserver';
$wb['ostemplate_id_txt'] = 'OSTemplate';
-$wb['template_id_txt'] = 'Template';
+$wb['template_id_txt'] = 'Πρότυπο';
$wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['veid_txt'] = 'VEID';
?>
+
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 e680462..acc62e5 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"];
<tmpl_if name="cc">
# Send a copy of email to
@@ -28,11 +28,8 @@
# Stop here so that we do not reply on spams
stop;
}
-
-if allof(currentdate :value "ge" "iso8601" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
vacation :days 1
- :subject "<tmpl_var name='autoresponder_subject'>"
- <tmpl_var name='addresses'>
+ :subject "Out of office reply"
+ # :addresses ["test@test.int", "till@test.int"]
"<tmpl_var name='autoresponder_text'>";
-}
-</tmpl_if>
+</tmpl_if>
\ 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 0000000..78a9355
--- /dev/null
+++ b/server/conf/sieve_filter_1.2.master
@@ -0,0 +1,39 @@
+require ["fileinto", "regex", "date", "relational", "vacation"];
+
+<tmpl_if name="cc">
+# Send a copy of email to
+redirect "<tmpl_var name='cc'>";
+keep;
+</tmpl_if>
+
+<tmpl_if name="move_junk" op="==" value="y">
+# 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;
+}
+</tmpl_if>
+
+<tmpl_var name='custom_mailfilter'>
+
+<tmpl_if name="autoresponder" op="==" value="y">
+#################################################################
+# 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" "<tmpl_var name='start_date'>", currentdate :value "le" "iso8601" "<tmpl_var name='end_date'>") {
+vacation :days 1
+ :subject "<tmpl_var name='autoresponder_subject'>"
+ <tmpl_var name='addresses'>
+ "<tmpl_var name='autoresponder_text'>";
+}
+</tmpl_if>
+
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index ae1287d..3345e0b 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -176,7 +176,7 @@
<tmpl_if name='fastcgi_config_syntax' op='==' value='2'>
FcgidIdleTimeout 300
FcgidProcessLifeTime 3600
- FcgidMaxProcesses 1000
+ # FcgidMaxProcesses 1000
FcgidMinProcessesPerClass 0
FcgidMaxProcessesPerClass 100
FcgidConnectTimeout 3
@@ -215,7 +215,7 @@
RewriteEngine on
<tmpl_if name='seo_redirect_enabled'>
RewriteCond %{HTTP_HOST} ^<tmpl_var name='seo_redirect_origin_domain'>$ [NC]
- RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>/$1 [R=301,L]
+ RewriteRule ^(.*)$ http://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,L]
</tmpl_if>
<tmpl_loop name="redirects">
RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index 26768c3..f120bcb 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -175,7 +175,13 @@
$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 @@
$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 ec85bed..bfb03be 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -120,6 +120,13 @@
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 @@
* 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 @@
* 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 fbf91b9..7dc07fe 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -190,7 +190,7 @@
//* 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 @@
//* 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';
@@ -227,7 +227,6 @@
$app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
$app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
}
-
}
@@ -542,74 +541,76 @@
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");
+ // 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);
+ $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);
+ //* 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';
+ //* 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
$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);
- //* 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) {
+ // 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'));
}
- 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'));
}
// 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 5701799..25e4cf2 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -101,9 +101,23 @@
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 946aaaa..7677778 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -235,7 +235,7 @@
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 @@
$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 c1e2b2c..50d2b24 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -266,14 +266,14 @@
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 @@
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 @@
$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 312148d..6ffa889 100755
--- a/server/scripts/create_jailkit_chroot.sh
+++ b/server/scripts/create_jailkit_chroot.sh
@@ -21,7 +21,7 @@
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 c5ff5ac..5e27cb5 100644
--- a/server/server.php
+++ b/server/server.php
@@ -38,19 +38,6 @@
$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
*/
if ($app->dbmaster->connect()) {
--
Gitblit v1.9.1