diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 05e86f61c379fc0c256d9ba489e7584f262f98ad..69937821813b409da11dc0604b9a8272a011505e 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1024,7 +1024,7 @@ class installer_dist extends installer_base {
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
- if($this->is_update == false) {
+ //if($this->is_update == false) {
if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
@@ -1039,17 +1039,17 @@ class installer_dist extends installer_base {
replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
*/
- if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
+ if(!is_dir('/var/www/php-fcgi-scripts/ispconfig')) exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
- exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
+ if(!is_link('/var/www/ispconfig')) exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
- }
- }
+ //}
+ //}
}
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -1228,7 +1228,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1247,7 +1247,7 @@ class installer_dist extends installer_base {
}
exec('touch /var/log/ispconfig/cron.log');
- exec('chmod 666 /var/log/ispconfig/cron.log');
+ exec('chmod 660 /var/log/ispconfig/cron.log');
}
}
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 4600093bace07e2b8a3eb468c80a5bcb6ab8e11f..bc6b4993dcabf3b2a36eb6eedc83c9a71c6d07dd 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -610,8 +610,8 @@ class installer extends installer_base
$this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
- if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
- {
+ //if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
+ //{
$content = rf('tpl/apache_apps_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -621,7 +621,7 @@ class installer extends installer_base
exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
- }
+ //}
}
if($conf['nginx']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
@@ -946,11 +946,11 @@ class installer extends installer_base
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
+ @mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
- symlink($install_dir.'/interface/web','/var/www/ispconfig');
+ @symlink($install_dir.'/interface/web','/var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
}
}
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 78ddf5e920b296edfcd214627fa13b27a47b38a5..0a16f483aa4a55f2f6e26ad2758b8f970c9aefc3 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1078,7 +1078,7 @@ class installer_dist extends installer_base {
wf("$vhost_conf_dir/ispconfig.vhost", $content);
- if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1088,7 +1088,7 @@ class installer_dist extends installer_base {
exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
- }
+ //}
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
@@ -1280,7 +1280,7 @@ class installer_dist extends installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1299,7 +1299,7 @@ class installer_dist extends installer_base {
}
exec('touch /var/log/ispconfig/cron.log');
- exec('chmod 666 /var/log/ispconfig/cron.log');
+ exec('chmod 660 /var/log/ispconfig/cron.log');
}
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index d4ab51b4875f31a140fcbbe8d8bb40255f39f13a..c7b4ae77caccc8d58dc0769c5e12b2c648820d59 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -567,23 +567,6 @@ class installer_base {
}
}
}
-
- $config_dir = $conf['mailman']['config_dir'].'/';
- $full_file_name = $config_dir.'virtual_to_transport.sh';
-
- //* Backup exiting virtual_to_transport.sh script
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
- }
-
- copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
- chgrp($full_file_name,'list');
- chmod($full_file_name,0750);
-
- if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
- exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
-
- exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
$virtual_domains = '';
if($status == 'update')
@@ -608,8 +591,27 @@ class installer_base {
if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = '';
$content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
$content = str_replace('{virtual_domains}', $virtual_domains, $content);
-
+
wf($full_file_name, $content);
+
+ //* Write virtual_to_transport.sh script
+ $config_dir = $conf['mailman']['config_dir'].'/';
+ $full_file_name = $config_dir.'virtual_to_transport.sh';
+
+ //* Backup exiting virtual_to_transport.sh script
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+ }
+
+ if(is_dir('/etc/mailman')) {
+ copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+ chgrp($full_file_name,'list');
+ chmod($full_file_name,0750);
+ }
+
+ //* Create aliasaes
+ exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+
}
public function configure_postfix($options = '') {
@@ -732,11 +734,13 @@ class installer_base {
touch($config_dir.'/body_checks');
//* Create the mailman files
- exec('mkdir -p /var/lib/mailman/data');
+ if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
exec('postalias /var/lib/mailman/data/aliases');
if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
exec('postmap /var/lib/mailman/data/virtual-mailman');
+ if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+ exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
@@ -1921,16 +1925,16 @@ class installer_base {
symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
}
}
- if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
+ //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rf('tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
$content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
+ @mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
- symlink($install_dir.'/interface/web','/var/www/ispconfig');
+ @symlink($install_dir.'/interface/web','/var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
- }
+ //}
}
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
@@ -2116,7 +2120,7 @@ class installer_base {
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> '.$conf['ispconfig_log_dir'].'/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -2135,7 +2139,7 @@ class installer_base {
}
touch($conf['ispconfig_log_dir'].'/cron.log');
- chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);
+ chmod($conf['ispconfig_log_dir'].'/cron.log', 0660);
}
diff --git a/install/sql/incremental/upd_0035.sql b/install/sql/incremental/upd_0035.sql
index b2f85163bcf34251bcfaff53c7bd563af62afbcf..5f8031c514a4adfeb4ab25bc374f9fa6a1e63113 100644
--- a/install/sql/incremental/upd_0035.sql
+++ b/install/sql/incremental/upd_0035.sql
@@ -20,6 +20,6 @@ INSERT INTO `sys_theme` (`var_id`, `tpl_name`, `username`, `logo_url`) VALUES (N
-- --------------------------------------------------------
ALTER TABLE `web_domain` ADD `ssl_key` MEDIUMTEXT NOT NULL AFTER `ssl_bundle`;
-ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`
+ALTER TABLE `mail_user` ADD `disabledoveadm` enum('n','y') NOT NULL default 'n' AFTER `disablelda`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 828fcf3d46c752150765a79c5121280f66b93901..6849418823aefc8be25d386012ec7c110e9f42b4 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -296,7 +296,7 @@ CREATE TABLE `client_template` (
`limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0',
- `limit_aps` int(11) NOT NULL DEFAULT '0',
+ `limit_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -2169,6 +2169,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.5');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index aaa9e0dd94d372821345b0d88467900eb2710449..f5b2a91d8eea01e3900e5542a8db29904ca3ccf9 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -50,3 +50,5 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
Alias /awstats-icon "/usr/share/awstats/icon"
+NameVirtualHost *:80
+NameVirtualHost *:443
\ No newline at end of file
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 0385427a6dbe0c405e2ba8dcbf2ced69d37599a4..4410b8533d1f6c002c3ea8a20fb678a91309079d 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -28,18 +28,19 @@ NameVirtualHost *:{vhost_port}
IPCCommTimeout 7200
-#
-# DocumentRoot /usr/local/ispconfig/interface/web/
-# AddType application/x-httpd-php .php
-#
-# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
-# Options FollowSymLinks
-# AllowOverride None
-# Order allow,deny
-# Allow from all
-# php_value magic_quotes_gpc 0
-#
-#
+
+ DocumentRoot /usr/local/ispconfig/interface/web/
+ AssignUserId ispconfig ispconfig
+ AddType application/x-httpd-php .php
+
+ # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+ Options FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ php_value magic_quotes_gpc 0
+
+
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index de512a4a0cdd1a04573f784ad7f36784ac75b33b..2af243d92d6f3cc2409c8f0d1e3a5e2427cc35b7 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -1,6 +1,6 @@
simple_query('Shall the script create a ISPConfig backup in
if($do_backup == 'yes') {
//* Create the backup directory
- $backup_path = '/var/backup/ispconfig_'.date('Y-m-d_H-i');
+ $backup_path = '/var/backup/ispconfig_'.@date('Y-m-d_H-i');
$conf['backup_path'] = $backup_path;
exec("mkdir -p $backup_path");
exec("chown root:root $backup_path");
diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php
index 2185717a95a82062e2046aa92b4b6712efae7e07..d8e641d9ab01a37229f6fe06df89560d4f56d117 100644
--- a/interface/lib/classes/aps_guicontroller.inc.php
+++ b/interface/lib/classes/aps_guicontroller.inc.php
@@ -728,6 +728,9 @@ class ApsGUIController extends ApsBase
// Using parse_url() to filter malformed URLs
$path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.
basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$icon);
+ // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path
+ $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);
+
$pkg['Icon'] = $path;
}
else $pkg['Icon'] = '';
@@ -741,6 +744,8 @@ class ApsGUIController extends ApsBase
// Using parse_url() to filter malformed URLs
$path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.
basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$screen['path']);
+ // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path
+ $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);
$pkg['Screenshots'][] = array('ScreenPath' => $path,
'ScreenDescription' => htmlspecialchars(trim((string)$screen->description)));
@@ -838,4 +843,4 @@ class ApsGUIController extends ApsBase
return $pkg;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 01eae1bd5c6cfdfd4de068af76c06480c1d657e0..46729988e6a30223d66fd60e5fac1234e9c3fddd 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -44,7 +44,7 @@ class db extends mysqli
private $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
- public $show_error_messages = true; // false in server, true in interface
+ public $show_error_messages = false; // false in server, true in interface
private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
// constructor
@@ -60,7 +60,8 @@ class db extends mysqli
$this->dbClientFlags = $conf[$prefix.'db_client_flags'];
parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']);
$try = 0;
- while(!is_null($this->connect_error) && $try < 5) {
+ //while(!is_null($this->connect_error) && $try < 5) {
+ while(mysqli_connect_error() && $try < 5) {
if($try > 0) sleep(1);
$try++;
@@ -69,7 +70,9 @@ class db extends mysqli
parent::__construct($conf[$prefix.'db_host'], $conf[$prefix.'db_user'],$conf[$prefix.'db_password'],$conf[$prefix.'db_database']);
}
- if(is_null($this->connect_error)) $this->isConnected = true;
+ //if(is_null($this->connect_error)) $this->isConnected = true;
+ //else return false;
+ if(!mysqli_connect_error()) $this->isConnected = true;
else return false;
$this->setCharacterEncoding();
@@ -81,8 +84,9 @@ class db extends mysqli
// error handler
public function updateError($location) {
- global $app;
+ global $app, $conf;
+ /*
if(!is_null($this->connect_error)) {
$this->errorNumber = $this->connect_errno;
$this->errorMessage = $this->connect_error;
@@ -90,15 +94,24 @@ class db extends mysqli
$this->errorNumber = $this->errno;
$this->errorMessage = $this->error;
}
+ */
+ if(mysqli_connect_error()) {
+ $this->errorNumber = mysqli_connect_errno();
+ $this->errorMessage = mysqli_connect_error();
+ } else {
+ $this->errorNumber = mysqli_errno($this);
+ $this->errorMessage = mysqli_error($this);
+ }
+
$this->errorLocation = $location;
if($this->errorNumber) {
$error_msg = $this->errorLocation .' '. $this->errorMessage;
- // This right here will allow us to use the samefile for server & interface
- if($this->show_error_messages) {
- echo $error_msg;
+ // This right here will allow us to use the same file for server & interface
+ if($this->show_error_messages && $conf['demo_mode'] === false) {
+ echo $error_msg;
} else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($error_msg, LOGLEVEL_WARN);
+ $app->log($error_msg, LOGLEVEL_WARN);
}
}
}
@@ -110,7 +123,8 @@ class db extends mysqli
}
public function query($queryString) {
- if($this->isConnected == false) return false;
+ global $conf;
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
@@ -131,7 +145,7 @@ class db extends mysqli
} while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
- if($this->errorNumber) debug_print_backtrace();
+ if($this->errorNumber && $conf['demo_mode'] === false) debug_print_backtrace();
if(!$this->queryId) {
return false;
}
@@ -176,11 +190,11 @@ class db extends mysqli
// returns number of rows returned by the last select query
public function numRows() {
- return $this->queryId->num_rows;
+ return intval($this->queryId->num_rows);
}
public function affectedRows() {
- return $this->queryId->affected_rows;
+ return intval($this->queryId->affected_rows);
}
// returns mySQL insert id
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index ed689ebda744bbdd9653441237087a01a17dcd2b..aef3371dd1d1d087ddb6a50b2764d2d07b8a7e2e 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -149,7 +149,7 @@ class listform_actions {
if($this->SQLExtWhere != '') {
$sql_where .= ' '.$this->SQLExtWhere.' and';
}
-
+
$sql_where = $app->listform->getSearchSQL($sql_where);
$app->tpl->setVar($app->listform->searchValues);
@@ -171,8 +171,15 @@ class listform_actions {
$order_by_sql = str_replace('client_id','c.contact_name',$order_by_sql);
} elseif($order == 'parent_domain_id'){
$join .= ' LEFT JOIN web_domain as wd ON '.$app->listform->listDef['table'].'.parent_domain_id = wd.domain_id ';
- $order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
- $sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
+ //$order_by_sql = str_replace(' domain', ' '.$app->listform->listDef['table'].'.domain',$order_by_sql);
+ //$order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
+ $order_by_sql = preg_replace('@( |,|^)(domain)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $order_by_sql);
+ $order_by_sql = preg_replace('@( |,|^)(parent_domain_id)( |,|$)@', '$1wd.domain$3', $order_by_sql);
+
+ //$sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
+ //$sql_where = str_replace(' domain',' '.$app->listform->listDef['table'].'.domain',$sql_where);
+ $sql_where = preg_replace('@( |,|^)(type)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $sql_where);
+ $sql_where = preg_replace('@( |,|^)(domain)( |,|$)@', '$1'.$app->listform->listDef['table'].'.$2$3', $sql_where);
} elseif($order == 'sys_groupid'){
$join .= ' LEFT JOIN sys_group as sg ON '.$app->listform->listDef['table'].'.sys_groupid = sg.groupid ';
$order_by_sql = str_replace('sys_groupid','sg.name',$order_by_sql);
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index c636518f6e66e3a1abfcd41da85d550c413ee809..bcfd619242e2f041ec62b3781c953c9bca43bbef 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -467,7 +467,9 @@ class remoting_lib {
}
break;
case 'UNIQUE':
- if($this->action == 'NEW') {
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){
+ if($this->action == 'NEW') {
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
@@ -477,7 +479,7 @@ class remoting_lib {
$this->errorMessage .= $errmsg." \r\n";
}
}
- } else {
+ } else {
$num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
if($num_rec["number"] > 0) {
$errmsg = $validator['errmsg'];
@@ -487,7 +489,8 @@ class remoting_lib {
$this->errorMessage .= $errmsg." \r\n";
}
}
- }
+ }
+ }
break;
case 'NOTEMPTY':
if(empty($field_value)) {
@@ -571,31 +574,44 @@ class remoting_lib {
}
break;
case 'ISIP':
- //* Check if its a IPv4 or IPv6 address
- if(function_exists('filter_var')) {
- if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
- } else {
- $this->errorMessage .= $errmsg." \r\n";
- }
- }
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'y' && $field_value == '') {
+ //* Do nothing
} else {
- //* Check content with regex, if we use php < 5.2
- $ip_ok = 0;
- if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
- $ip_ok = 1;
- }
- if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
- $ip_ok = 1;
+ //* Check if its a IPv4 or IPv6 address
+ if(isset($validator['separator']) && $validator['separator'] != '') {
+ //* When the field may contain several IP addresses, split them by the char defined as separator
+ $field_value_array = explode($validator['separator'],$field_value);
+ } else {
+ $field_value_array[] = $field_value;
}
- if($ip_ok == 0) {
- $errmsg = $validator['errmsg'];
- if(isset($this->wordbook[$errmsg])) {
- $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ foreach($field_value_array as $field_value) {
+ if(function_exists('filter_var')) {
+ if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ } else {
+ $this->errorMessage .= $errmsg." \r\n";
+ }
+ }
} else {
- $this->errorMessage .= $errmsg." \r\n";
+ //* Check content with regex, if we use php < 5.2
+ $ip_ok = 0;
+ if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
+ $ip_ok = 1;
+ }
+ if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
+ $ip_ok = 1;
+ }
+ if($ip_ok == 0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]." \r\n";
+ } else {
+ $this->errorMessage .= $errmsg." \r\n";
+ }
+ }
}
}
}
@@ -802,18 +818,24 @@ class remoting_lib {
$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
return $app->db->queryOneRecord($sql);
} elseif (@is_array($primary_id)) {
- $sql_where = '';
+ $sql_offset = 0;
+ $sql_limit = 0;
+ $sql_where = '';
foreach($primary_id as $key => $val) {
$key = $app->db->quote($key);
$val = $app->db->quote($val);
- if(stristr($val,'%')) {
+ if($key == '#OFFSET#') $sql_offset = $app->functions->intval($val);
+ elseif($key == '#LIMIT#') $sql_limit = $app->functions->intval($val);
+ elseif(stristr($val,'%')) {
$sql_where .= "$key like '$val' AND ";
} else {
$sql_where .= "$key = '$val' AND ";
}
}
$sql_where = substr($sql_where,0,-5);
+ if($sql_where == '') $sql_where = '1';
$sql = "SELECT * FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$sql_where;
+ if($sql_offset >= 0 && $sql_limit > 0) $sql .= ' LIMIT ' . $sql_offset . ',' . $sql_limit;
return $app->db->queryAllRecords($sql);
} else {
$this->errorMessage = 'The ID must be either an integer or an array.';
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index b0b46643eeda77d6392c0f8493c5c4c0675b497d..121ab931f4004289d7932e95dde790b9cd50f834 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -465,7 +465,7 @@ class tools_monitor {
$html .= '
Problem, there are no rules listed for the server
';
}
else {
- $html = nl2br($data['output']);
+ $html .= nl2br($data['output']);
}
$html .= '';
} else {
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index 42c9c57a0e160ecca802e6be96031ee7a7626198..ca137f6c3cc3aff8d95fdf8b29c63dfbea6d1279 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -137,7 +137,7 @@ class validate_domain {
//if($check['cnt'] > 0) return false;
// we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs)
- $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (`domain` = '" . $app->db->quote($domain_name) . "'".$additional_sql1.") AND `server_id` = ".$domain['server_id']." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql1 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
+ $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (`domain` = '" . $app->db->quote($domain_name) . "'".$additional_sql1.") AND `server_id` = ".intval($domain['server_id'])." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql1 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
if(is_array($checks) && !empty($checks)){
foreach($checks as $check){
@@ -207,7 +207,7 @@ class validate_domain {
//$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id));
//if($check['cnt'] > 0) return false;
// we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs)
- $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "'".$additional_sql2.") AND `server_id` = ".$domain['server_id']." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql2 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
+ $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "'".$additional_sql2.") AND `server_id` = ".intval($domain['server_id'])." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql2 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
if(is_array($checks) && !empty($checks)){
foreach($checks as $check){
if($domain['ip_address'] == '*') return false;
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 349b0ea5cfd4e0958b45cf93ae1db92914fd5e6e..03e7bd8269213424fa37296e239c88de6e5d45a1 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -11,11 +11,11 @@ $wb['number_format_thousands_sep'] = '';
$wb['error_301'] = 'Modul není povolen pro současného uživatele.';
$wb['error_302'] = 'Neplatný modul.';
$wb['error_1001'] = 'Uživatelské jméno a heslo nemohou být prázdné !';
-$wb['error_1002'] = 'Uživatelské jméno a/nebo heslo nejsou správné !';
-$wb['error_1003'] = 'Uživatelské jméno je neaktivní!';
-$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam?';
-$wb['error_no_view_permission'] = 'Záznam neexistuje nebo nemáte oprávnění jej zobrazit!';
-$wb['error_no_delete_permission'] = 'Nemáte oprávnění smazat tento záznam!';
+$wb['error_1002'] = 'Uživatelské jméno nebo heslo nejsou správné !';
+$wb['error_1003'] = 'Uživatelské jméno je neaktivní !';
+$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam ?';
+$wb['error_no_view_permission'] = 'Záznam neexistuje nebo nemáte oprávnění jej zobrazit !';
+$wb['error_no_delete_permission'] = 'Nemáte oprávnění smazat tento záznam !';
$wb['page_txt'] = 'Stránka';
$wb['page_of_txt'] = 'z';
$wb['page_and_txt'] = 'a';
@@ -59,8 +59,8 @@ $wb['monthnamesshort_feb'] = 'Úno';
$wb['monthnamesshort_mar'] = 'Bře';
$wb['monthnamesshort_apr'] = 'Dub';
$wb['monthnamesshort_may'] = 'Kvě';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
+$wb['monthnamesshort_jun'] = 'Čer';
+$wb['monthnamesshort_jul'] = 'Čvc';
$wb['monthnamesshort_aug'] = 'Srp';
$wb['monthnamesshort_sep'] = 'Zář';
$wb['monthnamesshort_oct'] = 'Říj';
@@ -100,9 +100,9 @@ $wb['datalog_status_d_mail_domain'] = 'Odstranění e-mailové domény';
$wb['datalog_status_i_mail_user'] = 'Vytvoření e-mailového uživatele';
$wb['datalog_status_u_mail_user'] = 'Aktualizace nastavení e-mailového uživatele';
$wb['datalog_status_d_mail_user'] = 'Odstranění e-mailového uživatele';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
+$wb['datalog_status_i_spamfilter_users'] = 'Vytvoření nastavení spamového filtru';
+$wb['datalog_status_u_spamfilter_users'] = 'Aktualizace nastavení spamového filtru';
+$wb['datalog_status_d_spamfilter_users'] = 'Odstranění nastavení spamového filtru';
$wb['datalog_status_i_mail_forwarding'] = 'Vytvoření e-mailového nebo doménového aliasu';
$wb['datalog_status_u_mail_forwarding'] = 'Aktualizace nastavení e-mailového nebo doménového aliasu';
$wb['datalog_status_d_mail_forwarding'] = 'Odstranění e-mailového nebo doménového aliasu';
@@ -130,5 +130,7 @@ $wb['datalog_status_d_web_folder'] = 'Odstranění chráněného adresáře hesl
$wb['datalog_status_i_web_folder_user'] = 'Vytvoření uživatele pro adresáře chráněné heslem';
$wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro adresáře chráněné heslem';
$wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
-$wb['login_as_txt'] = 'Log in as';
+$wb['login_as_txt'] = 'Přihlaste se jako';
?>
+
+
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 465dcc78aaa7b3660a3152b7f76b556602090706..5d8ec6f790ae0fa8b3e9c025e3a6f24b3c39a74d 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -4,8 +4,7 @@ $wb['conf_format_datelong'] = 'l dS of 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['number_format_decimals'] = '4';
-$wb['number_format_decimals_client'] = '2';
+$wb['number_format_decimals'] = '2';
$wb['number_format_dec_point'] = '.';
$wb['number_format_thousands_sep'] = '';
$wb['error_301'] = 'Moduł nie jest dostępny dla aktualnego uzytkownika.';
@@ -68,67 +67,69 @@ $wb['monthnamesshort_nov'] = 'Lis';
$wb['monthnamesshort_dec'] = 'Gru';
$wb['datepicker_nextText'] = 'Nast';
$wb['datepicker_prevText'] = 'Poprz';
-$wb['logout_txt'] = 'Logout';
+$wb['logout_txt'] = 'WYLOGUJ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
-$wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
-$wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
-$wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
-$wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
-$wb['datalog_status_i_web_database'] = 'Create new database';
-$wb['datalog_status_u_web_database'] = 'Update database';
-$wb['datalog_status_d_web_database'] = 'Delete database';
-$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
-$wb['datalog_status_u_web_database_user'] = 'Update database user';
-$wb['datalog_status_d_web_database_user'] = 'Delete database user';
-$wb['datalog_status_i_web_domain'] = 'Create new website';
-$wb['datalog_status_u_web_domain'] = 'Update website settings';
-$wb['datalog_status_d_web_domain'] = 'Delete website';
-$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
-$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Create email domain';
-$wb['datalog_status_u_mail_domain'] = 'Update email domain';
-$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
-$wb['datalog_status_i_mail_user'] = 'Create email user';
-$wb['datalog_status_u_mail_user'] = 'Update email user';
-$wb['datalog_status_d_mail_user'] = 'Delete email user';
-$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
-$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
-$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
-$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
-$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
-$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
-$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
-$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
-$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
-$wb['datalog_status_i_cron'] = 'Create cron job';
-$wb['datalog_status_u_cron'] = 'Update cron job';
-$wb['datalog_status_d_cron'] = 'Delete cron job';
-$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
-$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
-$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
-$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
-$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
-$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
-$wb['datalog_status_i_shell_user'] = 'Create shell user';
-$wb['datalog_status_u_shell_user'] = 'Update shell user';
-$wb['datalog_status_d_shell_user'] = 'Delete shell user';
-$wb['datalog_status_i_web_folder'] = 'Create folder protection';
-$wb['datalog_status_u_web_folder'] = 'Update folder protection';
-$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
-$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
-$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
-$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
-$wb['login_as_txt'] = 'Log in as';
+$wb['submit_confirmation'] = 'Czy na pewno chcesz wykonać tę akcję?';
+$wb['number_format_decimals_client'] = '2';
+$wb['top_menu_mailuser'] = 'Użytkownik email';
+$wb['globalsearch_resultslimit_of_txt'] = 'z';
+$wb['globalsearch_resultslimit_results_txt'] = 'wyników';
+$wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
+$wb['globalsearch_noresults_limit_txt'] = '0 wyników';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
+$wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
+$wb['global_tabchange_warning_txt'] = 'Zmienione dane w tej zakładce będą zapisane jeżeli wciśniesz OK.';
+$wb['global_tabchange_discard_txt'] = 'Posiadasz niezapisane zmiany w tej zakładce. Zmiany zostaną porzucone jeżeli przejdziesz dalej.';
+$wb['datalog_changes_txt'] = 'Poniższe zmiany nie zostały jeszcze wprowadzone na wszystkich serwerach:';
+$wb['datalog_changes_end_txt'] = 'Zapisanie zmian może zająć do minuty. Proszę o cierpliwość.';
+$wb['datalog_status_i_web_database'] = 'Utwórz nową bazę danych';
+$wb['datalog_status_u_web_database'] = 'Edytuj bazę';
+$wb['datalog_status_d_web_database'] = 'Usuń bazę';
+$wb['datalog_status_i_web_database_user'] = 'Utwórz użytkownika bazy';
+$wb['datalog_status_u_web_database_user'] = 'Edytuj użytkownika bazy';
+$wb['datalog_status_d_web_database_user'] = 'Usuń użytkownika bazy';
+$wb['datalog_status_i_web_domain'] = 'Utwórz nową stronę';
+$wb['datalog_status_u_web_domain'] = 'Edytuj ustawienia strony';
+$wb['datalog_status_d_web_domain'] = 'Usuń stronę';
+$wb['datalog_status_i_ftp_user'] = 'Utwórz użytkownika FTP';
+$wb['datalog_status_u_ftp_user'] = 'Edytuj użytkownika FTP';
+$wb['datalog_status_d_ftp_user'] = 'Usuń użytkownika FTP';
+$wb['datalog_status_i_mail_domain'] = 'Utwórz domenę e-mail';
+$wb['datalog_status_u_mail_domain'] = 'Edytuj domenę e-mail';
+$wb['datalog_status_d_mail_domain'] = 'Usuń domenę e-mail';
+$wb['datalog_status_i_mail_user'] = 'Utwórz konto e-mail';
+$wb['datalog_status_u_mail_user'] = 'Edytuj konto e-mail';
+$wb['datalog_status_d_mail_user'] = 'Usuń konto e-mail';
+$wb['datalog_status_i_spamfilter_users'] = 'Utwórz ustawienia filtra antyspamowego';
+$wb['datalog_status_u_spamfilter_users'] = 'Edytu ustawienia filtra antyspamowego';
+$wb['datalog_status_d_spamfilter_users'] = 'Usuń ustawienia filtra antyspamowego';
+$wb['datalog_status_i_mail_forwarding'] = 'Utwórz adres e-mail';
+$wb['datalog_status_u_mail_forwarding'] = 'Edytu adres e-mail';
+$wb['datalog_status_d_mail_forwarding'] = 'Usuń adres e-mail';
+$wb['datalog_status_i_dns_rr'] = 'Utwórz wpis DNS';
+$wb['datalog_status_u_dns_rr'] = 'Edytuj wpis DNS';
+$wb['datalog_status_d_dns_rr'] = 'Usuń wpis DNS';
+$wb['datalog_status_i_dns_soa'] = 'Utwórz strefę DNS';
+$wb['datalog_status_u_dns_soa'] = 'Edytuj strefę DNS';
+$wb['datalog_status_d_dns_soa'] = 'Usuń strefę DNS';
+$wb['datalog_status_i_cron'] = 'Utwórz zadanie Cron';
+$wb['datalog_status_u_cron'] = 'Edytuj zadanie Cron';
+$wb['datalog_status_d_cron'] = 'Usuń zadanie Cron';
+$wb['datalog_status_i_mail_get'] = 'Utwórz konto mail fetcher';
+$wb['datalog_status_u_mail_get'] = 'Edytuj konto mail fetcher';
+$wb['datalog_status_d_mail_get'] = 'Usuń konto mail fetcher';
+$wb['datalog_status_i_mail_mailinglist'] = 'Utwórz listę mailingową';
+$wb['datalog_status_u_mail_mailinglist'] = 'Edytuj listę mailingową';
+$wb['datalog_status_d_mail_mailinglist'] = 'Usuń listę mailingową';
+$wb['datalog_status_i_shell_user'] = 'Utwórz konto shell';
+$wb['datalog_status_u_shell_user'] = 'Edytuj konto shell';
+$wb['datalog_status_d_shell_user'] = 'Usuń konto shell';
+$wb['datalog_status_i_web_folder'] = 'Utwórz zabezpieczenie folderu';
+$wb['datalog_status_u_web_folder'] = 'Edytuj zabezpieczenie folderu';
+$wb['datalog_status_d_web_folder'] = 'Usuń zabezpieczenie folderu';
+$wb['datalog_status_i_web_folder_user'] = 'Utwórz konto dla zabezpieczonego folderu';
+$wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu';
+$wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
+$wb['login_as_txt'] = 'Zaloguj jako';
?>
+
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 7f7e2b30d66b9601794cb95899589505c9ff35b6..0f0c38b2e75a822b6bec68204ed3b1f37a4ea0cc 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -317,6 +317,10 @@ $form["tabs"]['mail'] = array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])(,\s*(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))*$/',
+ 'errmsg'=> 'rbl_error_regex'),
+ ),
'value' => '',
'width' => '40',
'maxlength' => '255'
@@ -431,8 +435,6 @@ $form["tabs"]['web'] = array(
'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
-
-
*/
'vhost_conf_dir' => array(
'datatype' => 'VARCHAR',
diff --git a/interface/web/admin/lib/lang/ar_login_as.lng b/interface/web/admin/lib/lang/ar_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/ar_login_as.lng
+++ b/interface/web/admin/lib/lang/ar_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/ar_software_package_list.lng b/interface/web/admin/lib/lang/ar_software_package_list.lng
index f7a60d721fee5d0bbabf8a077cba364206f22729..87b27fd50b16af5b4ffe42a716a33db748143e64 100644
--- a/interface/web/admin/lib/lang/ar_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ar_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ar_software_update_list.lng b/interface/web/admin/lib/lang/ar_software_update_list.lng
index ec4af23a4bf359a8f669c4baf386b79da53dcd49..fe7639125cd2634fa809d9a6592e9e9fb21e84bb 100644
--- a/interface/web/admin/lib/lang/ar_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ar_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Action';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/bg_login_as.lng b/interface/web/admin/lib/lang/bg_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/bg_login_as.lng
+++ b/interface/web/admin/lib/lang/bg_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/bg_software_package_list.lng b/interface/web/admin/lib/lang/bg_software_package_list.lng
index 2e1895e65563b562f184d82cf340ac1f889fea39..6ff7b4a9aa8953a1808ad4bd5aabc23625a997e7 100644
--- a/interface/web/admin/lib/lang/bg_software_package_list.lng
+++ b/interface/web/admin/lib/lang/bg_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Действие';
$wb['toolsarea_head_txt'] = 'Пакети';
$wb['repoupdate_txt'] = 'Обновяване на пакетите ';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/bg_software_update_list.lng b/interface/web/admin/lib/lang/bg_software_update_list.lng
index a75b3a81b66e7b528e1937263771a55afeb3c509..c7fa6e07f5741e21f04f6c78c5bef8eb8f329210 100644
--- a/interface/web/admin/lib/lang/bg_software_update_list.lng
+++ b/interface/web/admin/lib/lang/bg_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Ъпдейт';
$wb['version_txt'] = 'Версия';
$wb['action_txt'] = 'Действие';
$wb['server_select_txt'] = 'Избери сървър';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/br_login_as.lng b/interface/web/admin/lib/lang/br_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/br_login_as.lng
+++ b/interface/web/admin/lib/lang/br_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng
index 35510d7ea3940b1efb907467e9b46ba080123baf..2adf5b8d4398805b173d3f2b0bbb75826a185bd2 100644
--- a/interface/web/admin/lib/lang/br_software_package_list.lng
+++ b/interface/web/admin/lib/lang/br_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acão';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/br_software_update_list.lng b/interface/web/admin/lib/lang/br_software_update_list.lng
index e6af8ec634b3062f5fef25f2586833c3376a76f3..3bb6d6ee834b6b8bbc4858666459bb1379f41837 100644
--- a/interface/web/admin/lib/lang/br_software_update_list.lng
+++ b/interface/web/admin/lib/lang/br_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Ações';
$wb['update_title_txt'] = 'Atualizar';
$wb['version_txt'] = 'Versão';
$wb['action_txt'] = 'Ação';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index bc1c9bb83f5b6d25a2eec2a5070dbe154d8b5515..8c80d1292df23d3b0ef4b644253e0bee6e28ecff 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -48,3 +48,5 @@ $wb['Do OS-Update'] = 'Aktualizovat operační systém';
$wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
$wb['Directive Snippets'] = 'Directive Snippets';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index c6a89099c6bb941d2d31ba4d5bf5e6c8c33909ea..9a579d25e3b7a687d9b9ec7facc0a9cccbfddee9 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,3 +7,5 @@ $wb['active_txt'] = 'Aktivní';
$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index c6f444b660ee68e3c5254f9ff2ad2f71fe74efdf..cf1bb28c772e72033df780efd24d61a186798c98 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Verze';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index c6146ae93d5abd8dcd55c348c570a6490aa146fd..df9386ae66d7115a96d5e49b44755f60caaa460d 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
$wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.';
$wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index aecc4cf06a656efc1e8ca9f3cfc1b22499d56f2c..da1af438deb23ac2f7a8c6e5397b7a8797f04cd1 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
$wb['udp_port_txt'] = 'Otevřené UDP porty';
$wb['add_new_record_txt'] = 'Přidat záznam';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index a6281be247dd655b73a2c79aeb4b5a2d78ac5f47..0f1a6be926302278b2257ef58e0e2d132fe08e3e 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,3 +3,5 @@ $wb['description_txt'] = 'Popis';
$wb['name_txt'] = 'Skupina';
$wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index c1d7ef9a8bcb830f5986dcc164f7a189dcd75f81..f285b382b947dc2a29fc1a75f46e9b12014ae6ef 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,3 +5,5 @@ $wb['name_txt'] = 'Skupina';
$wb['add_new_record_txt'] = 'Přidat skupinu';
$wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index a40fc0490f86c20e3c38f874633659306ae192e4..6a57b7ce8ea675db88d4561589e4985ba1c2e92c 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,3 +11,5 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'Aktivní';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 65cef7507eeda94dd43925ee61cfb70c455a3690..3dbc9061a5e3f2207cc3b31c58530e344acc2d2c 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,3 +13,5 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
$wb['active_txt'] = 'Aktivní';
$wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index 285dff276113076fa949e4e91a4346a1320ea61f..d95f12eb35ecf997e55dc41e32c75ca4582a40e5 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,3 +6,5 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http:
$wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index f1e6f4924e2a1f870032bef6265dc41576465384..eb222b3bd031ce42e91fbe2089a0b462587e4f52 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,3 +5,5 @@ $wb['language_select_txt'] = 'Vybrat jazyk k doplnění';
$wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index 2a71ed0a771290f10827769859574f0c5450aaad..f880e6dbe71644cf41d9e852302867cbbd9e7084 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,3 +6,5 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
$wb['btn_save_txt'] = 'Uložit';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7998eea0178696692a810f5e899713bd750358e6..7ffdccf5229e62c2ac1ea2487fdee62b07433b4f 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,3 +4,5 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu';
$wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
$wb['btn_cancel_txt'] = 'Zpět';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 838c325f7f5e01a41af5a411529531f5be20db80..17dfa89aafad1c7318c66f0f2431106cfb9679c1 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -6,3 +6,5 @@ $wb['language_overwrite_txt'] = 'Přepsat soubor, pokud existuje.';
$wb['btn_cancel_txt'] = 'Zpět';
$wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index b2a78637155d78161423ec338a12165f86010f68..77810e0a759bcf331ae60e9dfda4073057dd5ace 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Jazykový soubor';
$wb['lang_file_date_txt'] = 'Poslední úprava';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_login_as.lng b/interface/web/admin/lib/lang/cz_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..dd409d358d24f4527b05cdc41f00b318e44f0f9f 100644
--- a/interface/web/admin/lib/lang/cz_login_as.lng
+++ b/interface/web/admin/lib/lang/cz_login_as.lng
@@ -1,11 +1,13 @@
+
+
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 3375bd51c035169fd783bdab2d3fb9a2db0bdd57..f48a2c4a363aff9694042db16e2ee7b71de90fc1 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -1,7 +1,9 @@
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index e1908e2d04fe0259ee7258ae0be1506dc6a7982c..11747ab9ce38ba3b0a11f7d9c1a81f5c8746f49a 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -2,11 +2,13 @@
$wb['select_server_txt'] = 'Zvolit server';
$wb['btn_do_txt'] = 'Provést akci';
$wb['do_osupdate_caption'] = 'Aktualizace operačního systému na vzdáleném serveru.';
-$wb['do_osupdate_desc'] = 'Tato akce provede \\"aptitude -y\\" aktualizaci na vybraném serveru.
POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !';
+$wb['do_osupdate_desc'] = 'Tato akce provede "aptitude -y" aktualizaci na vybraném serveru.
POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !';
$wb['do_ispcupdate_caption'] = 'Provedení ISPConfig 3 - aktualizace na vzdáleném serveru';
-$wb['do_ispcupdate_desc'] = 'Tato akce provede \\"ISPConfig 3\\" aktualizaci na vašem vybraném serveru.
POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !';
+$wb['do_ispcupdate_desc'] = 'Tato akce provede "ISPConfig 3" aktualizaci na vašem vybraném serveru.
POUŽITÍ TÉTO AKCE NA VLASTNÍ NEBEZPEČÍ !';
$wb['action_scheduled'] = 'Akce je naplánována na provedení';
$wb['select_all_server'] = 'Všechny servery';
$wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
$wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz
ispconfig_update.sh
spustí se ISPConfig aktualizace.
Klikněte zde pro podrobnější informace o provedení aktualizace';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index f764fc73e8301cdb585c45a588792e799c6a8283..a34b3d74dee39106675e8ddba70b46ef535481ba 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -6,19 +6,19 @@ $wb['username_error_unique'] = 'Uživatelské jméno musí být unikátní';
$wb['username_error_empty'] = 'Uživatelské jméno nemůže být prázdné';
$wb['password_error_empty'] = 'Heslo nemůže být prázdné';
$wb['password_strength_txt'] = 'Bezpečnost hesla:';
-$wb['Mail domain functions'] = 'Funkce mailové domény';
-$wb['Mail user functions'] = 'Funkce mailového uživatele';
-$wb['Mail alias functions'] = 'Funkce mailového aliasu';
-$wb['Mail forward functions'] = 'Funkce mailového předávání';
-$wb['Mail catchall functions'] = 'Funkce mailového koše';
-$wb['Mail transport functions'] = 'Funkce mailového transportu';
-$wb['Mail whitelist functions'] = 'Funkce mailové bílé listiny';
-$wb['Mail blacklist functions'] = 'Funkce mailové černé listiny';
-$wb['Mail spamfilter user functions'] = 'Funkce mailového spamfiltr uživatele';
-$wb['Mail spamfilter policy functions'] = 'Funkce mailové spamfiltr politiky';
-$wb['Mail fetchmail functions'] = 'Funkce mailové externí získávání emailů';
-$wb['Mail user filter functions'] = 'Funkce mailového filtru uživatelů';
-$wb['Mail filter functions'] = 'Funkce mailového filtru';
+$wb['Mail domain functions'] = 'Funkce e-mailové domény';
+$wb['Mail user functions'] = 'Funkce e-mailového uživatele';
+$wb['Mail alias functions'] = 'Funkce e-mailového aliasu';
+$wb['Mail forward functions'] = 'Funkce e-mailového předávání';
+$wb['Mail catchall functions'] = 'Funkce e-mailového koše';
+$wb['Mail transport functions'] = 'Funkce e-mailového transportu';
+$wb['Mail whitelist functions'] = 'Funkce e-mailové bílé listiny';
+$wb['Mail blacklist functions'] = 'Funkce e-mailové černé listiny';
+$wb['Mail spamfilter user functions'] = 'Funkce e-mailového spamfiltr uživatele';
+$wb['Mail spamfilter policy functions'] = 'Funkce e-mailové spamfiltr politiky';
+$wb['Mail fetchmail functions'] = 'Funkce e-mailové externí získávání e-mailů';
+$wb['Mail user filter functions'] = 'Funkce e-mailového filtru uživatelů';
+$wb['Mail filter functions'] = 'Funkce e-mailového filtru';
$wb['Client functions'] = 'Klientské funkce';
$wb['Sites cron functions'] = 'Funkce cronů';
$wb['Sites database functions'] = 'Funkce databází';
@@ -39,9 +39,11 @@ $wb['DNS ptr functions'] = 'Funkce DNS PTR';
$wb['DNS rp functions'] = 'Funkce DNS RP';
$wb['DNS srv functions'] = 'Funkce DNS SRV';
$wb['DNS txt functions'] = 'Funkce DNS TXT';
-$wb['Mail mailing list functions'] = 'Mail mailinglist functions';
+$wb['Mail mailing list functions'] = 'Funkce e-mailové konference';
$wb['generate_password_txt'] = 'Generovat heslo';
$wb['repeat_password_txt'] = 'Opakujte heslo';
$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 66b64946e457be5ad87b6b267f31d4c972389e79..1b40308735bbc3df08d0b6dd7488ae11d4196e67 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,3 +5,5 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Uživatel';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index a087656a1c391d0f1c0b6b1d191c1e4723d26392..9d44fd27c840ef95abe4fea148e6c93572f5799d 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -13,3 +13,5 @@ $wb['- None -'] = '- Žádný -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index c1d2b4278f4e969387f1a8a529f084bcd3be7bef..0e58bf2bacea18709fec1a28dce81399307f29dc 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -132,16 +132,16 @@ $wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
-$wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
-$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
-$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
-$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
-$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
-$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_init_script_txt'] = 'PHP-FPM název init skriptu';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM název init skriptu je prázdny';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM cesta k php.ini';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM cesta k php.ini je prázdná';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM adresář pro pool';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM adresář pro pool je prázdny.';
$wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
-$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
-$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM adresář pro socket';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM adresář pro socket je prázdny.';
$wb['try_rescue_txt'] = 'Povolit monitorování služeb a restartovat při selhání';
$wb['do_not_try_rescue_mysql_txt'] = 'Zakázat MySQL monitorování';
$wb['do_not_try_rescue_mail_txt'] = 'Zakázat E-mail monitorování';
@@ -171,3 +171,5 @@ $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attribu
$wb['overtraffic_notify_admin_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení adminovi';
$wb['overtraffic_notify_client_txt'] = 'Při překročení limitu přenesených dat, poslat oznámení klientovi';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 2118c35357cc0b40228eb0153adfda86f36cfdae..8589dbc9d16f2eda14e03769bc6a2ffbc8a42371 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,3 +2,5 @@
$wb['list_head_txt'] = 'Konfigurace serveru';
$wb['server_name_txt'] = 'Server';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index fa719665bbba66b26ddb5de8576baab859187adb..a948939fe2026dac467ca800f9b7aeddfdcf0a53 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -2,10 +2,12 @@
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'IP adresa';
$wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_error_wrong'] = 'IP adresa je neplatná';
+$wb['ip_error_wrong'] = 'IP adresa je neplatná nebo prázdná';
$wb['ip_error_unique'] = 'IP adresa musí být unikátní';
$wb['client_id_txt'] = 'Klient';
$wb['ip_type_txt'] = 'Verze';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
+$wb['virtualhost_port_txt'] = 'HTTP Porty';
+$wb['error_port_syntax'] = 'Neplatné znaky ve volbě HTTP Portů. Prosím, zadejte pouze číselné hodnoty oddělené čárkami. Příklad: 80,443';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index 93b0b77c9b07006918807364085af28604b05ce7..2a47ca75917b4dde544382f9d99a027407c735b9 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,3 +8,5 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'HTTP Ports';
$wb['ip_type_txt'] = 'Verze';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index ecddbf28e8433d15def51368252ca6d74e976e50..e7a2efd805ccf0ac030968b53abd6251b3a7faac 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -11,3 +11,5 @@ $wb['add_new_record_txt'] = 'Přidat server';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 10aba05dd76089c892ff4ee5fe88a7f4bce5e210..59cf3c7365046db053b32658451a67f21b2947a1 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,3 +14,5 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index 36b28fe4118f509767f2153601de8e9085ad86ed..e0b43a4a996b6ebb49c9d231793446ebfcd73abc 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,3 +5,5 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
$wb['client_id_txt'] = 'Klient';
$wb['name_txt'] = 'Verze PHP';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index af524509f0258bc97be47da5ba97574daf7b2879..83440257f27b7f9456aa708b73e72b6ee6100a14 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -1,6 +1,8 @@
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index ac98941ae85e8b5029e51f54dd38bb1ae7404287..1a59b58e10dc5855e3c67f5571b509142c951685 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -7,4 +7,7 @@ $wb['action_txt'] = 'Akce';
$wb['toolsarea_head_txt'] = 'Balíčky';
$wb['repoupdate_txt'] = 'Aktualizace seznamu balíků';
$wb['package_id_txt'] = 'místní App-ID';
+$wb['no_packages_txt'] = 'Žádné balíčky nejsou k dispozici';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index 64a190d9a1dddf174078dcdfcecb2f3f9c1cd34c..f48a2c4a363aff9694042db16e2ee7b71de90fc1 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -5,3 +5,5 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
$wb['repo_password_txt'] = 'Heslo (volitelné)';
$wb['active_txt'] = 'Aktivní';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 5c82d4c41f718370b4587752fa636a692fcb7e9f..4ae3c662d86ab872011ea7f14dfd83e77d9468fe 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,3 +4,5 @@ $wb['active_txt'] = 'Aktivní';
$wb['repo_name_txt'] = 'Repozitář';
$wb['repo_url_txt'] = 'URL';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 32671d3823adddea936aa40e64e1de4205536fb6..4e7d161bbe23908bd07855d80717e2aad5901940 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -5,4 +5,7 @@ $wb['installed_txt'] = 'Akce';
$wb['update_title_txt'] = 'Aktualizovat';
$wb['version_txt'] = 'Verze';
$wb['action_txt'] = 'Akce';
+$wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 8a75c351c9200d10e2b10a32cc9f940414b779dc..67253c63d8f21eee1a866e283be65f793a091702 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -13,9 +13,9 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Odkaz na aplikaci PHPMyAdmin v DB seznamu';
$wb['mailboxlist_webmail_link_txt'] = 'Odkaz na aplikaci Webmail v Mailbox seznamu';
$wb['webmail_url_txt'] = 'Webmail URL';
$wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
-$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
-$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
-$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
+$wb['dashboard_atom_url_admin_txt'] = 'Řídící panel novinky načítat z URL pro: (admina)';
+$wb['dashboard_atom_url_reseller_txt'] = 'Řídící panel novinky načítat z URL pro: (prodejce)';
+$wb['dashboard_atom_url_client_txt'] = 'Řídící panel novinky načítat z URL pro: (klienty)';
$wb['webdavuser_prefix_txt'] = 'Prefix webdav uživatele';
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
$wb['use_domain_module_txt'] = 'Použijte modul-domény pro přidání nových domén';
@@ -29,24 +29,26 @@ $wb['mailmailinglist_link_txt'] = 'Odkaz na aplikaci mailing seznam e-mailových
$wb['mailmailinglist_url_txt'] = 'Mailing seznam URL';
$wb['monitor_key_txt'] = 'Monitor keyword';
$wb['maintenance_mode_txt'] = 'Režim údržby';
-$wb['smtp_enabled_txt'] = 'Použít (zvolit) SMTP server pro zasílání systemových mailů';
+$wb['smtp_enabled_txt'] = 'Použít (zvolit) SMTP server pro zasílání systémových mailů';
$wb['smtp_host_txt'] = 'SMTP host';
$wb['smtp_port_txt'] = 'SMTP port';
$wb['smtp_user_txt'] = 'SMTP uživatel';
$wb['smtp_pass_txt'] = 'SMTP heslo';
$wb['smtp_crypt_txt'] = 'Použít SSL/TLS šifrované spojení pro SMTP';
-$wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
+$wb['smtp_missing_admin_mail_txt'] = 'Zadejte prosím jméno Administrátora a e-mailovou adresu Administrátora, pokud chcete používat zvolený SMTP server pro zasílání systémových mailů.';
$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
$wb['tab_change_warning_txt'] = 'Záložka změna varování';
$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
-$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_txt'] = 'Vytvořit subdomény jako webové stránky';
$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
-$wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
-$wb['use_loadindicator_txt'] = 'Use Load Indicator';
-$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
+$wb['phpmyadmin_url_error_regex'] = 'phpmyadmin neplatné URL';
+$wb['use_combobox_txt'] = 'Použití jQuery UI Combobox';
+$wb['use_loadindicator_txt'] = 'Použití indikátoru zatížení';
+$wb['f5_to_reload_js_txt'] = 'Pokud vypnete tuto volbu, zřejmě budete muset používat klávesu F5, aby internetový prohlížeč znovu načetl JavaScript knihovny nebo budete muset ručně vyprázdňovat mezipaměť (cache) vašeho internetového prohlížeče.';
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail';
$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index 480d5044215ccee6020d840bf403e3cc11a616bf..edf66963d4555510e745627e697caedfc887a274 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,3 +16,5 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index 16f4812d68397788cadac99a3a838ad54a9805b4..1f3cb59e876349a4a992205e696ce9de53779295 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,3 +31,5 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
$wb['password_match_txt'] = 'Hesla se shodují.';
$wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"';
?>
+
+
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index e5a7d1e4de20f603d4393e733c92a6ff8b060c2b..a4915a4ca048f863ec1853ca0e6f7356c691a193 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,3 +7,5 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
$wb['warning_txt'] = 'VAROVÁNÍ: Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
$wb['groups_txt'] = 'Skupiny';
?>
+
+
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 6eb46d16daf13e466fbd3dd9f32e6bdce824a11b..2c852ede07b7c3c4afd6815a25cd4f19c654dfc5 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -173,6 +173,7 @@ $wb['overtraffic_notify_client_txt'] = 'Überschreiten des Transfer Limits an de
$wb['php_ini_check_minutes_txt'] = 'Prüfe System php.ini Dateien auf Änderungen alle';
$wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
$wb['php_ini_check_minutes_error_empty'] = 'Der Wert für die Einstellung der php.ini Prüfung ist ungültig.';
+$wb["rbl_error_regex"] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
$wb["sendmail_path_txt"] = 'Pfad zu Sendmail';
$wb["sendmail_path_error_empty"] = 'Sendmail Pfad ist leer.';
?>
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
index 8cf3e39d894c0677b62764050eed61a95655a6ad..0d74780fa9af11804c61ead6baa7b9ae804916c2 100644
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ b/interface/web/admin/lib/lang/de_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Aktion';
$wb['toolsarea_head_txt'] = 'Pakete';
$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
$wb['package_id_txt'] = 'Lokale App ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
index 6f01c1f081fa5d195bd1837f2977c3ea9fa5f9eb..29ba194a533e6a5e1e5c694f0c15a5e183ca0b3b 100644
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ b/interface/web/admin/lib/lang/de_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Aktion';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Aktion';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/el_login_as.lng b/interface/web/admin/lib/lang/el_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/el_login_as.lng
+++ b/interface/web/admin/lib/lang/el_login_as.lng
@@ -1,11 +1,11 @@
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 798f6d0b1680c926e7a37489e8a327c68404dd3c..1528928da3ecb4914741e62bc61f25add409d41a 100644
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ b/interface/web/admin/lib/lang/el_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Ενέργεια';
$wb['toolsarea_head_txt'] = 'Πακέτα';
$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
$wb['package_id_txt'] = 'τοπικό App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
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..42100d0c8903ad84f65f8f5137feee995b83d3d5 100644
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ b/interface/web/admin/lib/lang/el_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Ενέργεια';
$wb['update_title_txt'] = 'Ενημέρωση';
$wb['version_txt'] = 'Έκδοση';
$wb['action_txt'] = 'Ενέργεια';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 8033db8818a8c16c032b609e737ac0b0be895818..b39dd0e5387d0d7b70b22a13a846e7e5aaa0775d 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -176,6 +176,7 @@ $wb["v6_prefix_wrong"] = 'Invalid v6 Netmask format.';
$wb["php_ini_check_minutes_txt"] = 'Check system php.ini files for changes each';
$wb["php_ini_check_minutes_info_txt"] = 'minutes (0 disables checking)';
$wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.';
+$wb["rbl_error_regex"] = 'Please specify valid RBL hostnames.';
$wb["sendmail_path_txt"] = 'Sendmail Path';
$wb["sendmail_path_error_empty"] = 'Sendmail Path is empty.';
?>
diff --git a/interface/web/admin/lib/lang/en_software_package_list.lng b/interface/web/admin/lib/lang/en_software_package_list.lng
index 29ad555875a9cb2b4b3ae57fc287dd2a8b91741a..8ba66d7fdc3ad5c6d549b0cd5365dd02e81d9749 100644
--- a/interface/web/admin/lib/lang/en_software_package_list.lng
+++ b/interface/web/admin/lib/lang/en_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/en_software_update_list.lng b/interface/web/admin/lib/lang/en_software_update_list.lng
index ec4af23a4bf359a8f669c4baf386b79da53dcd49..fe7639125cd2634fa809d9a6592e9e9fb21e84bb 100644
--- a/interface/web/admin/lib/lang/en_software_update_list.lng
+++ b/interface/web/admin/lib/lang/en_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Action';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/es_login_as.lng b/interface/web/admin/lib/lang/es_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/es_login_as.lng
+++ b/interface/web/admin/lib/lang/es_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/es_software_package_list.lng b/interface/web/admin/lib/lang/es_software_package_list.lng
index b77a5d5a76fe70cce98af7a4d530a5c97b962df3..103260991e66858bec7bdcee76e639a44a465a1a 100644
--- a/interface/web/admin/lib/lang/es_software_package_list.lng
+++ b/interface/web/admin/lib/lang/es_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acción';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/es_software_update_list.lng b/interface/web/admin/lib/lang/es_software_update_list.lng
index adbe6d8c990298bea737b02cf6f52b1c7d5fb6b0..deb2a3c352e94db423ed249dd2897c53721896df 100644
--- a/interface/web/admin/lib/lang/es_software_update_list.lng
+++ b/interface/web/admin/lib/lang/es_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Actualizar';
$wb['version_txt'] = 'Versión';
$wb['action_txt'] = 'Acción';
$wb['server_select_txt'] = 'Seleccionar servidor';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/fi_login_as.lng b/interface/web/admin/lib/lang/fi_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/fi_login_as.lng
+++ b/interface/web/admin/lib/lang/fi_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
index 9714b4d7d977c9fdc2a87d3d834ba1d255687b95..85e31f904b0793332126a27efbf11e039e855b25 100755
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Toiminto';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
index 9d9a2d2f7455c10fc2cfeab44b94b71aa4ef9695..7871958353e51a7265e5910c7273e825a04ddb76 100755
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fi_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Päivitä';
$wb['version_txt'] = 'Versio';
$wb['action_txt'] = 'Toiminto';
$wb['server_select_txt'] = 'Valitse palvelin';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/fr_login_as.lng b/interface/web/admin/lib/lang/fr_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/fr_login_as.lng
+++ b/interface/web/admin/lib/lang/fr_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng
index cb8f3f36348241c3a3647ea8b0a8344c419df967..d6e1d14d4863471e0a6abdf94ddf5d8c07fe3a83 100644
--- a/interface/web/admin/lib/lang/fr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/fr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Mettre à jour la liste des paquets';
$wb['package_id_txt'] = 'App-ID locale';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/fr_software_update_list.lng b/interface/web/admin/lib/lang/fr_software_update_list.lng
index 3c66539aa5a9d29b87070dd047869cada686a9d2..8fb67a03104596fa99c9e79560ccab14b00f50cb 100644
--- a/interface/web/admin/lib/lang/fr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/fr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Mise à jour';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
$wb['server_select_txt'] = 'Sélectionnez le serveur';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/hr_login_as.lng b/interface/web/admin/lib/lang/hr_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/hr_login_as.lng
+++ b/interface/web/admin/lib/lang/hr_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng
index 0240c2d2358feed6be5049430eee50a3886a1183..66ee959b9182d0e7b92ae3fa2a3e8e5fa6f965d9 100644
--- a/interface/web/admin/lib/lang/hr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Akcija';
$wb['toolsarea_head_txt'] = 'Paketi';
$wb['repoupdate_txt'] = 'Obnovi listu paketa';
$wb['package_id_txt'] = 'lokalni App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng
index 59f910b698d5f139c2c2b7683435010f6a304f91..ed28fafbab91d571bad8aa20fbbfca52ff296c3f 100644
--- a/interface/web/admin/lib/lang/hr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Akcija';
$wb['update_title_txt'] = 'Nadogradi';
$wb['version_txt'] = 'Verzija';
$wb['action_txt'] = 'Akcija';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/hu_login_as.lng b/interface/web/admin/lib/lang/hu_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/hu_login_as.lng
+++ b/interface/web/admin/lib/lang/hu_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng
index b5e4fefb87c4037a0def5161d8af7252d0af0939..d4749f0de2c14a0ba5f14ccc4f9d84b317f98f5f 100644
--- a/interface/web/admin/lib/lang/hu_software_package_list.lng
+++ b/interface/web/admin/lib/lang/hu_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Művelet';
$wb['toolsarea_head_txt'] = 'Csomagok';
$wb['repoupdate_txt'] = 'Csomaglista frissítése';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/hu_software_update_list.lng b/interface/web/admin/lib/lang/hu_software_update_list.lng
index 56f95b6a3d36911b37f782b3aacbef5557577ba4..c2edc83217d879d6cfc829de25c24afb3a1964ef 100644
--- a/interface/web/admin/lib/lang/hu_software_update_list.lng
+++ b/interface/web/admin/lib/lang/hu_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Frissítés';
$wb['version_txt'] = 'Verzió';
$wb['action_txt'] = 'Művelet';
$wb['server_select_txt'] = 'Válasszon szervert';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/id_login_as.lng b/interface/web/admin/lib/lang/id_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/id_login_as.lng
+++ b/interface/web/admin/lib/lang/id_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/id_software_package_list.lng b/interface/web/admin/lib/lang/id_software_package_list.lng
index c6e3e4f4a4cfe20aac95ab4227a9af1bffbf359f..a7e4987ed6ba6dd896473268aae3fb52e61894ba 100644
--- a/interface/web/admin/lib/lang/id_software_package_list.lng
+++ b/interface/web/admin/lib/lang/id_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Aktif';
$wb['toolsarea_head_txt'] = 'Paket';
$wb['repoupdate_txt'] = 'Mutakhirkan daftar paket';
$wb['package_id_txt'] = 'App-ID lokal';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/id_software_update_list.lng b/interface/web/admin/lib/lang/id_software_update_list.lng
index a1d8eb7c7803765702adca612bb964fe771d5253..f789a0e72c472d55b27e254771c57d98bfcae3fd 100644
--- a/interface/web/admin/lib/lang/id_software_update_list.lng
+++ b/interface/web/admin/lib/lang/id_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Tindakan';
$wb['update_title_txt'] = 'Mutakhirkan';
$wb['version_txt'] = 'Versi';
$wb['action_txt'] = 'Tindakan';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/it_login_as.lng b/interface/web/admin/lib/lang/it_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/it_login_as.lng
+++ b/interface/web/admin/lib/lang/it_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng
index f7a60d721fee5d0bbabf8a077cba364206f22729..87b27fd50b16af5b4ffe42a716a33db748143e64 100644
--- a/interface/web/admin/lib/lang/it_software_package_list.lng
+++ b/interface/web/admin/lib/lang/it_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
index 0a1819661c1424de55aa590caa052a084143af5d..16ca62d8b1f42a5fbc89c01d0d62efa3be683ae0 100644
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ b/interface/web/admin/lib/lang/it_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Aggiornamento';
$wb['version_txt'] = 'Versione';
$wb['action_txt'] = 'Azione';
$wb['server_select_txt'] = 'Selezionare server';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_list.lng b/interface/web/admin/lib/lang/ja_software_package_list.lng
index a1f5b651837deabe80b059186b422c16b15175ca..fb587767c87013cd08b17214964037219f15bb3a 100644
--- a/interface/web/admin/lib/lang/ja_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ja_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = '操作';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ja_software_update_list.lng b/interface/web/admin/lib/lang/ja_software_update_list.lng
index b37528035daea58454a04c155bb58999c5305fe0..f0ecf5711bfbe603072a559a54073ea008303770 100644
--- a/interface/web/admin/lib/lang/ja_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ja_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = '操作';
$wb['update_title_txt'] = '更新';
$wb['version_txt'] = 'バージョン';
$wb['action_txt'] = '操作';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/nl_login_as.lng b/interface/web/admin/lib/lang/nl_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/nl_login_as.lng
+++ b/interface/web/admin/lib/lang/nl_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng
index f55b7f8a8f29ac493c14873aef8681673b98cd15..ee5516a15e70b155636d76a372c0009a31eee356 100644
--- a/interface/web/admin/lib/lang/nl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Actie';
$wb['toolsarea_head_txt'] = 'Pakketten';
$wb['repoupdate_txt'] = 'Update pakketlijst';
$wb['package_id_txt'] = 'locaal App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng
index eb7cf1ca5a1f5ab25a35f60acb9abd3e6dd29faf..0d05c855943aad9b9933f72c91130efe5d17622f 100644
--- a/interface/web/admin/lib/lang/nl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/nl_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Actie';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Versie';
$wb['action_txt'] = 'Actie';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index d813d580e0ef447b1ed2f08c9119c509fef7e717..40c35945aa4ebdf3b376cc8015db537dc39e6948 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -1,50 +1,51 @@
+
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
index d836ab0da0d88fc0a5c4aa9e78eaa5b7d3fd557d..e4c5572293ecf15ff5837907be6793d438e645f7 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -1,9 +1,10 @@
+
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
index 4124ea34641c48c25db6319110a5f119264242e6..41c6364f97ad164f5f7b6ddfa7bf88b277512fb9 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -1,7 +1,8 @@
+
diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng
index 56817895060e4d3c89e5c903539f040088fa34e2..8098fcc61b9697600d573217bc9dddf3d1c0ae0b 100644
--- a/interface/web/admin/lib/lang/pl_firewall.lng
+++ b/interface/web/admin/lib/lang/pl_firewall.lng
@@ -9,3 +9,4 @@ $wb['firewall_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
$wb['tcp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu TCP. Dozwolone znaki to liczby, : oraz ,.';
$wb['udp_ports_error_regex'] = 'Znak nie jest dozwolony w formacie portu UDP. Dozwolone znaki to liczby, : oraz ,.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng
index 6a4b8388f71dcd5b7a5acb5fbe4d5fcf1a8527c6..fe80e430ca0a09157464290d7b0b94e31c27b8b6 100644
--- a/interface/web/admin/lib/lang/pl_firewall_list.lng
+++ b/interface/web/admin/lib/lang/pl_firewall_list.lng
@@ -6,3 +6,4 @@ $wb['tcp_port_txt'] = 'Otwarte porty TCP';
$wb['udp_port_txt'] = 'Otwarte porty UDP';
$wb['add_new_record_txt'] = 'Dodaj wpis Firewalla';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng
index b3c8b9ca777f58387a7713ceb9e0170b03b39f77..a97ac3f301a6f53d1d101382624892c7c8300b99 100644
--- a/interface/web/admin/lib/lang/pl_groups.lng
+++ b/interface/web/admin/lib/lang/pl_groups.lng
@@ -3,3 +3,4 @@ $wb['description_txt'] = 'Opis';
$wb['name_txt'] = 'Grupa';
$wb['name_err'] = 'Nazwa grupy musi mieć od 1 do 30 znaków.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng
index 75756bca7b6f316664eadf9399eaed1cdad636b8..9409d32c9c5cd073d5d3fa77c380df6953f39033 100644
--- a/interface/web/admin/lib/lang/pl_groups_list.lng
+++ b/interface/web/admin/lib/lang/pl_groups_list.lng
@@ -5,3 +5,4 @@ $wb['name_txt'] = 'Grupa';
$wb['add_new_record_txt'] = 'Dodaj nową grupę';
$wb['warning_txt'] = 'OSTRZEŻENIE: Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_iptables.lng b/interface/web/admin/lib/lang/pl_iptables.lng
index f6be566c4fa69a0cc3cf7ca98bbd4ea52a5cf607..8073e5d00861aaf17a806e22930cc1e4ab0ed770 100644
--- a/interface/web/admin/lib/lang/pl_iptables.lng
+++ b/interface/web/admin/lib/lang/pl_iptables.lng
@@ -11,3 +11,4 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_iptables_list.lng b/interface/web/admin/lib/lang/pl_iptables_list.lng
index 2f74b180c62f160292b3bf9a0628e739906c5e68..255a82925ccf4aa2ec0d4015b9ca5a4c33804ebd 100644
--- a/interface/web/admin/lib/lang/pl_iptables_list.lng
+++ b/interface/web/admin/lib/lang/pl_iptables_list.lng
@@ -13,3 +13,4 @@ $wb['source_ip_txt'] = 'Adres źródłowy';
$wb['active_txt'] = 'Aktywny';
$wb['iptables_error_unique'] = 'Istnieje już wpis firewalla dla tego serwera.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng
index 82e42ef720eea1c0c5e7387249693933b41b68bc..df1a5f31fcb2edf1deab8eacd5a1044d8187c9d0 100644
--- a/interface/web/admin/lib/lang/pl_language_add.lng
+++ b/interface/web/admin/lib/lang/pl_language_add.lng
@@ -6,3 +6,4 @@ $wb['language_new_hint_txt'] = '2 znakowe kodowanie języka ISO 639-1 (Zobacz ht
$wb['btn_save_txt'] = 'Utwórz nowy zbiór plików z językami';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng
index 0096c69efabccd5775ca0bc4e739e21156cae4c4..6d6d8ec36d74e512d453df9b474c8ea18caf8b3d 100644
--- a/interface/web/admin/lib/lang/pl_language_complete.lng
+++ b/interface/web/admin/lib/lang/pl_language_complete.lng
@@ -5,3 +5,4 @@ $wb['language_select_txt'] = 'Wybierz język';
$wb['btn_save_txt'] = 'Połącz pliki teraz';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_edit.lng b/interface/web/admin/lib/lang/pl_language_edit.lng
index 3a5e7069393b0af5a2da2b080b3b55d0673f62a9..b4ec35d9b4d3674bc7f2bfce0053155b50b9687a 100644
--- a/interface/web/admin/lib/lang/pl_language_edit.lng
+++ b/interface/web/admin/lib/lang/pl_language_edit.lng
@@ -6,3 +6,4 @@ $wb['lang_file_txt'] = 'Plik języka';
$wb['btn_save_txt'] = 'Zapisz';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng
index e58dbf072ab7dff6683ef371ba5f1a17b493211b..0b38a48701a569ef2f26c812e82172994ac30701 100644
--- a/interface/web/admin/lib/lang/pl_language_export.lng
+++ b/interface/web/admin/lib/lang/pl_language_export.lng
@@ -4,3 +4,4 @@ $wb['language_select_txt'] = 'Wybierz język';
$wb['btn_save_txt'] = 'Eksportuj pliki wybranego języka';
$wb['btn_cancel_txt'] = 'Wróć';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng
index 077d0c00ea68d567ff4324219a28ea2ca7e164b6..e78238adaa6a6bd0807bd3283ce598fc7513dee4 100644
--- a/interface/web/admin/lib/lang/pl_language_import.lng
+++ b/interface/web/admin/lib/lang/pl_language_import.lng
@@ -6,3 +6,4 @@ $wb['language_overwrite_txt'] = 'Nadpisz plik jeśli istnieje.';
$wb['btn_cancel_txt'] = 'Wróć';
$wb['ignore_version_txt'] = 'Pomiń sprawdzanie wersji ISPConfig';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng
index 05fd6e39ac17ea189fca50230d8258822a50af79..14b7cdb5076fa513986b06ff3d01cb381aee2663 100644
--- a/interface/web/admin/lib/lang/pl_language_list.lng
+++ b/interface/web/admin/lib/lang/pl_language_list.lng
@@ -5,3 +5,4 @@ $wb['module_txt'] = 'Moduł';
$wb['lang_file_txt'] = 'Plik języka';
$wb['lang_file_date_txt'] = 'Ostatnia modyfikacja';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_login_as.lng b/interface/web/admin/lib/lang/pl_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..a50549449423cb540753b9983a0e0fcd2a446665 100644
--- a/interface/web/admin/lib/lang/pl_login_as.lng
+++ b/interface/web/admin/lib/lang/pl_login_as.lng
@@ -1,11 +1,12 @@
+
diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng
index 30439086ab83191dc21d44e30ad7ff6db2ba0e01..ce5c73c8147b31f68433f37d28aca5bf9efc94fc 100644
--- a/interface/web/admin/lib/lang/pl_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_package_install.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Użytkownik (opcjonalnie)';
$wb['repo_password_txt'] = 'Hasło (opcjonalnie)';
$wb['active_txt'] = 'Aktywne';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng
index 83fbc9e282a01a83ca99b4b1d15d6395af0613ed..36b0383c4ef230c45ebad35a74c0ee9b6aa3b1b1 100644
--- a/interface/web/admin/lib/lang/pl_remote_action.lng
+++ b/interface/web/admin/lib/lang/pl_remote_action.lng
@@ -10,3 +10,4 @@ $wb['select_all_server'] = 'Wszystkie serwery';
$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command
ispconfig_update.sh
to start the ISPConfig update.
Click here for detailed update instructions';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng
index 7691fecbe738ec7aabb59f2e1306e2829958c01b..6c55771f6c56dfe6afe585ea4225f8329e8280b8 100644
--- a/interface/web/admin/lib/lang/pl_remote_user.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user.lng
@@ -40,8 +40,9 @@ $wb['DNS rp functions'] = 'Funkcje rekordu RP DNS';
$wb['DNS srv functions'] = 'Funkcje rekordu SRV DNS';
$wb['DNS txt functions'] = 'Funkcje rekordu TXT DNS';
$wb['Mail mailing list functions'] = 'Funkcje listy mailingowej';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng
index 6dd12ae97c1cd8a59f02d95b2ee37cb0108e7ea4..976e3130addadd0e3b621c8cccacb020f382207e 100644
--- a/interface/web/admin/lib/lang/pl_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowego użytkownika';
$wb['parent_remote_userid_txt'] = 'ID';
$wb['username_txt'] = 'Nazwa użytkownika';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
index 5e9c4117203ab9d18971262250a972399c70e58e..2ebbeb2198f3b663f8de18f7e85b756ef05188e8 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -13,3 +13,4 @@ $wb['- None -'] = '- Żaden -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index ac1d280e28793b70ccc12c47d657e32b852df3c7..05836f62f609c8d3140720b104d3f5ec4bea9c2a 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -5,7 +5,7 @@ $wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji roota Jailkit';
$wb['jailkit_chroot_cron_programs_txt'] = 'Aplikacje cron roota Jailkit';
$wb['website_path_txt'] = 'Adres strony WWW';
$wb['website_symlinks_txt'] = 'Symulowany link strony WWW';
-$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['website_symlinks_rel_txt'] = 'Twórz linki relatywne';
$wb['website_basedir_txt'] = 'Ścieżka bazowa strony WWW';
$wb['vhost_conf_dir_txt'] = 'Ścieżka do konfiguracyji wirtualnego serwera';
$wb['vhost_conf_enabled_dir_txt'] = 'Ścieżka do aktywnej konfiguracyji Vhost';
@@ -42,7 +42,7 @@ $wb['hostname_error_empty'] = 'Nazwa jest pusta.';
$wb['nameservers_error_empty'] = 'Nazwa serwera jest pusta.';
$wb['config_dir_txt'] = 'Katalog konfiguracji';
$wb['init_script_txt'] = 'Nazwa skryptu inicjującego Crona';
-$wb['crontab_dir_txt'] = 'Ścieżka do indywidualnych crontabs';
+$wb['crontab_dir_txt'] = 'Ścieżka do indywidualnych zadań Cron';
$wb['wget_txt'] = 'Ścieżka do wget';
$wb['web_user_txt'] = 'Użytkownik Apache';
$wb['web_group_txt'] = 'Grupa Apache';
@@ -154,20 +154,21 @@ $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
$wb['website_autoalias_txt'] = 'Website auto alias';
$wb['website_autoalias_note_txt'] = 'Placeholders:';
-$wb['backup_mode_txt'] = 'Backup mode';
-$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
-$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['backup_mode_txt'] = 'Tryb tworzenia kopii';
+$wb['backup_mode_userzip'] = 'Pliki kopii z prawami użytkownika jako zip';
+$wb['backup_mode_rootgz'] = 'Twórz kopie wszystkich plików w katalogu web jako root';
$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
-$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
-$wb['ssl_settings_txt'] = 'SSL Settings';
-$wb['permissions_txt'] = 'Permissions';
-$wb['php_settings_txt'] = 'PHP Settings';
+$wb['realtime_blackhole_list_note_txt'] = '(oddziel RBL-e przecinkami)';
+$wb['ssl_settings_txt'] = 'Ustawienia SSL';
+$wb['permissions_txt'] = 'Uprawnienia';
+$wb['php_settings_txt'] = 'Ustawienia PHP';
$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
-$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['awstats_settings_txt'] = 'Ustawienia AWStats';
$wb['firewall_txt'] = 'Firewall';
-$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['mailbox_quota_stats_txt'] = 'Statystyki użycia skrzynek email';
$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
-$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
-$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['overtraffic_notify_admin_txt'] = 'Prześlij informacje o przekroczeniu transferu do admina';
+$wb['overtraffic_notify_client_txt'] = 'Prześlij informacje o przekroczeniu transferu do klienta';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng
index f9e8dcf1b559349ac491040e4920bec5fa38a7e6..e700889bf85c147522cb4775fbe6bd5367bca825 100644
--- a/interface/web/admin/lib/lang/pl_server_config_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_config_list.lng
@@ -2,3 +2,4 @@
$wb['list_head_txt'] = 'Konfiguracja serwera';
$wb['server_name_txt'] = 'Serwer';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng
index cb16e104d5822d4b794b1a0d6410dd666545de8c..2c107d05a94c53a4b06ee7d4414985cf46b23975 100644
--- a/interface/web/admin/lib/lang/pl_server_ip.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip.lng
@@ -9,3 +9,4 @@ $wb['ip_type_txt'] = 'Typ';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['error_port_syntax'] = 'Nieprawidłowe wartości w polu portów, proszę wpisać tylko liczby oddzielone przecinkiem. Przykładowo: 80,443';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng
index 64b004dc7822cf83ef3d7bcc0f6f5248497b42f6..dcf8951ac9641b014cc0a6efc366a816382752f1 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng
@@ -8,3 +8,4 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
$wb['virtualhost_port_txt'] = 'Porty HTTP';
$wb['ip_type_txt'] = 'Typ';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
index 81356acf77024414ccc676ef7e516d5fac226528..9ca9eb87151c9691d3a10f10b18dbf774994d68d 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -11,3 +11,4 @@ $wb['add_new_record_txt'] = 'Dodaj nowy serwer';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
index addbfa49357aa4e45f3c0ef1700065df9cf541f7..54d0ef277582221996f29a3542daba2b6b27adce 100644
--- a/interface/web/admin/lib/lang/pl_server_php.lng
+++ b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -1,16 +1,17 @@
+
diff --git a/interface/web/admin/lib/lang/pl_server_php_list.lng b/interface/web/admin/lib/lang/pl_server_php_list.lng
index b402fd1ed19978b32027a9ed16e7b44f241db93e..dc697ae1fffd70f2304bcea429df5a4fa4eb6ae6 100644
--- a/interface/web/admin/lib/lang/pl_server_php_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_php_list.lng
@@ -5,3 +5,4 @@ $wb['add_new_record_txt'] = 'Add new PHP version';
$wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
index fd2f2930dde345143a239e3755d6c6e0bfe32470..ea9290bd39a9d9920584063ae6e348bbeb6137d9 100644
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_install.lng
@@ -4,3 +4,4 @@ $wb['install_key_txt'] = 'Podaj klucz instalacyjny';
$wb['btn_save_txt'] = 'Start instalacji';
$wb['btn_cancel_txt'] = 'Przerwij';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
index e50d34f34d051b9140bab7006c3cd7d16b98aef9..e1ffd2c3dfa61aea32bb6b9b3eaebf212924aa40 100644
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_package_list.lng
@@ -7,4 +7,6 @@ $wb['action_txt'] = 'Akcja';
$wb['toolsarea_head_txt'] = 'Pakiety';
$wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
$wb['package_id_txt'] = 'lokalny App-ID';
+$wb['no_packages_txt'] = 'Brak dostępnych pakietów';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
index d11a1b3b330d331c507e129f195f3f6ada2874f5..84d9c9e61b53a5388a246f9d92823f726e1d43ea 100644
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo.lng
@@ -5,3 +5,4 @@ $wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
$wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
$wb['active_txt'] = 'Aktywny';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
index 7ca6af9f9f43559891103a0c50ebd189da3f795b..85a54b06b46466dd170cc6579514f7638b191fb4 100644
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng
@@ -4,3 +4,4 @@ $wb['active_txt'] = 'Aktywny';
$wb['repo_name_txt'] = 'Repozytoria';
$wb['repo_url_txt'] = 'URL';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
index e38bdf8a317456ce5e84b4e8ff6f689094ae8161..31a3dd0131cc873b6e86e9ae1a0bbe96ba17a0d0 100644
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pl_software_update_list.lng
@@ -5,4 +5,6 @@ $wb['installed_txt'] = 'Akcja';
$wb['update_title_txt'] = 'Aktualizacja';
$wb['version_txt'] = 'Wersja';
$wb['action_txt'] = 'Akcja';
+$wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 50e5a40b620862ecfc4b72940da3b2ecf5028445..42da3d1357339272a2d2598a5975d413b0e9501c 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -1,5 +1,4 @@
+
diff --git a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
index eee3af5fe4e30c2f22bfa5742d902ce678cfa830..ed5fe515422f22c908fd97808d240be11e07c351 100644
--- a/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/pl_tpl_default_admin.lng
@@ -16,3 +16,4 @@ $wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
$wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
$wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index 7fcc601446254aa0151fc7771c127203fcb6fa2d..f645401a263c8b186ce58c457760fa8aa179425d 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -25,9 +25,10 @@ $wb['fax_txt'] = 'Fax';
$wb['groups_txt'] = 'Grupy';
$wb['default_group_txt'] = 'Domyślna grupa';
$wb['startmodule_err'] = 'Modułu startowego nie ma wśród modułów.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.';
?>
+
diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng
index b5bf954af1d7c802dc98834909f6f9a94b23ea24..16e1804a069949154e5a1bd88cae286b6d978b34 100644
--- a/interface/web/admin/lib/lang/pl_users_list.lng
+++ b/interface/web/admin/lib/lang/pl_users_list.lng
@@ -1,9 +1,10 @@
OSTRZEŻENIE: Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!';
-$wb['groups_txt'] = 'Groups';
+$wb['client_id_txt'] = 'User ID';
+$wb['active_txt'] = 'Aktywny';
+$wb['groups_txt'] = 'Grupy';
?>
+
diff --git a/interface/web/admin/lib/lang/pt_login_as.lng b/interface/web/admin/lib/lang/pt_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/pt_login_as.lng
+++ b/interface/web/admin/lib/lang/pt_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/pt_software_package_list.lng b/interface/web/admin/lib/lang/pt_software_package_list.lng
index b544e9eee11776446c384045c0d7ff85d0b27a04..80b0c2e2c0dff39bd55a5c4ce23babcc61997597 100644
--- a/interface/web/admin/lib/lang/pt_software_package_list.lng
+++ b/interface/web/admin/lib/lang/pt_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Acção';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/pt_software_update_list.lng b/interface/web/admin/lib/lang/pt_software_update_list.lng
index b29f08225291d9fa7d95ff658dd4290c15bd3229..12fd9e2fa9106e1b1e6087fe06fc4dc641b1f71e 100644
--- a/interface/web/admin/lib/lang/pt_software_update_list.lng
+++ b/interface/web/admin/lib/lang/pt_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Acções';
$wb['update_title_txt'] = 'Actualizar';
$wb['version_txt'] = 'Versão';
$wb['action_txt'] = 'Acção';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ro_login_as.lng b/interface/web/admin/lib/lang/ro_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/ro_login_as.lng
+++ b/interface/web/admin/lib/lang/ro_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/ro_software_package_list.lng b/interface/web/admin/lib/lang/ro_software_package_list.lng
index 151cf8a3e5221c7828c41d8a3208d8a9ae5174f4..1eca7d4232d6c653c0d78c071011bdd78a2ce3e0 100644
--- a/interface/web/admin/lib/lang/ro_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ro_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Actiune';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ro_software_update_list.lng b/interface/web/admin/lib/lang/ro_software_update_list.lng
index fc96ffa182e1f5fe86296ff3663a0360b01bbb4b..1e85d6de5f373ca10133099e354f59a3debe33f1 100644
--- a/interface/web/admin/lib/lang/ro_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ro_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Actiune';
$wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Versiune';
$wb['action_txt'] = 'Actiune';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/ru_login_as.lng b/interface/web/admin/lib/lang/ru_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/ru_login_as.lng
+++ b/interface/web/admin/lib/lang/ru_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng
index 2a453ee18753f15a95a5c74ad484c5a81a0a2f1e..41ebca92deeb3fbfd0eedc0e6599451acad30765 100644
--- a/interface/web/admin/lib/lang/ru_software_package_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Действие';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/ru_software_update_list.lng b/interface/web/admin/lib/lang/ru_software_update_list.lng
index b0af5ed9180a102b1b82b4e26d97085686790c68..556149d6f6e570b5c22b07c67ff6bcc6927875cf 100644
--- a/interface/web/admin/lib/lang/ru_software_update_list.lng
+++ b/interface/web/admin/lib/lang/ru_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Обновить';
$wb['version_txt'] = 'Версия';
$wb['action_txt'] = 'Действие';
$wb['server_select_txt'] = 'Выберите сервер';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/se_login_as.lng
+++ b/interface/web/admin/lib/lang/se_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng
index f7a60d721fee5d0bbabf8a077cba364206f22729..87b27fd50b16af5b4ffe42a716a33db748143e64 100644
--- a/interface/web/admin/lib/lang/se_software_package_list.lng
+++ b/interface/web/admin/lib/lang/se_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Action';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/se_software_update_list.lng b/interface/web/admin/lib/lang/se_software_update_list.lng
index ebf4e6fbc544390ef8ea9357a33d184062568e27..ce766efd731c7b261b56588d8ca73f8b50ee74d3 100644
--- a/interface/web/admin/lib/lang/se_software_update_list.lng
+++ b/interface/web/admin/lib/lang/se_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['update_title_txt'] = 'Update';
$wb['version_txt'] = 'Version';
$wb['action_txt'] = 'Action';
$wb['server_select_txt'] = 'Select server';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/sk_login_as.lng b/interface/web/admin/lib/lang/sk_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/sk_login_as.lng
+++ b/interface/web/admin/lib/lang/sk_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/sk_software_package_list.lng b/interface/web/admin/lib/lang/sk_software_package_list.lng
index 6e200b78fcf7d21efca402f175e05bcf6a7bf217..d6cf51120b4af144f0e589f6e5bb839429f4e277 100644
--- a/interface/web/admin/lib/lang/sk_software_package_list.lng
+++ b/interface/web/admin/lib/lang/sk_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Akcia';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/sk_software_update_list.lng b/interface/web/admin/lib/lang/sk_software_update_list.lng
index a671b467047c78a13ecb3703be694c9cb5e563b8..9a04707c3ed2dc48e79ece8016eab73babe8f86e 100644
--- a/interface/web/admin/lib/lang/sk_software_update_list.lng
+++ b/interface/web/admin/lib/lang/sk_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Akcia';
$wb['update_title_txt'] = 'Aktualizácia ';
$wb['version_txt'] = 'Verzia';
$wb['action_txt'] = 'Akcia';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/lib/lang/tr_login_as.lng b/interface/web/admin/lib/lang/tr_login_as.lng
index f905b45115ce496317ec18b4e0cede40b22ba8d8..c660ff1a4ba578c8c6201b3a0f0b01d4e3793db5 100644
--- a/interface/web/admin/lib/lang/tr_login_as.lng
+++ b/interface/web/admin/lib/lang/tr_login_as.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng
index 5caf6ef9366da39fdc1e0382ef0de8a78e2721e2..eb1812880550900b685a2d1b7972f2f1c71e6228 100644
--- a/interface/web/admin/lib/lang/tr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_package_list.lng
@@ -7,4 +7,5 @@ $wb['action_txt'] = 'Eylem';
$wb['toolsarea_head_txt'] = 'Packages';
$wb['repoupdate_txt'] = 'Update package list';
$wb['package_id_txt'] = 'local App-ID';
+$wb['no_packages_txt'] = 'No packages available';
?>
diff --git a/interface/web/admin/lib/lang/tr_software_update_list.lng b/interface/web/admin/lib/lang/tr_software_update_list.lng
index 3f77e54864675078da8813f6a48e99264f445b5c..88fea87b7ac993a504b5f3b5772b210e6b6ae9ca 100644
--- a/interface/web/admin/lib/lang/tr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_update_list.lng
@@ -5,4 +5,5 @@ $wb['installed_txt'] = 'Eylem';
$wb['update_title_txt'] = 'Güncelleme';
$wb['version_txt'] = 'Versiyon';
$wb['action_txt'] = 'Eylem';
+$wb['no_updates_txt'] = 'No updates available';
?>
diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php
index 2a24759554e0e2c7b2460a0c0d0f73dc49d1ae8a..0b7fd54aafe7c4c6252b35ec9841c8e0619eef27 100644
--- a/interface/web/admin/software_package_list.php
+++ b/interface/web/admin/software_package_list.php
@@ -146,7 +146,7 @@ $app->tpl->setInclude('content_tpl','templates/software_package_list.htm');
$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
$packages = $app->db->queryAllRecords('SELECT * FROM software_package');
-if(is_array($packages)) {
+if(is_array($packages) && count($packages) > 0) {
foreach($packages as $key => $p) {
$installed_txt = '';
foreach($servers as $s) {
@@ -169,9 +169,12 @@ if(is_array($packages)) {
}
}
}
- $packages[$key]['software_update_inst_id'] = $inst['software_update_inst_id'];
+ $packages[$key]['software_update_inst_id'] = intval($inst['software_update_inst_id']);
$packages[$key]['installed'] = $installed_txt;
}
+ $app->tpl->setVar('has_packages',1);
+} else {
+ $app->tpl->setVar('has_packages',0);
}
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 19873ff054e8950d81708aa1242ca3022f682b56..aed24471ee47b6aa3c553a1b9438ffe58f58082d 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -19,10 +19,10 @@
-