diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall
index 86da005ac7375ed58bfb6c08fe6ea5ef624eae2c..d5723dbdbc341a152ea775340becc9e5c51aea3a 100644
--- a/install/apps/bastille-firewall
+++ b/install/apps/bastille-firewall
@@ -58,7 +58,7 @@
### END INIT INFO
-REALSCRIPT=/sbin/bastille-ipchains
+REALSCRIPT=/sbin/bastille-netfilter
PATH=/sbin:/bin:/usr/sbin:/usr/bin
# exit function to be called in place of regular Bourne exit
@@ -78,13 +78,6 @@ if [ $? -ne 0 ]; then
exit 1
fi
-if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then
- # We are using Linux 2.3 or newer; use the netfilter script if available
- if [ -x /sbin/bastille-netfilter ]; then
- REALSCRIPT=/sbin/bastille-netfilter
- fi
-fi
-
if [ ! -x ${REALSCRIPT} ]; then
echo "ERROR: \"${REALSCRIPT}\" not available!"
clean_exit 1
diff --git a/install/autoupdate.php b/install/autoupdate.php
index a9863cee2dd362528573001d01826616ae9f0d79..ba5b1a1e6393c4de41687f30bc85e2e40b7a50b5 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -144,6 +144,11 @@ if( empty($conf["mysql"]["admin_password"]) ) {
die("internal error - MYSQL-Root passord not known");
}
+//** Test mysql root connection
+if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
+ die("internal error - MYSQL-Root passord wrong");
+}
+
/*
* Check all tables
*/
@@ -156,7 +161,6 @@ prepareDBDump();
//* initialize the database
$inst->db = new db();
-$inst->db->dbName = $conf["mysql"]["database"];
/*
* The next line is a bit tricky!
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 4efb6fc3b12abba34e08d3445c6b46e254d0dc2c..51f2dff824e3cf03cf7d402738cef4802e873acf 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1029,6 +1029,11 @@ class installer_dist extends installer_base {
// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0);
+ if(is_file($install_dir.'/interface/invoices')) {
+ chmod($install_dir.'/interface/invoices', 0770);
+ chown($install_dir.'/interface/invoices', 'ispconfig');
+ chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ }
}
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index ffe5ef2c26a5744c0ed79035838e3bf5d2c3b18a..c5fdad0e770edc18d76352b66e78c25d6b7e3089 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -866,6 +866,12 @@ class installer extends installer_base
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
}
+ if(is_file($install_dir.'/interface/invoices')) {
+ chmod($install_dir.'/interface/invoices', 0770);
+ chown($install_dir.'/interface/invoices', 'ispconfig');
+ chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ }
+
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
// and must be fixed as this will allow the apache user to read the ispconfig files.
// Later this must run as own apache server or via suexec!
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 22438cc59feede6296477d816c70825dada7bce7..eed222634f8e42bb2be858f76b76ef8d7d420981 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1060,6 +1060,12 @@ class installer_dist extends installer_base {
exec('chmod 744 /usr/local/bin/run-getmail.sh');
}
+ if(is_file($install_dir.'/interface/invoices')) {
+ chmod($install_dir.'/interface/invoices', 0770);
+ chown($install_dir.'/interface/invoices', 'ispconfig');
+ chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ }
+
}
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 318cda923e0e76500b3e8f11914fbd2eb04ba77c..0d8eb400b24bfbc58e4a87157dcf25b4aa753787 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -582,8 +582,8 @@ function removeLine($filename,$search_pattern,$strict = 0) {
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
- if(isset($out[0]) && stristr($out[0],$appname)) {
+ exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
+ if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
return true;
} else {
return false;
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index b0cbfd650e4b637333f5e6d1ebcb3b05213f639c..0021057cc55f50c162971e588f0b783b17f528fe 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -514,6 +514,10 @@ class installer_base {
copy('tpl/'.$jk_init.'.master', $config_dir.'/'.$jk_init);
copy('tpl/'.$jk_chrootsh.'.master', $config_dir.'/'.$jk_chrootsh);
}
+
+ //* help jailkit fo find its ini files
+ if(!is_link('/usr/jk_socketd.ini')) exec('ln -s /etc/jailkit/jk_socketd.ini /usr/jk_socketd.ini');
+ if(!is_link('/usr/jk_init.ini')) exec('ln -s /etc/jailkit/jk_init.ini /usr/jk_init.ini');
}
@@ -903,7 +907,7 @@ class installer_base {
if(is_file($config_dir.'/'.$configfile)) {
copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
}
- chmod($config_dir.'/'.$configfile.'~', 0400);
+ if(is_file($config_dir.'/'.$configfile.'~')) chmod($config_dir.'/'.$configfile.'~', 0400);
$content = rf('tpl/debian_dovecot-sql.conf.master');
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
@@ -1758,6 +1762,12 @@ class installer_base {
chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
}
+
+ if(is_file($install_dir.'/interface/invoices')) {
+ chmod($install_dir.'/interface/invoices', 0770);
+ chown($install_dir.'/interface/invoices', 'ispconfig');
+ chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ }
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
// and must be fixed as this will allow the apache user to read the ispconfig files.
@@ -1952,7 +1962,7 @@ class installer_base {
wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
- chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
+ chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
}
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index d95bbf8043bc63e5993d8b5a0bd3175d1530f2fd..729ee04d89760f946c2b30570145fec3f4f7c6d6 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -113,7 +113,7 @@ function updateDbAndIni() {
$ini_array = ini_to_array(stripslashes($tmp['config']));
$current_db_version = (isset($tmp['dbversion']))?intval($tmp['dbversion']):0;
- if(count($ini_array) == 0) die('Unable to read server configuration from database.');
+ if(!is_array($ini_array) or count($ini_array) == 0) die('Unable to read server configuration from database.');
$conf['services']['mail'] = ($tmp['mail_server'] == 1)?true:false;
$conf['services']['web'] = ($tmp['web_server'] == 1)?true:false;
@@ -231,7 +231,7 @@ function updateDbAndIni() {
//** Update server ini
- $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
+ $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
unset($tmp_server_rec);
$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
@@ -286,7 +286,7 @@ function updateDbAndIni() {
}
$new_ini = array_to_ini($tpl_ini_array);
- $sql = "UPDATE server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
+ $sql = "UPDATE ".$conf["mysql"]["database"].".server SET config = '".mysql_real_escape_string($new_ini)."' WHERE server_id = ".$conf['server_id'];
$inst->db->query($sql);
unset($old_ini_array);
unset($tpl_ini_array);
@@ -294,7 +294,7 @@ function updateDbAndIni() {
//** Update system ini
- $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM sys_ini WHERE sysini_id = 1");
+ $tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM ".$conf["mysql"]["database"].".sys_ini WHERE sysini_id = 1");
$old_ini_array = ini_to_array(stripslashes($tmp_server_rec['config']));
unset($tmp_server_rec);
$tpl_ini_array = ini_to_array(rf('tpl/system.ini.master'));
@@ -309,11 +309,11 @@ function updateDbAndIni() {
}
$new_ini = array_to_ini($tpl_ini_array);
- $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM sys_ini WHERE 1');
+ $tmp = $inst->db->queryOneRecord('SELECT count(sysini_id) as number FROM '.$conf["mysql"]["database"].'.sys_ini WHERE 1');
if($tmp['number'] == 0) {
- $inst->db->query("INSERT INTO sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
+ $inst->db->query("INSERT INTO ".$conf["mysql"]["database"].".sys_ini (sysini_id, config) VALUES (1,'".mysql_real_escape_string($new_ini)."')");
} else {
- $inst->db->query("UPDATE sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
+ $inst->db->query("UPDATE ".$conf["mysql"]["database"].".sys_ini SET config = '".mysql_real_escape_string($new_ini)."' WHERE sysini_id = 1");
}
unset($old_ini_array);
unset($tpl_ini_array);
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index fd6264855d081c927f2c3c4f35860bef538a50fa..11d1b6c65e19d70f3c70c6f9871b24590953433d 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1919,6 +1919,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4.1');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 99d4402c476a4f0a6b92e1f5d156ed82bca5c72c..a6abb12a6ce48c5fb389d69d41cda34171b1301c 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.4');
+define('ISPC_APP_VERSION', '3.0.4.1');
define('DEVSYSTEM', 0);
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index b04abdebced7412a61283799016b044c7fdf349c..380c86b47883dc6eb235e572bc359d744299e792 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -13,20 +13,6 @@ driver = mysql
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
default_pass_scheme = CRYPT
-password_query = SELECT password FROM mail_user \
- WHERE login = '%u' AND disable%Ls = 'n'
-
-# Old user query quota part
-# CONCAT('*:storage=', quota , 'B') AS quota_rule
-# Old user query with email instead of login
-# WHERE email = '%u' AND disable%Ls = 'n'
-
-user_query = SELECT email as user, \
- maildir as home, \
- CONCAT('maildir:', maildir, '/Maildir') as mail, \
- uid, \
- gid, \
- CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, \
- CONCAT(maildir, '/.sieve') as sieve \
- FROM mail_user \
- WHERE email = '%u' AND disable%Ls = 'n'
+password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+# user_query = SELECT email AS user, maildir AS home, CONCAT('*:storage=', quota , 'B') AS quota_rule FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index 969a9ed99c234ac2b067d23c3a2f2e1f03f3ef53..8b110e92d0cc74217d6a12ec59679b3170e070bc 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -122,6 +122,6 @@ default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master
index 6d7cf62b670a6a0df6a43ee7d1084ac614041ff4..de28a7cf5d4d90056d26419f0e4961414bbd6c3b 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -135,4 +135,4 @@ default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master
index 6d7cf62b670a6a0df6a43ee7d1084ac614041ff4..66bcdc87bab70abcf7c248dbad169e7693342fca 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -134,5 +134,4 @@ connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_se
default_pass_scheme = CRYPT
password_query = SELECT password FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-# user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', floor(quota/1024)) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE login = '%u' AND disable%Ls = 'n'
-user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', floor(quota/1024), 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
+user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n'
diff --git a/install/update.php b/install/update.php
index 74764ce4e261e49f34a6059ba1c6d958a72c734f..769cdce59075c321a9506d33475a8c258eab2b2b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -139,11 +139,17 @@ $clientdb_host = '';
$clientdb_user = '';
$clientdb_password = '';
-//** Ask user for mysql admin_password if empty
-if( empty($conf["mysql"]["admin_password"]) ) {
-
- $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
-}
+//** Test mysql root connection
+$finished = false;
+do {
+ if(@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
+ $finished = true;
+ } else {
+ swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
+ $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
+ }
+} while ($finished == false);
+unset($finished);
/*
* Prepare the dump of the database
@@ -152,7 +158,6 @@ prepareDBDump();
//* initialize the database
$inst->db = new db();
-$inst->db->dbName = $conf["mysql"]["database"];
//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index a5843d660329b03fbcd5babfce6dcb8ee5d25e3f..d4b1390c8304181863f5313c18ad4eea73799c88 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -282,7 +282,7 @@ class listform {
public function decode($record)
{
global $conf, $app;
- if(is_array($record) && count($record) > 0) {
+ if(is_array($record) && count($record) > 0 && is_array($this->listDef['item'])) {
foreach($this->listDef['item'] as $field){
$key = $field['field'];
if(isset($record[$key])) {
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 8d043a430abbcc4083d25c0a21e96e24abd6bab1..33d84aba9a0ef34454ab88a792c764d51fbf5591 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1372,6 +1372,13 @@ class remoting {
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
+
+ //* Set a few defaults for nginx servers
+ if($params['pm_max_children'] == '') $params['pm_max_children'] = 1;
+ if($params['pm_start_servers'] == '') $params['pm_start_servers'] = 1;
+ if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
+ if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
+
$affected_rows = $this->updateQuery('../sites/form/web_domain.tform.php',$client_id,$primary_id,$params);
return $affected_rows;
}
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index dca047499fc9141760f34231546472c12efe29d6..add04e6a48b6740e2d81751634d555fe6e89c19c 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -1,70 +1,71 @@
+
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index a705cb71742b764313e4c6ea8a6c4dbf9fa124b8..732f71645ca344e632517c7d8e4e892242eaa506 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -30,7 +30,7 @@ $wb['Language Editor'] = 'Επεξεργαστής Γλώσσας';
$wb['Software'] = 'Εφαρμογές & Πρόσθετα';
$wb['Repositories'] = 'Αποθετήρια';
$wb['Server Services'] = 'Υπηρεσίες Server';
-$wb['Interface Config'] = 'Ρύθμιση Εμφάνισης';
+$wb['Interface Config'] = 'Ρυθμίσεις Εμφάνισης';
$wb['Packages'] = 'Πακέτα';
$wb['Updates'] = 'Ενημερώσεις';
$wb['Merge'] = 'Συγχώνευση';
@@ -38,6 +38,7 @@ $wb['Remote Users'] = 'Απομακρυσμένοι Χρήστες';
$wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες';
$wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος';
$wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig';
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
+$wb['1001'] = 'Το όνομα χρήστη ή το συνθηματικό είναι κενό.';
+$wb['1002'] = 'Το όνομα χρήστη ή το συνθηματικό είναι λάθος.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_firewall.lng b/interface/web/admin/lib/lang/el_firewall.lng
index ff31bab28b9c2b375a1c242ef1173bc284b92a22..83260ed3aac3ecca0488aed98e3fd5b871c17815 100644
--- a/interface/web/admin/lib/lang/el_firewall.lng
+++ b/interface/web/admin/lib/lang/el_firewall.lng
@@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Υπάρχει ήδη μια εγγραφή fire
$wb['tcp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών tcp. Επιτρέπονται μόνο αριθμοί, : και ,.';
$wb['udp_ports_error_regex'] = 'Οι χαρακτήρες δεν επιτρέπονται στον ορισμό θυρών udp. Επιτρέπονται μόνο αριθμοί, : και ,.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_firewall_list.lng b/interface/web/admin/lib/lang/el_firewall_list.lng
index 0b092e5af160557b31356bedcc3c2735a0285a8e..91cab725f593e33b8054c3bd8c16d0e8329b83b9 100644
--- a/interface/web/admin/lib/lang/el_firewall_list.lng
+++ b/interface/web/admin/lib/lang/el_firewall_list.lng
@@ -1,8 +1,9 @@
+
diff --git a/interface/web/admin/lib/lang/el_groups.lng b/interface/web/admin/lib/lang/el_groups.lng
index 68057608f63c7658f958ff4ea6cbbb888dd0cec6..b50df798148ca72621f8c1b428459ac786195748 100644
--- a/interface/web/admin/lib/lang/el_groups.lng
+++ b/interface/web/admin/lib/lang/el_groups.lng
@@ -3,3 +3,4 @@ $wb['description_txt'] = 'Περιγραφή';
$wb['name_txt'] = 'Ομάδα';
$wb['name_err'] = 'Η ομάδα πρέπει να έχει από 1 μέχρι 30 χαρακτήρες.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_groups_list.lng b/interface/web/admin/lib/lang/el_groups_list.lng
index 977e8032da5b65df8fdbcd5b7d67ba2a7755a988..10ce5ebceb520121e01e47f46b482d3124c7df87 100644
--- a/interface/web/admin/lib/lang/el_groups_list.lng
+++ b/interface/web/admin/lib/lang/el_groups_list.lng
@@ -5,3 +5,4 @@ $wb['name_txt'] = 'Ομάδα';
$wb['add_new_record_txt'] = 'Νέα ομάδα';
$wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε οποιαδήποτε ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/admin/lib/lang/el_iptables.lng b/interface/web/admin/lib/lang/el_iptables.lng
index 40760b9498ccdcadaca2bfbdc42748443abb6046..9236d4778c6b2c1c35eb97b433461e4b68adf802 100644
--- a/interface/web/admin/lib/lang/el_iptables.lng
+++ b/interface/web/admin/lib/lang/el_iptables.lng
@@ -1,13 +1,14 @@
+
diff --git a/interface/web/admin/lib/lang/el_iptables_list.lng b/interface/web/admin/lib/lang/el_iptables_list.lng
index 15c8baddcb2be5ab4dce61e0d233916f35e436f1..a2da45d8228c5640e6fc641edf6b1d75ed9a12b3 100644
--- a/interface/web/admin/lib/lang/el_iptables_list.lng
+++ b/interface/web/admin/lib/lang/el_iptables_list.lng
@@ -1,15 +1,16 @@
+
diff --git a/interface/web/admin/lib/lang/el_language_add.lng b/interface/web/admin/lib/lang/el_language_add.lng
index 604f3a7aba386c6d4efdfec24e94d88a4f32fc9a..f783f913c554cd823479120a17a797618ccf33bc 100644
--- a/interface/web/admin/lib/lang/el_language_add.lng
+++ b/interface/web/admin/lib/lang/el_language_add.lng
@@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = 'Κωδικός γλώσσας 2 χαρακτήρ
$wb['btn_save_txt'] = 'Νέα ομάδα αρχείων γλώσσας';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_complete.lng b/interface/web/admin/lib/lang/el_language_complete.lng
index 629d3b2e5e7939147cd0a10a08f4a39af2c8472c..cf10cabc3e2881a9b5ba141f52bfdc1f6170ce2f 100644
--- a/interface/web/admin/lib/lang/el_language_complete.lng
+++ b/interface/web/admin/lib/lang/el_language_complete.lng
@@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Επιλογή Γλώσσας';
$wb['btn_save_txt'] = 'Συγχώνευση Γλώσσας τώρα';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_edit.lng b/interface/web/admin/lib/lang/el_language_edit.lng
index 5a76f63a0692f47b059375a60b2ef7959f15b743..6faa60e6b7971cfdb09a16319ec0bc4bf54d2e68 100644
--- a/interface/web/admin/lib/lang/el_language_edit.lng
+++ b/interface/web/admin/lib/lang/el_language_edit.lng
@@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Αρχείο γλώσσας';
$wb['btn_save_txt'] = 'Αποθήκευση';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_export.lng b/interface/web/admin/lib/lang/el_language_export.lng
index 354b886d42ef92b55698f5a030e197fb354e31fc..4ff092fc17bc3bb07e192f07da9156d8d8755ceb 100644
--- a/interface/web/admin/lib/lang/el_language_export.lng
+++ b/interface/web/admin/lib/lang/el_language_export.lng
@@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Επιλογή Γλώσσας';
$wb['btn_save_txt'] = 'Εξαγωγή της επιλεγμένης λίστας αρχείων γλώσσας';
$wb['btn_cancel_txt'] = 'Επιστροφή';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_import.lng b/interface/web/admin/lib/lang/el_language_import.lng
index 4bb61c4ef5e5a6cf7e6308c6e01e6c618eac217c..e30eb1ff3c4f2d2ec0198164b71170c752630ad1 100644
--- a/interface/web/admin/lib/lang/el_language_import.lng
+++ b/interface/web/admin/lib/lang/el_language_import.lng
@@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Αντικατάσταση αρχείου, αν
$wb['btn_cancel_txt'] = 'Επιστροφή';
$wb['ignore_version_txt'] = 'Παράλειψη ελέγχου έκδοσης ISPConfig';
?>
+
diff --git a/interface/web/admin/lib/lang/el_language_list.lng b/interface/web/admin/lib/lang/el_language_list.lng
index fa5307319ac0748a8e6d083430ef136bd15fafa7..a9cfee1716e2ad08694fb207adbe7955b7468703 100644
--- a/interface/web/admin/lib/lang/el_language_list.lng
+++ b/interface/web/admin/lib/lang/el_language_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Άρθρωμα';
$wb['lang_file_txt'] = 'Αρχείο Γλώσσας';
$wb['lang_file_date_txt'] = 'Τελευταία τροποποίηση';
?>
+
diff --git a/interface/web/admin/lib/lang/el_package_install.lng b/interface/web/admin/lib/lang/el_package_install.lng
index 468a82230ae76c67b766634737ebc4209edef423..1c98589076a89f06b51f57e4004ec4012cd06b7f 100644
--- a/interface/web/admin/lib/lang/el_package_install.lng
+++ b/interface/web/admin/lib/lang/el_package_install.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Όνομα Χρήστη (προαιρετικό)';
$wb['repo_password_txt'] = 'Συνθηματικό (προαιρετικό)';
$wb['active_txt'] = 'Ενεργό';
?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_action.lng b/interface/web/admin/lib/lang/el_remote_action.lng
index 7458f585125903e8fcca1527b2f8f331e932d6b1..59b017c4c9c40045bb5a4aadceae16d592e9167e 100644
--- a/interface/web/admin/lib/lang/el_remote_action.lng
+++ b/interface/web/admin/lib/lang/el_remote_action.lng
@@ -8,3 +8,4 @@ $wb['do_ispcupdate_desc'] = 'Αυτή η ενέργεια κάνει αναβά
$wb['action_scheduled'] = 'Η ενέργεια προγραμματίστηκε για εκτέλεση';
$wb['select_all_server'] = 'Σε όλους τους servers';
?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_user.lng b/interface/web/admin/lib/lang/el_remote_user.lng
index 232d2ce869676564f6a48dd03caa8ac83592689d..4033a34250141d64ad6c76a0b81fb4d3aad768ee 100644
--- a/interface/web/admin/lib/lang/el_remote_user.lng
+++ b/interface/web/admin/lib/lang/el_remote_user.lng
@@ -39,5 +39,6 @@ $wb['DNS ptr functions'] = 'Ενέργειες εγγραφών ptr του DNS';
$wb['DNS rp functions'] = 'Ενέργειες εγγραφών rp του DNS';
$wb['DNS srv functions'] = 'Ενέργειες εγγραφών srv του DNS';
$wb['DNS txt functions'] = 'Ενέργειες εγγραφών txt του DNS';
-$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
+$wb['Mail mailing list functions'] = 'Ενέργειες Mail mailinglist';
?>
+
diff --git a/interface/web/admin/lib/lang/el_remote_user_list.lng b/interface/web/admin/lib/lang/el_remote_user_list.lng
index 95522db7d50c71171a0571004fa9d9200e55e719..93fc165afb082748401236a464204a70679cdf34 100644
--- a/interface/web/admin/lib/lang/el_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/el_remote_user_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Νέος Χρήστης';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Όνομα Χρήστη';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng
index 637ee62bd9707ed5518fd32cb105638005720672..2f961c64c96ebc0d3f26759f70de161823ecf0a2 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -13,3 +13,4 @@ $wb['- None -'] = '- Κανενός -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 8a9096c32a0b87f5ae0eabc9cf8c233b012a72b8..1f2a86e893aee227cb24df38b9aa42ae8118a59a 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
$wb['website_path_txt'] = 'Διαδρομή Website';
$wb['website_symlinks_txt'] = 'Website symlinks';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_symlinks_rel_txt'] = 'Δημιουργία σχετικών symlinks';
$wb['website_basedir_txt'] = 'Βασικός φάκελος Website';
$wb['vhost_conf_dir_txt'] = 'Φάκελος ρυθμίσεων Vhost';
$wb['vhost_conf_enabled_dir_txt'] = 'Φάκελος ρυθμίσεων (ενεργών) Vhost';
@@ -75,26 +75,26 @@ $wb['named_conf_local_path_txt'] = 'Διαδρομή του named.conf.local τ
$wb['php_ini_path_cgi_txt'] = 'Διαδρομή του php.ini για CGI';
$wb['php_ini_path_apache_txt'] = 'Διαδρομή του php.ini για Apache';
$wb['check_apache_config_txt'] = 'Έλεγχος των ρυθμίσεων του apache ή επαννεκίνηση';
-$wb['CA_path_txt'] = 'CA Path';
-$wb['CA_pass_txt'] = 'CA passphrase';
+$wb['CA_path_txt'] = 'Διαδρομή CA';
+$wb['CA_pass_txt'] = 'Συνθηματική φράση CA';
$wb['ufw_enable_txt'] = 'Enable';
-$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
-$wb['ufw_ipv6_txt'] = 'Enable IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
-$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
-$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
-$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Log Level';
-$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['ufw_manage_builtins_txt'] = 'Διαχείριση ενσωματωμένων κανόνων';
+$wb['ufw_ipv6_txt'] = 'Ενεργοποίηση IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Προκαθορισμένη Πολιτική Εισόδου';
+$wb['ufw_default_output_policy_txt'] = 'Προκαθορισμένη Πολιτική Εξόδου';
+$wb['ufw_default_forward_policy_txt'] = 'Προκαθορισμένη Πολιτική Προώθησης';
+$wb['ufw_default_application_policy_txt'] = 'Προκαθορισμένη Πολιτική Εφαρμογών';
+$wb['ufw_log_level_txt'] = 'Επίπεδο Καταγραφής';
+$wb['network_config_warning_txt'] = 'Η επιλογή για την παραμετροποίηση του δικτύου είναι διαθέσιμη μόνο για Debian και Ubuntu Servers. Μην ενεργοποιείτε αυτή την επιλογή αν η (διεπαφή) κάρτα δικτύου δεν είναι η eth0.';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
$wb['backup_dir_ftpread_txt'] = 'Backup dir. readable for website FTP users.';
-$wb['server_type_txt'] = 'Server Type';
+$wb['server_type_txt'] = 'Τύπος Server';
$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
-$wb['nginx_user_txt'] = 'Nginx user';
-$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_user_txt'] = 'Χρήστης Nginx';
+$wb['nginx_group_txt'] = 'Ομάδα Nginx';
$wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['backup_dir_error_empty'] = 'Ο φάκελος Backup είναι άδειος.';
$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
@@ -150,3 +150,4 @@ $wb['rescue_description_txt'] = 'Information: If you want to shut down my
$wb['enable_sni_txt'] = 'Enable SNI';
$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server_config_list.lng b/interface/web/admin/lib/lang/el_server_config_list.lng
index 038e329761bfdd238bb6541c3ec1dcd92030b2f8..e75bda0114a5aad8fcc9af94ddf810bceb1494a4 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 1a677861b6ebc9317f34fd0791314285e0a01861..00185a1f137586c03ffd5902cf74f405cd74d845 100644
--- a/interface/web/admin/lib/lang/el_server_ip.lng
+++ b/interface/web/admin/lib/lang/el_server_ip.lng
@@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Type';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server_ip_list.lng b/interface/web/admin/lib/lang/el_server_ip_list.lng
index 9d24f06dfe51f61a2f8de253e72ef20e5034af91..f19dc824b42e7304c7e11fb1c2101a2d8a6d729e 100644
--- a/interface/web/admin/lib/lang/el_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/el_server_ip_list.lng
@@ -3,8 +3,9 @@ $wb['list_head_txt'] = 'Διευθύνσεις IP';
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'Διεύθυνση IP';
$wb['add_new_record_txt'] = 'Νέα διεύθυνση IP';
-$wb['client_id_txt'] = 'Client';
+$wb['client_id_txt'] = 'Πελάτης';
$wb['virtualhost_txt'] = 'HTTP Vhost';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['virtualhost_port_txt'] = 'Θύρες HTTP';
+$wb['ip_type_txt'] = 'Τύπος';
?>
+
diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng
index fa6c78eff5162e1991a645ad755dd4129577080e..2f7b5695f77a0551997d4324fd6defa6329fc94c 100644
--- a/interface/web/admin/lib/lang/el_server_list.lng
+++ b/interface/web/admin/lib/lang/el_server_list.lng
@@ -1,13 +1,14 @@
+
diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng
index 5e3d0fd4022ce48fac39c9379b5de0774c46510b..5e1f63023f1b7fc20a16c8a3f8b107d2901422f8 100644
--- a/interface/web/admin/lib/lang/el_software_package_install.lng
+++ b/interface/web/admin/lib/lang/el_software_package_install.lng
@@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Εισαγωγή κλειδιού εγκατάστασ
$wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης';
$wb['btn_cancel_txt'] = 'Ακύρωση';
?>
+
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
index 463c4619654088909d8243753b179daf7fdcab66..f3e22fbf180dc71340f50a95b236d8ec29441259 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -6,5 +6,6 @@ $wb['package_description_txt'] = 'Περιγραφή';
$wb['action_txt'] = 'Ενέργεια';
$wb['toolsarea_head_txt'] = 'Πακέτα';
$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
-$wb['package_id_txt'] = 'local App-ID';
+$wb['package_id_txt'] = 'τοπικό App-ID';
?>
+
diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng
index 5b1e2228edb0f53c8b6b86d7be3f7b0bfc808469..d52666decdf601f4ae868edcb5c411eefe4f987b 100644
--- a/interface/web/admin/lib/lang/el_software_repo.lng
+++ b/interface/web/admin/lib/lang/el_software_repo.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Χρήστης (Προαιρετικό)';
$wb['repo_password_txt'] = 'Συνθηματικό (Προαιρετικό)';
$wb['active_txt'] = 'Ενεργό';
?>
+
diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng
index deb896a719c990ba6df4b00d5114b8dc1ac62f43..cb3f2c45d7561bc17fdf3fcd5e416f139e7a79bc 100644
--- a/interface/web/admin/lib/lang/el_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/el_software_repo_list.lng
@@ -4,3 +4,4 @@ $wb['active_txt'] = 'Ενεργό';
$wb['repo_name_txt'] = 'Αποθετήριο';
$wb['repo_url_txt'] = 'URL';
?>
+
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
index 7bdc66102ce81b5766f2a5fc0584f7eaf1c3e05e..50a4b47e13e19ed116c651f6a0b48645ed9553e8 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -6,3 +6,4 @@ $wb['update_title_txt'] = 'Ενημέρωση';
$wb['version_txt'] = 'Έκδοση';
$wb['action_txt'] = 'Ενέργεια';
?>
+
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 0f929c42eb9d10d5e0ba5acdd77a8e39a1ece747..6c5b8b53a43a8739e909e90edc3df471d605e28e 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -24,7 +24,8 @@ $wb['webftp_url_txt'] = 'URL του WebFTP';
$wb['enable_custom_login_txt'] = 'Allow custom login name';
$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
$wb['mailmailinglist_url_txt'] = 'Mailing list URL';
-$wb['admin_mail_txt'] = 'Administrators e-mail';
+$wb['admin_mail_txt'] = 'e-mail Διαχειριστών';
$wb['monitor_key_txt'] = 'Monitor keyword';
$wb['admin_name_txt'] = 'Administrators name';
?>
+
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index db913587c2e8c0598a282ee66c1a3d9e25589356..eacd3853fc1b12edc6bcdbd7621a9633a0d75e78 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Συνθηματικό';
$wb['password_strength_txt'] = 'Δύναμη Συνθηματικού';
$wb['modules_txt'] = 'Άρθρωμα';
$wb['startmodule_txt'] = 'Άρθρωμα Εκκίνησης';
-$wb['app_theme_txt'] = 'Design';
+$wb['app_theme_txt'] = 'Θεματική Παραλλαγή';
$wb['typ_txt'] = 'Τύπος';
$wb['active_txt'] = 'Ενεργός';
$wb['language_txt'] = 'Γλώσσα';
@@ -26,3 +26,4 @@ $wb['groups_txt'] = 'Ομάδες';
$wb['default_group_txt'] = 'Προκαθορισμένη Ομάδα';
$wb['startmodule_err'] = 'Το άρθρωμα εκκίνησης δεν υπάρχει στα διαθέσιμα αρθρώματα.';
?>
+
diff --git a/interface/web/admin/lib/lang/el_users_list.lng b/interface/web/admin/lib/lang/el_users_list.lng
index eee43054fe3fa96829c8a54bfe67e15912235732..69b640db76c11ca98c08f63aeb3dc3459af6a936 100644
--- a/interface/web/admin/lib/lang/el_users_list.lng
+++ b/interface/web/admin/lib/lang/el_users_list.lng
@@ -7,3 +7,4 @@ $wb['ort_txt'] = 'πόλη';
$wb['add_new_record_txt'] = 'Νέος Χρήστης';
$wb['warning_txt'] = 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:Μην επεξεργάζεστε καμία ρύθμιση χρήστη εδώ. Χρησιμοποιήστε τις ρυθμίσεις Πελάτη - και Μεταπωλητή στο άρθρωμα Πελάτης. Η επεξεργασία ομάδων και χρηστών εδώ, μπορεί να προκαλέσει απώλεια δεδομένων!';
?>
+
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index ee89b2e30bfbe3112661319bfdce8fbb0cbbd034..e2bb0ab1f3b230fec81bd228afe1e4049393a4b8 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -11,3 +11,4 @@ $wb['Edit Reseller'] = 'Επεξεργασία Μεταπωλητή';
$wb['Resellers'] = 'Μεταπωλητές';
$wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.';
?>
+
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index a79478d7f1f58956866738c5713a500e454c99ee..44e2bf1f90c7fc5b1180e14a48bbe5cf5679a8b2 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -98,10 +98,11 @@ $wb['limit_trafficquota_error_notint'] = 'Το Όριο κίνησης δεδο
$wb['customer_no_txt'] = 'Κωδ. Πελάτη';
$wb['vat_id_txt'] = 'Α.Φ.Μ';
$wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
+$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
+$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
+$wb['company_id_txt'] = 'ID Εταιρίας/Επιχείρησης';
+$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
+$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
?>
+
diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng
index ef21bfe2189e6a366e6d3e06be6daf0d7e791fe1..7bd428457aff31f08e410bc429a954e95e158847 100644
--- a/interface/web/client/lib/lang/el_client_del.lng
+++ b/interface/web/client/lib/lang/el_client_del.lng
@@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Η ενέργεια θα διαγράψει τις
$wb['btn_save_txt'] = 'Διαγραφή πελάτη';
$wb['btn_cancel_txt'] = 'Ακύρωση χωρίς διαγραφή πελάτη';
?>
+
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index b3a282d2d2c6bd2ccd12d6049f3a69d1a0978aba..c2e6044635d677f104fd1e1723357f0d36a422fc 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -60,13 +60,14 @@ $wb['limit_web_quota_txt'] = 'Όριο Web';
$wb['limit_traffic_quota_txt'] = 'Όριο Κίνησης δεδομένων';
$wb['limit_trafficquota_error_notint'] = 'Το Όριο Κίνησης δεδομένων πρέπει να είναι αριθμός.';
$wb['template_del_aborted_txt'] = 'Η διαγραφή ακυρώθηκε. Υπάρχει τουλάχιστον ένας πελάτης που έχει το πρότυπο ενεργοποιημένο.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
-$wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
-$wb['web_php_options_txt'] = 'PHP Options';
-$wb['template_type_txt'] = 'Template type';
-$wb['template_name_txt'] = 'Template name';
+$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
+$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
+$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
+$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
+$wb['ssh_chroot_txt'] = 'Επιλογές SSH-Chroot';
+$wb['web_php_options_txt'] = 'Επιλογές PHP';
+$wb['template_type_txt'] = 'Τύπος προτύπου';
+$wb['template_name_txt'] = 'Όνομα προτύπου';
?>
+
diff --git a/interface/web/client/lib/lang/el_client_template_list.lng b/interface/web/client/lib/lang/el_client_template_list.lng
index 1ce866d23cc534bae1b03e30b5f4b984645b27e8..30e6969e3dae983e01069f7d648781d256a129c6 100644
--- a/interface/web/client/lib/lang/el_client_template_list.lng
+++ b/interface/web/client/lib/lang/el_client_template_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Πρότυπα Πελάτη';
$wb['template_type_txt'] = 'Τύπος';
$wb['template_name_txt'] = 'Όνομα Προτύπου';
?>
+
diff --git a/interface/web/client/lib/lang/el_clients_list.lng b/interface/web/client/lib/lang/el_clients_list.lng
index 5b80e283da5b0ff56e195385e1d3785c9bc687b3..dd652bfd6adaada80ec005e790f1e9a2a798023d 100644
--- a/interface/web/client/lib/lang/el_clients_list.lng
+++ b/interface/web/client/lib/lang/el_clients_list.lng
@@ -8,3 +8,4 @@ $wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νέος Πελάτης';
$wb['username_txt'] = 'Username';
?>
+
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 9a4751afcc938c2717ad91ce530bb5c6c971b688..f3e2dffd9747d75529a5d55c3e1313c2f0eab465 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -96,12 +96,13 @@ $wb['limit_trafficquota_error_notint'] = 'Το Όριο ταχύτητας πρ
$wb['customer_no_txt'] = 'Α/Α Πελάτη';
$wb['vat_id_txt'] = 'Α.Φ.Μ.';
$wb['required_fields_txt'] = '* Υποχρεωτικά Πεδία';
-$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
-$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
-$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
-$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
-$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
-$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
+$wb['limit_webdav_user_txt'] = 'Μέγιστο πλήθος χρηστών Webdav';
+$wb['limit_webdav_user_error_notint'] = 'Το όριο χρηστών webdav user πρέπει να είναι αριθμός.';
+$wb['limit_mailmailinglist_txt'] = 'Μέγιστο πλήθος mailing lists';
+$wb['limit_mailaliasdomain_txt'] = 'Μέγιστο πλήθος ψευδονύμων domain';
+$wb['limit_mailmailinglist_error_notint'] = 'Το πλήθος εγγραφών της mailing list πρέπει να είναι αριθμός.';
+$wb['limit_openvz_vm_txt'] = 'Μέγιστο πλήθος εικονικών servers';
+$wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπου εικονικού server';
+$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
?>
+
diff --git a/interface/web/client/lib/lang/el_resellers_list.lng b/interface/web/client/lib/lang/el_resellers_list.lng
index 78f7c23892ea4ac67b382e99e86c84666422b371..53eecc98dc6df6620d90c453362f77b0635fed0e 100644
--- a/interface/web/client/lib/lang/el_resellers_list.lng
+++ b/interface/web/client/lib/lang/el_resellers_list.lng
@@ -7,3 +7,4 @@ $wb['city_txt'] = 'Πόλη';
$wb['country_txt'] = 'Χώρα';
$wb['add_new_record_txt'] = 'Νεός Μεταπωλητής';
?>
+
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index e1828aa4a5aadb94dd10b10700e283aa966033fb..88d459f33c35d8efe1d809c0f9626bdf083a9de6 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -98,16 +98,16 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') {
$v2 = $_SESSION['s']['new_ispconfig_version'];
$this_version = explode(".",$v1);
$this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) .
- (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) .
- (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) .
- (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]);
+ ((isset($this_version[1]) && $this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) .
+ ((isset($this_version[2]) && $this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) .
+ ((isset($this_version[3]) && $this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]);
$new_version = explode(".",$v2);
$new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) .
- (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) .
- (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) .
- (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]);
+ ((isset($new_version[1]) && $new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) .
+ ((isset($new_version[2]) && $new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) .
+ ((isset($new_version[3]) && $new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]);
if($new_fullversion > $this_fullversion) {
$info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available!
' .
'This Version: ' . $v1 . '
' .
diff --git a/interface/web/dashboard/lib/lang/el.lng b/interface/web/dashboard/lib/lang/el.lng
index 144becd21ca4f1fe9c92819c7f0d9bf7f5281908..39bf4b868dc65dac73283fb51acded95d9f91c7f 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 13940bd52fbf116253d3c8058138775437aadb87..351e98231a3b7469ca5cb295f49af40f1edef1ca 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Πλήθος Πελατών';
$wb['limit_database_txt'] = 'Πλήθος Databases';
$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
?>
+
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
index 95f750a58fd78fe65f3cb18413e9ea8f6b8973ba..17d42ed2efc58d998138281e2b6205731444a341 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,3 +1,4 @@
+
diff --git a/interface/web/designer/lib/lang/el.lng b/interface/web/designer/lib/lang/el.lng
index acb6c3546c6150b4edbafb782d3ed85c499210b5..29f4a51efebb370aeb04c5144a604ca2c04e02be 100644
--- a/interface/web/designer/lib/lang/el.lng
+++ b/interface/web/designer/lib/lang/el.lng
@@ -1,2 +1,3 @@
+
diff --git a/interface/web/designer/lib/lang/el_form_edit.lng b/interface/web/designer/lib/lang/el_form_edit.lng
index 04ebc02db35408c553afe5003b5b6b5c25e7d218..1e653873f2be5bb76c22423031e38f9d2eb74cd4 100644
--- a/interface/web/designer/lib/lang/el_form_edit.lng
+++ b/interface/web/designer/lib/lang/el_form_edit.lng
@@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Perm. User';
$wb['auth_preset_perm_group_txt'] = 'Perm. Group';
$wb['auth_preset_perm_other_txt'] = 'Perm. Other';
?>
+
diff --git a/interface/web/designer/lib/lang/el_form_list.lng b/interface/web/designer/lib/lang/el_form_list.lng
index 4cf043aefac43e747760697157fd5cbbc7635c3e..f428b6935c92c42a3f9326fcf850f6be3e9260ec 100644
--- a/interface/web/designer/lib/lang/el_form_list.lng
+++ b/interface/web/designer/lib/lang/el_form_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Άρθρωμα';
$wb['title_txt'] = 'Τίτλος';
$wb['description_txt'] = 'Περιγραφή';
?>
+
diff --git a/interface/web/designer/lib/lang/el_form_show.lng b/interface/web/designer/lib/lang/el_form_show.lng
index cf51060a2cc6df48a6dfe47f1e2f94d3282fec26..1cedf2676408c22422a1714cd0d186e5770fd754 100644
--- a/interface/web/designer/lib/lang/el_form_show.lng
+++ b/interface/web/designer/lib/lang/el_form_show.lng
@@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Διαγραφή αρθρώματος και όλων
$wb['menu_del_txt'] = 'Διαγραφή μενού και όλων των στοιχείων;';
$wb['item_del_txt'] = 'Διαγραφή του στοιχείου μενού';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_edit.lng b/interface/web/designer/lib/lang/el_module_edit.lng
index 733e2aec885094e59625e36452c6d856b6a91df1..a253cbc0bea1cd2bcff142d7549299b906511740 100644
--- a/interface/web/designer/lib/lang/el_module_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_edit.lng
@@ -10,3 +10,4 @@ $wb['cancel_txt'] = 'Ακύρωση';
$wb['header_txt'] = 'Ιδιότητες αρθρώματος';
$wb['description_txt'] = 'Περιγραφή
Όνομα αρθρώματος: Όνομα του φακέλου του αρθρώματος. Επιτρέπονται μόνο αριθμοί, χαρακτήρες και η κάτω παύλα.
Τίτλος Αρθώματος: Θα εμφανιστεί στο βασικό μενού (επάνω).
Αρχείο προτύπου: Το αρχείο προτύπου του αρθρώματος. Προς το παρών διαθέσιμα: module.tpl.htm και module_tree.tpl.htm. Το προεπιλεγμένο είναι το module.tpl.htm.
NaviFrame: Αν το module_tree.tpl.htm επιλέχθηκε ώα αρχείο προτύπου, εισάγετε εδώ την διαδρομή για το script που αφορά το αριστερό frame.
Προεπιλεγμένη Σελίδα: Αυτή σελίδα θα εμφανίζεται όταν ανοίξει το άρθρωμα.
Πλάτος Καρτέλας:Το πλάτος της καρτέλας στο βασικό μενού. Το πεδίο είναι άδειο εξ ορισμού. Μπορείτε να εισάγετε απόλυτες τιμές σε pixel (π.χ. 20) ή σχετικές (π.χ. 20%).
Βοήθεια: Όλες οι διαδρομές είναι σχετικές ως προς τον φάκελο ';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_list.lng b/interface/web/designer/lib/lang/el_module_list.lng
index 1edbed0f794c26b0f01e82136de1dffa05f8688b..c5c484d16ef76d690f50143250a63b4209934c7f 100644
--- a/interface/web/designer/lib/lang/el_module_list.lng
+++ b/interface/web/designer/lib/lang/el_module_list.lng
@@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Backend Άρθρωμα';
$wb['module_txt'] = 'Άρθρωμα';
$wb['title_txt'] = 'Τίτλος';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_nav_edit.lng b/interface/web/designer/lib/lang/el_module_nav_edit.lng
index 02104add2bd81e9022735f4e1204e0d415f34fc8..b41f138a239a626a5396ca9120bd15317c0556c5 100644
--- a/interface/web/designer/lib/lang/el_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_edit.lng
@@ -4,3 +4,4 @@ $wb['header_txt'] = 'Ιδιότητες Navi';
$wb['save_txt'] = 'Αποθήκευση';
$wb['cancel_txt'] = 'Άκυρο';
?>
+
diff --git a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
index 82a9ecff512a355bd75566693cdd7f355e7c489b..af3c434ace5834e5c8744b50d4f94e8c76eaf0ca 100644
--- a/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/el_module_nav_item_edit.lng
@@ -1,8 +1,9 @@
+
diff --git a/interface/web/designer/lib/lang/el_module_show.lng b/interface/web/designer/lib/lang/el_module_show.lng
index 12895ccc69232b0c4679841018dca983fdb7f7bf..be99c925bb101eece4d6ba78aa72ffa15f603297 100644
--- a/interface/web/designer/lib/lang/el_module_show.lng
+++ b/interface/web/designer/lib/lang/el_module_show.lng
@@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Θέλετε να διαγράψετε το άρθωμ
$wb['menu_del_txt'] = 'Θέλετε να διαγράψετε το μενού και όλα τα στοιχεία του;';
$wb['item_del_txt'] = 'Θέλετε να διαγράψετε το στοιχείο;';
?>
+
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 8ad3275599582fcb00b1ea4223f9bf8f1029e955..3aaaf3f872e2ae4160da524142e05d1050ce19c6 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -256,6 +256,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -274,6 +280,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -292,6 +304,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -310,6 +328,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
@@ -330,6 +354,12 @@ if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'
$dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
+ if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
+ break;
default:
$dns_rr[$r]['aux'] = 0;
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
diff --git a/interface/web/dns/lib/lang/el.lng b/interface/web/dns/lib/lang/el.lng
index 071cac2950ccf990e50a93f43a4c408e45068e14..45144226e1141273391e5d94b0ca7325b93cf16c 100644
--- a/interface/web/dns/lib/lang/el.lng
+++ b/interface/web/dns/lib/lang/el.lng
@@ -17,7 +17,8 @@ $wb['DNS TXT'] = 'DNS TXT';
$wb['DNS Wizard'] = 'Οδηγός DNS';
$wb['Add DNS Zone'] = 'Νέα ζώνη DNS';
$wb['Templates'] = 'Πρότυπα';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['zone_file_successfully_imported_txt'] = 'Το αρχείο ζώνης εισήχθηκε επιτυχώς!';
+$wb['error_no_valid_zone_file_txt'] = 'Το αρχείο ζώνης φαίνεται να μην είναι έγκυρο!';
+$wb['zonefile_to_import_txt'] = 'Αρχείο Ζώνης';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_a.lng b/interface/web/dns/lib/lang/el_dns_a.lng
index 4f20e9e682f18dda9ba9d2652ab82bf4a2182f3b..7772b5ff09a44696784b4c0646464f9dd9d3fe20 100644
--- a/interface/web/dns/lib/lang/el_dns_a.lng
+++ b/interface/web/dns/lib/lang/el_dns_a.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Η διεύθυνση IP είναι κενή';
$wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση';
$wb['data_error_duplicate'] = 'Διπλή εγγραφή A-Record ή CNAME-Record';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_a_list.lng b/interface/web/dns/lib/lang/el_dns_a_list.lng
index 30b3143b94c729538ff1718573786541dac944e5..05ed36039eeaadd47786d10cd7e85deeb552b76c 100644
--- a/interface/web/dns/lib/lang/el_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_a_list.lng
@@ -12,3 +12,4 @@ $wb['page_txt'] = 'Σελίδα';
$wb['page_of_txt'] = 'από';
$wb['delete_confirmation'] = 'Θέλετε οπωσδήποτε να διαγράψετε αυτή την εγγραφή;';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_aaaa.lng b/interface/web/dns/lib/lang/el_dns_aaaa.lng
index 77728e3c3b6b3b33874c66bf0e63ab91275beb48..76a46877c45f1597e6ad2e1c3bdfb9c47c925c54 100644
--- a/interface/web/dns/lib/lang/el_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/el_dns_aaaa.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ
$wb['data_error_empty'] = 'Διεύθυνση IP κενή';
$wb['data_error_regex'] = 'Διεύθυνση IP με μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_alias.lng b/interface/web/dns/lib/lang/el_dns_alias.lng
index 9d29354028ec96338b55119c2dff6e0eeb132ff1..46bcfe2842850dbcbdfc0f01feee302ee76ba85c 100644
--- a/interface/web/dns/lib/lang/el_dns_alias.lng
+++ b/interface/web/dns/lib/lang/el_dns_alias.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname έχει λάθος μορφοποίη
$wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει οριστεί';
$wb['data_error_regex'] = 'Το hostname Προορισμός έχει λάθος μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_cname.lng b/interface/web/dns/lib/lang/el_dns_cname.lng
index cc10beb118907244dfdacea94b1e1296b2e12a50..4a8cc63ab7d5cad5caf2e71ff5af493342122318 100644
--- a/interface/web/dns/lib/lang/el_dns_cname.lng
+++ b/interface/web/dns/lib/lang/el_dns_cname.lng
@@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Το hostname Προορισμός δεν έχει ο
$wb['data_error_regex'] = 'Hostname Προορισμός με μη έγκυρη μορφοποίηση';
$wb['data_error_duplicate'] = 'Διπλοεγγραφή A-Record ή CNAME-Record';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_hinfo.lng b/interface/web/dns/lib/lang/el_dns_hinfo.lng
index 457213e60fd13ef83ac8a352384ecf3734b1a429..8c869537a1a2bd31e74a78e92b0465940011a874 100644
--- a/interface/web/dns/lib/lang/el_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/el_dns_hinfo.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ
$wb['data_error_empty'] = 'Οι πληροφορίες του Host είναι κενές';
$wb['data_error_regex'] = 'Οι πληροφορίες Host έχουν μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_mx.lng b/interface/web/dns/lib/lang/el_dns_mx.lng
index 890cfc921fc37e2d977412b087449d107a6415a7..85718b7caef938a5548e6939d6b160ca70283b09 100644
--- a/interface/web/dns/lib/lang/el_dns_mx.lng
+++ b/interface/web/dns/lib/lang/el_dns_mx.lng
@@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ
$wb['data_error_empty'] = 'Το hostname Mailserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Mailserver hostname με μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_ns.lng b/interface/web/dns/lib/lang/el_dns_ns.lng
index 02e157265efbbbaa3fc27b55425f08b2572bea4e..06ad7cf870bde40198272eb923d457732919c3f8 100644
--- a/interface/web/dns/lib/lang/el_dns_ns.lng
+++ b/interface/web/dns/lib/lang/el_dns_ns.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Η ζώνη δεν έχει σωστή μορφοπο
$wb['data_error_empty'] = 'Ο Nameserver δεν έχει οριστεί';
$wb['data_error_regex'] = 'Η μορφοποίηση του Nameserver δεν είναι σωστή';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_ptr.lng b/interface/web/dns/lib/lang/el_dns_ptr.lng
index bcd431ecd18e56769f6233e6979094c2778d33e3..ceb8b138934e9c6d8fd7b9b3b2108a6146efbd01 100644
--- a/interface/web/dns/lib/lang/el_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/el_dns_ptr.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το όνομα δεν έχει σωστή μορφο
$wb['data_error_empty'] = 'Το Κανονικοποιημένο hostname δεν έχει οριστεί';
$wb['data_error_regex'] = 'Κανονικοποιημένο hostname με μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_rp.lng b/interface/web/dns/lib/lang/el_dns_rp.lng
index 83fd36d02f74891ff752153fb603e4f56d4feacd..b63597c8593f484355fab7a56488c6af5ed4e16b 100644
--- a/interface/web/dns/lib/lang/el_dns_rp.lng
+++ b/interface/web/dns/lib/lang/el_dns_rp.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ
$wb['data_error_empty'] = 'Το πρόσωπο επικοινωνίας δεν έχει οριστεί.';
$wb['data_error_regex'] = 'Η μορφοποίηση του υπεύθυνου δεν είναι έγκυρη';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 4693628452bbc82014f703b5bbb1f5ec292a5c5d..ae3f5d004cee043c9c3f6eb3521aee18de39fc62 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -11,6 +11,7 @@ $wb['origin_error_empty'] = 'Η ζώνη είναι κενή.';
$wb['origin_error_unique'] = 'Υπάρχει ήδη μια εγγραφή για αυτή την ζώνη.';
$wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφοποίηση.';
$wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
+$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_slave_list.lng b/interface/web/dns/lib/lang/el_dns_slave_list.lng
index a20a32859a970fed3f4f661f883d25c446966cf3..aa50cae6f156f9346d5d169aa95f01973625f116 100644
--- a/interface/web/dns/lib/lang/el_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave_list.lng
@@ -5,5 +5,6 @@ $wb['server_id_txt'] = 'Server';
$wb['origin_txt'] = 'Ζώνη';
$wb['ns_txt'] = 'NS';
$wb['add_new_record_txt'] = 'Νέα Δευτερεύουσα ζώνη DNS';
-$wb['eg_domain_tld'] = 'e.g. domain.tld.';
+$wb['eg_domain_tld'] = 'π.χ. domain.tld.';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index c4dd31138d5a4f45f6ba59b7276abfd33555a1cc..a05a49e2cc83299e68473922393e8ee1326f751d 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -21,11 +21,12 @@ $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφο
$wb['ns_error_regex'] = 'NS με μη έγκυρη μορφοποίηση.';
$wb['mbox_error_empty'] = 'Το Email δεν έχει οριστεί.';
$wb['mbox_error_regex'] = 'Email με μη έγκυρη μορφοποίηση.';
-$wb['also_notify_txt'] = 'Also Notify';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
-$wb['update_acl_txt'] = 'Update ACL';
-$wb['seconds_txt'] = 'Seconds';
-$wb['eg_domain_tld'] = 'e.g. domain.tld';
-$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
-$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['also_notify_txt'] = 'Ειδοποίηση επίσης σε';
+$wb['also_notify_error_regex'] = 'Παρακαλούμε χρησιμοποιείστε μια διεύθυνση IP.';
+$wb['update_acl_txt'] = 'Ανανέωση ACL';
+$wb['seconds_txt'] = 'Δευτερόλεπτα';
+$wb['eg_domain_tld'] = 'π.χ. domain.tld';
+$wb['eg_ns1_domain_tld'] = 'π.χ. ns1.domain.tld';
+$wb['eg_webmaster_domain_tld'] = 'π.χ. webmaster@domain.tld';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng
index 99c1d73d9a0e72f563131b99904141b5a8a34e00..17446da45993a9847fa87cfd69398591f10aeb21 100644
--- a/interface/web/dns/lib/lang/el_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng
@@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'Email';
$wb['add_new_record_wizard_txt'] = 'Νέα ζώνη DNS με Οδηγό';
$wb['add_new_record_txt'] = 'Νέα ζώνη DNS (χειροκίνητα)';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_srv.lng b/interface/web/dns/lib/lang/el_dns_srv.lng
index 01901ce6a3caa3e3c0afe9782bef38256f8f2706..1dc24f902e80f160cfe0c00bb7546758b8a92aa8 100644
--- a/interface/web/dns/lib/lang/el_dns_srv.lng
+++ b/interface/web/dns/lib/lang/el_dns_srv.lng
@@ -15,3 +15,4 @@ $wb['data_error_empty'] = 'Η εγγραφή Server είναι κενή';
$wb['data_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση';
$wb['srv_error_regex'] = 'Εγγραφή Server με μη έγκυρη μορφοποίηση. Η εγγραφή Server πρέπει να περιέχει 3 λέξεις χωρισμένες με κενά.';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_template.lng b/interface/web/dns/lib/lang/el_dns_template.lng
index 20e9bf81bcea73806408854cfdf5b1ab1d948bab..2ba9b4dab71a137c3851b812106571a730fc88df 100644
--- a/interface/web/dns/lib/lang/el_dns_template.lng
+++ b/interface/web/dns/lib/lang/el_dns_template.lng
@@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Πεδία';
$wb['template_txt'] = 'Πρότυπο';
$wb['visible_txt'] = 'Ενεργό';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_template_list.lng b/interface/web/dns/lib/lang/el_dns_template_list.lng
index ff676a1c1a3c3a2ed9f90cec138696b0c901174f..64da2e810aad4a152824b2e5a2730a329118b155 100644
--- a/interface/web/dns/lib/lang/el_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_template_list.lng
@@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Ορατός';
$wb['name_txt'] = 'Όνομα';
$wb['add_new_record_txt'] = 'Νέα εγγραφή';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_txt.lng b/interface/web/dns/lib/lang/el_dns_txt.lng
index 62c2dc8beb6a808f17bf33ec5e095e23fbda6910..c98ceca5d7f2aa5a0f3413a12b0490c7a029ef65 100644
--- a/interface/web/dns/lib/lang/el_dns_txt.lng
+++ b/interface/web/dns/lib/lang/el_dns_txt.lng
@@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Το hostname δεν έχει σωστή μορφοπ
$wb['data_error_empty'] = 'Το κείμενο δεν έχει οριστεί';
$wb['data_error_regex'] = 'Κείμενο με μη έγκυρη μορφοποίηση';
?>
+
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 6275c56192e0cb9a3fab02c2450981f5a005d72f..6ed6d91a3854dfe67efa84f6cf733b8ac432ee3f 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -27,3 +27,4 @@ $wb['error_ns1_regex'] = 'Ο NS1 περιέχει μη επιτρεπόμενο
$wb['error_ns2_regex'] = 'Ο NS2 περιέχει μη επιτρεπόμενους χαρακτήρες';
$wb['error_email_regex'] = 'Το Email δεν περιέχει μια έγκυρη διεύθυνση.';
?>
+
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index 5d563310baa4e77659dec0dc67d3453118e316a3..b353094dea3fb78e657dbfab23ad66a76dcbd5e0 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -11,7 +11,7 @@