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 @@ -
+
-
+
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index 42f8ab10270d9f34e85581616b0b4aebf42b6c42..f6b989c9af8a5dbf3490183e2e170cee17354f02 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -18,14 +18,14 @@ - - + + {tmpl_var name='search_limit'} - - + + @@ -35,8 +35,8 @@ {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="name"} + {tmpl_var name="client_id"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index b455f7a4da08a9010c8dc8d325cc07bb52afc779..576ffbc642987ba858955029572dcb240796e47d 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -26,20 +26,22 @@ - - + + + {tmpl_var name="installed"} {tmpl_var name="package_title"} {tmpl_var name="package_description"} ispapp{tmpl_var name="package_id"} - {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} + - {tmpl_var name='globalsearch_noresults_text_txt'} + {tmpl_var name='no_packages_txt'} diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm index d85009665fce8e8c31e1ae64035f471cb6130153..1b49e9e6dd934e9e660c24ebe2c57f63a6ee1063 100644 --- a/interface/web/admin/templates/software_update_list.htm +++ b/interface/web/admin/templates/software_update_list.htm @@ -38,7 +38,7 @@ - {tmpl_var name='globalsearch_noresults_text_txt'} + {tmpl_var name='no_updates_txt'} diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index b687a51ec28eee8048a10a4b7dca8d97d1ede9f1..e60e3facbe500514a0e53ef33dee10e1d7fe0790 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -45,13 +45,13 @@ {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
-
+

{tmpl_var name='client_username_web_check_disabled_txt'}

{tmpl_var name='client_username_web_check_disabled'}
-
+

{tmpl_var name='reseller_can_use_options_txt'}

{tmpl_var name='reseller_can_use_options'} @@ -67,4 +67,4 @@
-
\ No newline at end of file +
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index 9732186e82d4508f85646e97c50f94d639e066c3..42aeea1587875784d9cfb4be19b930fedcff38fe 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng index b763383e009f7be03eb9662841c1c60ee8b3512e..2a637f7e3682b1f197ec5fe8c36ebee219781fd3 100644 --- a/interface/web/client/lib/lang/ar_client_template.lng +++ b/interface/web/client/lib/lang/ar_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 6d8f0e4d345a1f1a98ddbeeb5aef4ac8851180b3..91025a9ea8c50f57ffe3367281cdcaafbd7797fc 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 8e16a792bcd5fd1ea36221e1ec117bc048ba49c0..7d8a12a94c280114f8170e98a8e503e32b6a661a 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng index 9795df590c0317ba316a4ec581694d7319aadeae..f6ddea9d7d3ed3559a13518ecc01e19aca5826bb 100644 --- a/interface/web/client/lib/lang/bg_client_template.lng +++ b/interface/web/client/lib/lang/bg_client_template.lng @@ -84,4 +84,7 @@ $wb['force_suexec_txt'] = 'SuEXEC forced'; $wb['limit_hterror_txt'] = 'Custom error docs available'; $wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; $wb['limit_ssl_txt'] = 'SSL available'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index 3c8a6da648a62a84af9154676f46acc7d3732923..6f57b527f32d14dcd295655f32772b2ce684c6e6 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index f50fa77fff6de0564ad0d7beb3bec29d1f60097e..01b45f2dc9985d7436e9d2eb495d1c4a3b9c3a64 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index fd71c736259c30d1d2c81948add9a7f2f6e388b4..47a3cd34ea1a5655e6b89bc61b5c1c3fd7bc9f2d 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index fc055df06b2995753d9dba8afc91bcebbcee91eb..c565aec9896873e96c2f9ed21caa93b983d4f260 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng index 8efa987cfac80c8eabe601ffb11adabede36b865..9c1d91cc2010a9df662ca6da90746e2f23d4c8e0 100644 --- a/interface/web/client/lib/lang/cz.lng +++ b/interface/web/client/lib/lang/cz.lng @@ -23,3 +23,5 @@ $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v pou $wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu'; $wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka
'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 23570f0305a48c7dafb1d6ad69817b60f0d07f24..bb885e966d2017745a22d57af4de65456c0497e4 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -140,4 +140,9 @@ $wb['customer_no_error_unique'] = 'Zákaznické číslo musí být jedinečné ( $wb['paypal_email_error_isemail'] = 'Zadejte prosím platnou PayPal e-mail addresu.'; $wb['paypal_email_txt'] = 'PayPal e-mail'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng index f26e2d6d4b790622e0ba7809095d7063205bfe03..cb4b143b114e60231c13db1cf3d87a356df4f1fc 100644 --- a/interface/web/client/lib/lang/cz_client_circle.lng +++ b/interface/web/client/lib/lang/cz_client_circle.lng @@ -7,3 +7,5 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři'; $wb['description_txt'] = 'Popis'; $wb['active_txt'] = 'Aktivní'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng index e827605400f5165230b2a7fa5d9570ca13475cf3..24025510de0da4c0ceaab32d786f5f6cd745d297 100644 --- a/interface/web/client/lib/lang/cz_client_circle_list.lng +++ b/interface/web/client/lib/lang/cz_client_circle_list.lng @@ -8,3 +8,5 @@ $wb['filter_txt'] = 'Filtr'; $wb['delete_txt'] = 'Smazat'; $wb['active_txt'] = 'Aktivní'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng index 4515806be5d944c55947a9b0d91ea307f32cbf8b..a759ab6a94569eb0c497af259e4aec514c85e54c 100644 --- a/interface/web/client/lib/lang/cz_client_del.lng +++ b/interface/web/client/lib/lang/cz_client_del.lng @@ -4,3 +4,5 @@ $wb['delete_explanation'] = 'Tato akce smaže následující počet záznamů p $wb['btn_save_txt'] = 'Smazat klienta'; $wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng index d980d55012ca859cd2cfd6ac3fe32d891ce47077..f1c3870bca3595faf7e29e788e4eb23b92c6ea5d 100644 --- a/interface/web/client/lib/lang/cz_client_message.lng +++ b/interface/web/client/lib/lang/cz_client_message.lng @@ -16,3 +16,5 @@ $wb['all_clients_resellers_txt'] = 'Všichni klienti a distributoři (prodejci)' $wb['all_clients_txt'] = 'Všichni klienti'; $wb['variables_txt'] = 'Výběr (možnosti):'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 9b8e1a8b37c25354cdf7d39983456697d892456a..94ee886d72d7beeb563be4352ba97ffe916b33e7 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -84,4 +84,9 @@ $wb['database_limits_txt'] = 'Databázové limity'; $wb['cron_job_limits_txt'] = 'Cron pracovní limity'; $wb['dns_limits_txt'] = 'DNS limity'; $wb['virtualization_limits_txt'] = 'Virtualizace limity'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> + + diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng index c3faae17c7100b156f28dbea53c5f43fcb3409d2..7d9e9238d4865d4f0b51de4badc40c8621104f39 100644 --- a/interface/web/client/lib/lang/cz_client_template_list.lng +++ b/interface/web/client/lib/lang/cz_client_template_list.lng @@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Klientské šablony'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Název šablony'; ?> + + diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng index 9657cb71e892610822ea3a9ff9ec797d2c3381db..ffd1b8e82ad59040e3d1c5f8dcb67472c142c514 100644 --- a/interface/web/client/lib/lang/cz_clients_list.lng +++ b/interface/web/client/lib/lang/cz_clients_list.lng @@ -9,3 +9,5 @@ $wb['add_new_record_txt'] = 'Přidat klienta'; $wb['username_txt'] = 'Uživatelské jméno'; $wb['customer_no_txt'] = 'Zákaznické číslo'; ?> + + diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index 34ba70c11edbe7cac85311d43bbe0db6ec921b15..26117aef5ffb3841ebc4bede418151191ecbd7e4 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -4,3 +4,5 @@ $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Doména'; ?> + + diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng index 6cf7376bd41d7f67d34e59bdc981663a893eb6be..9b52d04ddd36d6e6c7d556349596ce03ce72323b 100644 --- a/interface/web/client/lib/lang/cz_domain_list.lng +++ b/interface/web/client/lib/lang/cz_domain_list.lng @@ -4,3 +4,5 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu'; $wb['domain_txt'] = 'Doména'; $wb['user_txt'] = 'Klient'; ?> + + diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index a9ebdf5f18943fe7390ecf0096c4d47e53c7d238..53f079edb0f27eeb560eed5415f4145f48096381 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -139,4 +139,9 @@ $wb['bank_code_txt'] = 'Kód banky'; $wb['bank_name_txt'] = 'Název banky'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> + + diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng index 8e72797b4df843d80f27ea6f7e8e583a24f08319..fb23672a888ebd36a6db688036b641895bf6cac9 100644 --- a/interface/web/client/lib/lang/cz_resellers_list.lng +++ b/interface/web/client/lib/lang/cz_resellers_list.lng @@ -9,3 +9,5 @@ $wb['add_new_record_txt'] = 'Přidat distributora'; $wb['customer_no_txt'] = 'Zákaznické číslo'; $wb['username_txt'] = 'Uživatelské jméno'; ?> + + diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 40d907a39ad933a05a243feff710f922798c10dc..8cf55223e70ee538f3e9a84a96426779e86cf53b 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -139,8 +139,8 @@ $wb['customer_no_error_unique'] = 'Die Kundennummer muß einzigartig sein (oder $wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.'; $wb['paypal_email_error_isemail'] = 'Bitte geben Sie eine gültige PayPal E-Mail Adresse an.'; $wb['paypal_email_txt'] = 'PayPal E-Mail'; -$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht \'Custon\' ausgewählt ist!'; +$wb['err_msg_master_tpl_set'] = 'Die hier eingestellten Werte werden ignoriert, wenn als Mastervorlage nicht -Custom- ausgewählt ist!'; $wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; -?> +?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 14cd58a0c4d36736a2bed8b91715fc73d076ac94..fa38a8e4ab1f75384117961bfb096b32dd6174ab 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -142,4 +142,4 @@ $wb['bank_account_swift_txt'] = 'BIC'; $wb['aps_limits_txt'] = 'APS Installationsassistent Limits'; $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen'; $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.'; -?> +?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 27d5531f489f6d2a9048fade25b45fc481e82b77..6fdb9cfe9d4919a5181ced0e20967ad05a3605a8 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index 721d93943bc39c865d32813f92177acd0a8f9618..8829657ebc5ead087c21fa1ff1fd88187146e94c 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index 246299979ec36f266b7f4ed2742bef0b05da330f..2438cdad832136541d77d1856ae0db9f21755a1e 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index 1bb597150cf20bcd7fa2b9cba3c081457eff4eae..751d8634f007352e4a5fed2dd5669143c0144347 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng index 36fb5dacf04facc109aeb54900eea7df125f3847..8dc5c023e2ff1b9bb1352be76f7dc59606ce1ebf 100644 --- a/interface/web/client/lib/lang/es_client_template.lng +++ b/interface/web/client/lib/lang/es_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index a82a73386e2a8667da6bac9b08917ddac576b4e3..6b809baf087823f62747c7134d50322212ea480b 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index b83d912d28a0a8a05b767b38cb44d4c550de5fe4..c0b38cfa1c3e0445b21ffb8c7aa0b9fad3995ece 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng index 5d02fee14d8424cf56a7cadf2e46a379379011bc..6e0ad30b2bbaf8518533aaa318848eb91e8ba623 100755 --- a/interface/web/client/lib/lang/fi_client_template.lng +++ b/interface/web/client/lib/lang/fi_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 35c2a679541a06604e90e3e47f6be295bd25b873..25023da75f250e0b1551f81bf8202373cd61f993 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index cb8ef3861aab726a150a678380ac0038f0543085..13e15eff13a8aacec6079fa813490d7d05fdb2ca 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index e6b7d655459e8d8c7754b98c40d3115185789d67..75d2d93f24a9f40182e6e7da26419b66c1373e26 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 5c9699befab3c9a983c66fc12623b989fb44ad31..7162656baf58326a000b7440fcae51a0d7d90ced 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 105715d81c44d157e0441a6d20f9945135934784..38126136e947cb618042138a151465c42a170386 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index ce54aa47c2bd99a04df26e490693960498f829c6..34dde990adda1bb21b87b93e41a8518fc72d91bd 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index d63005fcc2c80269de4c8b56f9549c37ea9e6f38..5674d6ac2921366bdf52584bceb2ae8cfe4f6823 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index f9834008cd79c96919dfd4677e5cfb2481cdd8c8..b393ee76d79156f21ef3a34026f6fb0db2986dfe 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng index 6286ccbd08fcdd8e2e514b7396caca855e6f5d90..716f0ab369989a6df9c2f9295b20d794b1a09ca3 100644 --- a/interface/web/client/lib/lang/hu_client_template.lng +++ b/interface/web/client/lib/lang/hu_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 47a08eb0bbf978a96f911431b32d595b9f4b20d3..9c450936532b232ae515ee13bc07f86fcc7a99bc 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 2b87ab26bcf6e9012ccf9911c6d92f7103b5fb51..549493f794b34a3a450ae9ec797f9ea4cd6fe42a 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng index 6d0996e4d3bbcc5eb70779c0d0e6349a21cbde80..2e6ccd5813e98c628ba9c8666c02da5a31362067 100644 --- a/interface/web/client/lib/lang/id_client_template.lng +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index b49f85aff38bf5e7117b07899dc0f2c273a01542..f558d514770ae73f70ec91ece961f63d77d1bdaa 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index aa7dee3bfcf82dce162d5cd263888654fbfb1a47..a2e6f3ec514d346303d981164c0dd7271c648323 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index d5a3445c6f572de7afef79ef43bcc0da6f3f5af3..f15615bed13193737ca53b72c4e5876fadb78e16 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 6d8f0e4d345a1f1a98ddbeeb5aef4ac8851180b3..91025a9ea8c50f57ffe3367281cdcaafbd7797fc 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index ab212ee35c586eb296153b23ecc7425e90a4c93b..e11629fba817786910af9b0286f144a523fce4fe 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng index f149534efbe83b7dcf33e36cfdbf00437809a903..823472a6b7a695fb0cb970405673605475ccd0a4 100644 --- a/interface/web/client/lib/lang/ja_client_template.lng +++ b/interface/web/client/lib/lang/ja_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 0d750b29c01bd0c14af66d22d4f8863edf797030..812dbf418bef426e31e1a791b640ff25c867fd97 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index f0ffa3f398d9d277015eb4cacc79a1072a694b26..a86a887370d367613b78d021913604ef126db203 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index 434220808b9fe264ffff635557a815b8225c5131..edd743381de7dfdaf0bb6c2c88c76059bc5b7ca9 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 96c8e62be32934a16ef50f0ec1d4f6e8b582a428..bf3eedcf5315ea3d2b9a200c35900ee5a5305bfc 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng index cb488467be09f899fca1c47ed891da296a8903a1..7ecf6400ffdec3761c72b3688fdad0aa9b6512da 100644 --- a/interface/web/client/lib/lang/pl.lng +++ b/interface/web/client/lib/lang/pl.lng @@ -10,16 +10,17 @@ $wb['Add Reseller'] = 'Dodaj Resellera'; $wb['Edit Reseller'] = 'Edytuj Resellera'; $wb['Resellers'] = 'Resellerzy'; $wb['error_has_clients'] = 'Reseller posiada klientów. Usuń ich zanim usuniesz resellera.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['Messaging'] = 'Messaging'; -$wb['Send email'] = 'Send Email'; -$wb['Edit Client Circle'] = 'Edit Client Circle'; -$wb['Domains'] = 'Domains'; -$wb['domain_txt'] = 'Domain'; -$wb['client_txt'] = 'Client'; -$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain'; -$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain'; -$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain'; -$wb['error_client_group_id_empty'] = 'You have to select a customer
'; +$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon'; +$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon'; +$wb['Messaging'] = 'Wiadomości dla klientów'; +$wb['Send email'] = 'Wyślij email'; +$wb['Edit Client Circle'] = 'Edytuj grupy klientów'; +$wb['Domains'] = 'Domeny'; +$wb['domain_txt'] = 'Domena'; +$wb['client_txt'] = 'Klient'; +$wb['error_domain_in mailuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla poczty email.'; +$wb['error_domain_in webuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla strony www.'; +$wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny'; +$wb['error_client_group_id_empty'] = 'Musisz wybrać klienta
'; ?> + diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 2d7aade174e877fe1bb7f9926654936f8612f1c1..8cda7bd5d4715ed741005d5e3952cfb94c2aa30a 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -29,20 +29,20 @@ $wb['mobile_txt'] = 'Komórka'; $wb['fax_txt'] = 'Fax'; $wb['email_txt'] = 'E-mail'; $wb['internet_txt'] = 'Strona www'; -$wb['icq_txt'] = 'ICQ'; +$wb['icq_txt'] = 'GG'; $wb['notes_txt'] = 'Notatki'; $wb['company_txt'] = 'Firma'; $wb['title_txt'] = 'Tytuł'; $wb['firstname_txt'] = 'Imię'; $wb['surname_txt'] = 'Nazwisko'; -$wb['limit_domain_txt'] = 'limit_domen'; -$wb['limit_subdomain_txt'] = 'limit_subdomen'; -$wb['limit_webquota_txt'] = 'limit_pojemnosci_www'; +$wb['limit_domain_txt'] = 'Limit domen'; +$wb['limit_subdomain_txt'] = 'Limit subdomen'; +$wb['limit_webquota_txt'] = 'Limit pojemności www'; $wb['limit_database_txt'] = 'Maksymalna ilość bazy danych'; $wb['limit_cron_txt'] = 'Maksymalna ilość zadań cron'; -$wb['limit_cron_type_txt'] = 'Maksymalny typ zadań cron (chroot i full implikuje url)'; -$wb['limit_cron_frequency_txt'] = 'Minimalny odstęp czasowy między uruchomieniem'; -$wb['ip_address_txt'] = 'adres_ip'; +$wb['limit_cron_type_txt'] = 'Dostępne typy zadań cron (chroot i full implikuje url)'; +$wb['limit_cron_frequency_txt'] = 'Odstęp czasowy między uruchomieniem'; +$wb['ip_address_txt'] = 'Adres IP'; $wb['limit_client_error_notint'] = 'Limit subklientów musi być liczbą.'; $wb['firstname_error_empty'] = 'Imię jest puste.'; $wb['contact_error_empty'] = 'Nazwa kontaktu jest pusta.'; @@ -98,46 +98,50 @@ $wb['limit_webdav_user_error_notint'] = 'Limit użytkowników webdav musi być l $wb['customer_no_txt'] = 'Klient nr'; $wb['vat_id_txt'] = 'NIP'; $wb['required_fields_txt'] = '* Wymagane pola'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['company_id_txt'] = 'Company/Entrepreneur ID'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; -$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; -$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; -$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; -$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['limit_mailmailinglist_txt'] = 'Maks. liczba list mailingowych'; +$wb['limit_mailmailinglist_error_notint'] = 'Limit list mailingowych musi być liczbą'; +$wb['company_id_txt'] = 'Regon'; +$wb['limit_openvz_vm_txt'] = 'Maks. liczba serwerów wirtualnych'; +$wb['limit_openvz_vm_template_id_txt'] = 'Wymuś szablon wirtualnych serwerów'; +$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą'; +$wb['web_php_options_notempty'] = 'Nie wybrano żadnej opcji PHP. Wybierz przynajmniej jedną.'; +$wb['ssh_chroot_notempty'] = 'Nie wybrano żadnej opcji SSH. Wybierz przynajmniej jedną.'; +$wb['username_error_collision'] = 'Nawza użytkownika nie może się zaczynać od słowa -web- lub -web- poprzedzonego numerem.'; +$wb['active_template_additional_txt'] = 'Aktywne dodatki'; +$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon'; +$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon'; +$wb['limit_cgi_txt'] = 'CGI dostępne'; +$wb['limit_ssi_txt'] = 'SSI dostępne'; +$wb['limit_perl_txt'] = 'Perl dostępny'; +$wb['limit_ruby_txt'] = 'Ruby dostępne'; +$wb['limit_python_txt'] = 'Python dostępny'; +$wb['force_suexec_txt'] = 'Wymuszone SuEXEC'; +$wb['limit_hterror_txt'] = 'Strony błędów użytkownika dostępne'; +$wb['limit_wildcard_txt'] = 'Dostępne domeny wildcard'; +$wb['limit_ssl_txt'] = 'SSL dostępne'; +$wb['bank_account_number_txt'] = 'Numer konta'; +$wb['bank_account_owner_txt'] = 'Właściciel konta'; +$wb['bank_code_txt'] = 'Kod Banku'; +$wb['bank_name_txt'] = 'Nazwa Banku'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; -$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['active_template_additional_txt'] = 'Active Addons'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; -$wb['paypal_email_txt'] = 'PayPal Email'; -$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['web_limits_txt'] = 'Limity WWW'; +$wb['email_limits_txt'] = 'Limity E-mail'; +$wb['database_limits_txt'] = 'Limity Baz Danych'; +$wb['cron_job_limits_txt'] = 'Limity Zadań Cron'; +$wb['dns_limits_txt'] = 'Limity DNS'; +$wb['virtualization_limits_txt'] = 'Limity Wirtualizacji'; +$wb['generate_password_txt'] = 'Generuj hasło'; +$wb['repeat_password_txt'] = 'Powtórz hasło'; +$wb['password_mismatch_txt'] = 'Hasła nie pasują'; +$wb['password_match_txt'] = 'Hasła pasują'; +$wb['email_error_isemail'] = 'Proszę wpisać prawidłowy adres e-mail'; +$wb['customer_no_error_unique'] = 'Numer klienta musi być unikalny (lub pusty)'; +$wb['paypal_email_error_isemail'] = 'Proszę wpisać prawidłowe konto e-mail PayPal'; +$wb['paypal_email_txt'] = 'Konto PayPal'; +$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than '; +$wb['aps_limits_txt'] = 'Limity Instalatora APS'; +$wb['limit_aps_txt'] = 'Maks. liczba instalacji APS'; +$wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą'; ?> + diff --git a/interface/web/client/lib/lang/pl_client_circle.lng b/interface/web/client/lib/lang/pl_client_circle.lng index f98a1447fc75bfe3b4968c02c51b20266d826505..061276809cc59e9b9da003831176b966c8fc6cb2 100644 --- a/interface/web/client/lib/lang/pl_client_circle.lng +++ b/interface/web/client/lib/lang/pl_client_circle.lng @@ -7,3 +7,4 @@ $wb['client_ids_txt'] = 'Clients/Resellers'; $wb['description_txt'] = 'Description'; $wb['active_txt'] = 'Active'; ?> + diff --git a/interface/web/client/lib/lang/pl_client_circle_list.lng b/interface/web/client/lib/lang/pl_client_circle_list.lng index 00fd0b3998912555116db17c2963578096503f45..b4244484c62552c15b963c98bcbfdab08fce3e42 100644 --- a/interface/web/client/lib/lang/pl_client_circle_list.lng +++ b/interface/web/client/lib/lang/pl_client_circle_list.lng @@ -8,3 +8,4 @@ $wb['filter_txt'] = 'Filter'; $wb['delete_txt'] = 'Delete'; $wb['active_txt'] = 'Active'; ?> + diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng index 666e12a24c4b9ab7fdd9bb55307ab138071bf818..aab69a43b3eb6154e6f390e9f7454fd80759afab 100644 --- a/interface/web/client/lib/lang/pl_client_del.lng +++ b/interface/web/client/lib/lang/pl_client_del.lng @@ -4,3 +4,4 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po $wb['btn_save_txt'] = 'Usuń klienta'; $wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta'; ?> + diff --git a/interface/web/client/lib/lang/pl_client_message.lng b/interface/web/client/lib/lang/pl_client_message.lng index 12f491ec1dcda660b7abb35004e8cc22828042e1..726f388cc6a39cde4f6ebca62d1ed9ca3188b7f6 100644 --- a/interface/web/client/lib/lang/pl_client_message.lng +++ b/interface/web/client/lib/lang/pl_client_message.lng @@ -1,18 +1,19 @@ + diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index a6f46a716fe38b33c142c44cc1bfd44c3d580cca..cd017fb8288790012c299725111d8a035afebce6 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -54,34 +54,38 @@ $wb['limit_cron_error_frequency'] = 'Limit częstości zadań corn musi być lic $wb['error_template_name_empty'] = 'Proszę wpisać nazwę szablonu'; $wb['limit_mailaliasdomain_txt'] = 'Maksymalna ilość aliasów domeny e-mail'; $wb['limit_mailaliasdomain_error_notint'] = 'Limit aliasów domeny e-mail musi być liczbą.'; -$wb['limit_web_quota_txt'] = 'Limit przestrzeni'; +$wb['limit_web_quota_txt'] = 'Limit przestrzeni web'; $wb['limit_traffic_quota_txt'] = 'Limit transferu'; $wb['limit_trafficquota_error_notint'] = 'Limit przestrzeni musi być liczbą.'; $wb['template_del_aborted_txt'] = 'Usuwanie przerwane. Istnieje klient używający ciągle tego szablonu.'; -$wb['limit_webdav_user_txt'] = 'Maksymalna ilość użytkowników webdav'; -$wb['limit_webdav_user_error_notint'] = 'Limit użytkowników webdav musi być liczbą.'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; -$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['limit_webdav_user_txt'] = 'Maksymalna ilość kont webdav'; +$wb['limit_webdav_user_error_notint'] = 'Limit kont webdav musi być liczbą.'; +$wb['limit_mailmailinglist_txt'] = 'Maks. liczba list mailingowych'; +$wb['limit_mailmailinglist_error_notint'] = 'Limit list mailingowych musi być liczbą'; +$wb['limit_openvz_vm_txt'] = 'Maks. liczba wirtualnych serwerów'; +$wb['limit_openvz_vm_template_id_txt'] = 'Wymuś szablon dla wirtualnych serwerów'; +$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą'; $wb['ssh_chroot_txt'] = 'Opcje SSH-Chroot'; $wb['web_php_options_txt'] = 'Opcje PHP'; $wb['template_type_txt'] = 'Rodzaj szablonu'; $wb['template_name_txt'] = 'Nazwa szablonu'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; -$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['limit_cgi_txt'] = 'CGI dostępne'; +$wb['limit_ssi_txt'] = 'SSI dostępne'; +$wb['limit_perl_txt'] = 'Perl dostępny'; +$wb['limit_ruby_txt'] = 'Ruby dostępne'; +$wb['limit_python_txt'] = 'Python dostępny'; +$wb['force_suexec_txt'] = 'Wymuszone SuEXEC'; +$wb['limit_hterror_txt'] = 'Dostępne własne strony błędów'; +$wb['limit_wildcard_txt'] = 'Dostępne subdomeny wildcard'; +$wb['limit_ssl_txt'] = 'SSL dostępne'; +$wb['web_limits_txt'] = 'Limity WWW'; +$wb['email_limits_txt'] = 'Limity E-mail'; +$wb['database_limits_txt'] = 'Limity Baz danych'; +$wb['cron_job_limits_txt'] = 'Limit zadań Cron'; +$wb['dns_limits_txt'] = 'Limit DNS'; +$wb['virtualization_limits_txt'] = 'Limit Wirtualizacji'; +$wb['aps_limits_txt'] = 'Limit Instalatora APS'; +$wb['limit_aps_txt'] = 'Maks. liczba instancji APS'; +$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą'; ?> + diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng index 06a39761f9af7d4a0191b4ed73b0b3a22b0d5541..76204419e60a73a209353a6a55615354da948b7b 100644 --- a/interface/web/client/lib/lang/pl_client_template_list.lng +++ b/interface/web/client/lib/lang/pl_client_template_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Szablon klienta'; $wb['template_type_txt'] = 'Typ'; $wb['template_name_txt'] = 'Nazwa szablonu'; ?> + diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index 026aecdfa42b754c64025665208f2a29f3b35a70..aa0767164133c12880675aa27333b248755ce72f 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -7,5 +7,6 @@ $wb['city_txt'] = 'Miasto'; $wb['country_txt'] = 'Kraj'; $wb['add_new_record_txt'] = 'Dodaj nowego klienta'; $wb['username_txt'] = 'Login'; -$wb['customer_no_txt'] = 'Customer No.'; +$wb['customer_no_txt'] = 'Nr klienta'; ?> + diff --git a/interface/web/client/lib/lang/pl_domain.lng b/interface/web/client/lib/lang/pl_domain.lng index 9f3e80ff6458666aa19d3888ceb68af2a0875cdf..9854e8904f51c67a1d7cfaf338df2f6520f6800e 100644 --- a/interface/web/client/lib/lang/pl_domain.lng +++ b/interface/web/client/lib/lang/pl_domain.lng @@ -4,3 +4,4 @@ $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje'; $wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna'; $wb['Domain'] = 'Domena'; ?> + diff --git a/interface/web/client/lib/lang/pl_domain_list.lng b/interface/web/client/lib/lang/pl_domain_list.lng index e2cac3b934284d15c7099223f8172b1a26b92c94..d31e7dfdccf0721489123519fe1de8c00e80d0de 100644 --- a/interface/web/client/lib/lang/pl_domain_list.lng +++ b/interface/web/client/lib/lang/pl_domain_list.lng @@ -4,3 +4,4 @@ $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['domain_txt'] = 'Domena'; $wb['user_txt'] = 'Client'; ?> + diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 3145e59fc1151c874f79023128e950101c43ba7a..8c2dd696f8b5e995db64ed25bed67f39574ce158 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -42,7 +42,7 @@ $wb['limit_database_txt'] = 'Maksymalna ilość bazy danych'; $wb['limit_cron_txt'] = 'Maksymalna ilość zadań crone'; $wb['limit_cron_type_txt'] = 'Maksymalna ilość typów zadań corne (zadania admina oraz sugerowane url)'; $wb['limit_cron_frequency_txt'] = 'Minimalne odstępy między zadaniami'; -$wb['ip_address_txt'] = 'adres_ip'; +$wb['ip_address_txt'] = 'Adres IP'; $wb['limit_client_error_notint'] = 'Ilość klientów musi być liczbą.'; $wb['firstname_error_empty'] = 'Imię jest puste.'; $wb['contact_error_empty'] = 'Nazwa kontaktu jest pusta.'; @@ -102,41 +102,45 @@ $wb['limit_mailmailinglist_txt'] = 'Maks. ilość list mailingowych'; $wb['limit_mailaliasdomain_txt'] = 'Maks. ilość aliasów domen e-mail'; $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; $wb['limit_openvz_vm_txt'] = 'Maks. ilość wirtualnych serwerów'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; -$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; -$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.'; +$wb['limit_openvz_vm_template_id_txt'] = 'Wymuś użycie szablonu wirtualnego serwera'; +$wb['limit_openvz_vm_error_notint'] = 'Limit wirtualnych serwerów musi być liczbą'; +$wb['web_php_options_notempty'] = 'Nie wybrano żadnej opcji PHP. Wybierz przynajmniej jedną.'; +$wb['ssh_chroot_notempty'] = 'Nie wybrano żadnej opcji SSH. Wybierz przynajmniej jedną.'; $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Delete additional template'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; -$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; -$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['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; -$wb['paypal_email_txt'] = 'PayPal Email'; -$wb['company_id_txt'] = 'Company/Entrepreneur ID'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['add_additional_template_txt'] = 'Dodaj dodatkowy szablon'; +$wb['delete_additional_template_txt'] = 'Usuń dodatkowy szablon'; +$wb['limit_cgi_txt'] = 'CGI dostępne'; +$wb['limit_ssi_txt'] = 'SSI dostępne'; +$wb['limit_perl_txt'] = 'Perl dostępne'; +$wb['limit_ruby_txt'] = 'Ruby dostępne'; +$wb['limit_python_txt'] = 'Python dostępne'; +$wb['force_suexec_txt'] = 'Wymuś SuEXEC'; +$wb['limit_hterror_txt'] = 'Własne strony błędów włączone'; +$wb['limit_wildcard_txt'] = 'Dostępne subdomeny wildcard'; +$wb['limit_ssl_txt'] = 'SSL dostępne'; +$wb['web_limits_txt'] = 'Limity WWW'; +$wb['email_limits_txt'] = 'Limity E-mail'; +$wb['database_limits_txt'] = 'Limity bazy danych'; +$wb['cron_job_limits_txt'] = 'Limity zadań Cron'; +$wb['dns_limits_txt'] = 'Limity DNS'; +$wb['virtualization_limits_txt'] = 'Limity Wirtualizacji'; +$wb['generate_password_txt'] = 'Wygeneruj hasło'; +$wb['repeat_password_txt'] = 'Powtórz hasło'; +$wb['password_mismatch_txt'] = 'Hasła nie pasują'; +$wb['password_match_txt'] = 'Hasła pasują do siebie'; +$wb['email_error_isemail'] = 'Podaj poprawny adres email'; +$wb['customer_no_error_unique'] = 'Numer klienta musi być unikalny (lub pusty)'; +$wb['paypal_email_error_isemail'] = 'Podaj poprawny email PayPal'; +$wb['paypal_email_txt'] = 'Konto PayPal'; +$wb['company_id_txt'] = 'Regon'; +$wb['bank_account_number_txt'] = 'Numer konta'; +$wb['bank_account_owner_txt'] = 'Właściciel konta'; +$wb['bank_code_txt'] = 'Kod Banku'; +$wb['bank_name_txt'] = 'Nazwa Banku'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'Limit instalacji APS'; +$wb['limit_aps_txt'] = 'Maks. liczba instancji APS'; +$wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą'; ?> + diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng index d26c35f9a9898477b2d9c4542b2db6fcbb2b867e..6b277bfdd39e27c2a93399e72261983d06701f1c 100644 --- a/interface/web/client/lib/lang/pl_resellers_list.lng +++ b/interface/web/client/lib/lang/pl_resellers_list.lng @@ -6,6 +6,7 @@ $wb['contact_name_txt'] = 'Nazwa kontaktu'; $wb['city_txt'] = 'Miasto'; $wb['country_txt'] = 'Państwo'; $wb['add_new_record_txt'] = 'Dodaj nowego resellera'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['username_txt'] = 'Username'; +$wb['customer_no_txt'] = 'Nr klienta'; +$wb['username_txt'] = 'Login'; ?> + diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 340a24300304a1096d7a83f93994dd56aff11962..5798a0051280600e5d2a280e5fbbee7c2a72035e 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng index 8230899a8a58dfe0b8505b09b0b63f7d4e58d2de..aa90ddc8b8f854377856a3cabeb5a434fb7893a1 100644 --- a/interface/web/client/lib/lang/pt_client_template.lng +++ b/interface/web/client/lib/lang/pt_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 87bd1434d199cc49fa470ceaca32e185aee95c16..7e466004de8583611f2794189e8b03afdfa420af 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index bbce82597ec203f123d2911739f30a1e75a2b1fb..5651460a1365d4a8b0cc86b6289279dc0e72b76c 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng index 429e61358c406c12fd685dbc4438abc2245ced88..22285a959810f62bdf223ddbd46b3473ce4fa41d 100644 --- a/interface/web/client/lib/lang/ro_client_template.lng +++ b/interface/web/client/lib/lang/ro_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 6d8f0e4d345a1f1a98ddbeeb5aef4ac8851180b3..91025a9ea8c50f57ffe3367281cdcaafbd7797fc 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 5893a19285844cefe37927d1cd7a987704ae1705..b927418b8101c6a4ecbd8d8b6beea573e85834ef 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng index 5949f884a4b2550b7a4e6521faf720f543900e6a..3738739111c07ab80727f5da379e0dedec99bfb0 100644 --- a/interface/web/client/lib/lang/ru_client_template.lng +++ b/interface/web/client/lib/lang/ru_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index f4fdada447763fa7758ad446ac26453771dc9852..3c24b30de45b3f0569ec3e9def93c1efdfd204fe 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 910caea924e662e3088fdbde64b76c7b09b8aee6..cbc9917b1f47a51b801414c95ca912284bd929bd 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng index e8c222732e5bfc46cea0158fed4830760f60099e..3e9915bec57ddb06c5b9b7b128ff7d9d07801a09 100644 --- a/interface/web/client/lib/lang/se_client_template.lng +++ b/interface/web/client/lib/lang/se_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 6d8f0e4d345a1f1a98ddbeeb5aef4ac8851180b3..91025a9ea8c50f57ffe3367281cdcaafbd7797fc 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 91afc026b7143c64807199a29cc8d83eea0a5c61..7dea61a9b5d8b4c4434a9624b32b4d01a71931be 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng index b7765a726aac3a85f54fc8a3c1536787a21e181b..463bb7019b77dbf8f0ed28ebc3aceecb88ae9ff5 100644 --- a/interface/web/client/lib/lang/sk_client_template.lng +++ b/interface/web/client/lib/lang/sk_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index 1ee0c4a6663bfee4587187a95bb851d81254f826..792c1313914bcd4ca3e0df733a65b70a25a0f929 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index 866a5f43a1b51a11568c2788af4ffd5b0882a076..13bb60e21a332bf38bcd482af49500d04ddc3d43 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -140,4 +140,7 @@ $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; $wb['paypal_email_txt'] = 'PayPal Email'; $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng index 0efac7979a5e68bb4eb6236c1b6f34fd8abff590..5a62ed87fd6d3dd81d658f09210e8f5cac12453a 100644 --- a/interface/web/client/lib/lang/tr_client_template.lng +++ b/interface/web/client/lib/lang/tr_client_template.lng @@ -84,4 +84,7 @@ $wb['database_limits_txt'] = 'Database Limits'; $wb['cron_job_limits_txt'] = 'Cron Job Limits'; $wb['dns_limits_txt'] = 'DNS Limits'; $wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index b6677703fc382f45bae4bca9ca9e4e7de34d10a7..ce687c509bc7e97e1271fb4bdf275e2cde2d9dd6 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -139,4 +139,7 @@ $wb['bank_code_txt'] = 'Bank code'; $wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; ?> diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index c17d778ba320a68cb37b684fdee723f9cbe301d3..3ad6c9d50b095029656b1de2072cf3c9f7dc9863 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -296,6 +296,7 @@ + \ No newline at end of file + + \ No newline at end of file diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng index 9d2a3211cb0d4cabaade52c01f42a146df72eafb..297b6397facd9c9c6d3e3fa6c5b595e818a8a28f 100644 --- a/interface/web/dashboard/lib/lang/cz.lng +++ b/interface/web/dashboard/lib/lang/cz.lng @@ -2,3 +2,5 @@ $wb['welcome_user_txt'] = 'Vítejte %s'; $wb['available_modules_txt'] = 'Dostupné moduly'; ?> + + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng index bedb98f865187d56e29fee51f20ed1ef3b7561d0..9810ba9808fc54c2bc002f28b52bcb753149e1e8 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng @@ -28,3 +28,5 @@ $wb['limit_client_txt'] = 'Počet klientů'; $wb['limit_database_txt'] = 'Počet databází'; $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí'; ?> + + diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng index 66275f1d0573489acd4a185f62b4fbfbecf3f2fd..a25ba21fc3ba9c5ec9144516bf135d40d99644be 100644 --- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng @@ -1,3 +1,5 @@ + + diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng index 5ef320a86ece666580ef419b0ac34c084e5c81f4..9a8b6694f16c70eb82108b8cf2e987b8ada36b39 100644 --- a/interface/web/dashboard/lib/lang/pl.lng +++ b/interface/web/dashboard/lib/lang/pl.lng @@ -2,3 +2,4 @@ $wb['welcome_user_txt'] = 'Witaj %s'; $wb['available_modules_txt'] = 'Dostępne moduły'; ?> + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng index d69a551bd072bc71bcf4ba4c5aa1fe4c53f5707a..b0c28ec7e20b346810f853424d6e84a6d8a36310 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng @@ -28,3 +28,4 @@ $wb['limit_client_txt'] = 'Liczba klientów'; $wb['limit_database_txt'] = 'Liczba baz danych'; $wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych'; ?> + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng index fafcc61480d5019acd02cbc99485e0ea14c2ff1f..e329a2517d7ec70e22a4c23a4ef88d5227646bc0 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/designer/lib/lang/cz.lng b/interface/web/designer/lib/lang/cz.lng index acb6c3546c6150b4edbafb782d3ed85c499210b5..dd815ad751cd365370e6ef7caec82948b35eba6d 100644 --- a/interface/web/designer/lib/lang/cz.lng +++ b/interface/web/designer/lib/lang/cz.lng @@ -1,2 +1,4 @@ + + diff --git a/interface/web/designer/lib/lang/cz_form_edit.lng b/interface/web/designer/lib/lang/cz_form_edit.lng index 75bf5a5606c2337c3297bca3417f7bed093b7fd5..2b04eb968d0a22ab9d143a8e11f53779f770bd7d 100644 --- a/interface/web/designer/lib/lang/cz_form_edit.lng +++ b/interface/web/designer/lib/lang/cz_form_edit.lng @@ -22,3 +22,5 @@ $wb['auth_preset_perm_user_txt'] = 'Opr. Uživatel'; $wb['auth_preset_perm_group_txt'] = 'Opr. Skupina'; $wb['auth_preset_perm_other_txt'] = 'Opr. Ostatní'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_form_list.lng b/interface/web/designer/lib/lang/cz_form_list.lng index 1e677f2410789f7f520c5efe3211abd97d8d3c0b..46241cfd5e641219b2c899509b9034166a7187fc 100644 --- a/interface/web/designer/lib/lang/cz_form_list.lng +++ b/interface/web/designer/lib/lang/cz_form_list.lng @@ -5,3 +5,5 @@ $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; $wb['description_txt'] = 'Popis'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_form_show.lng b/interface/web/designer/lib/lang/cz_form_show.lng index 381414bdf0848cdc1fd1984a29d308fb0733cd58..45829d54def7efb5ce158d5d0efe17c9ff416c31 100644 --- a/interface/web/designer/lib/lang/cz_form_show.lng +++ b/interface/web/designer/lib/lang/cz_form_show.lng @@ -16,3 +16,5 @@ $wb['module_del_txt'] = 'Delete the module and all subdirectories?'; $wb['menu_del_txt'] = 'Delete menu with all menuitems?'; $wb['item_del_txt'] = 'Delete menuitem?'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_module_edit.lng b/interface/web/designer/lib/lang/cz_module_edit.lng index 847896d302ec25756e1e58c4fad803084b16feb2..f6da04e2e7b8735594c324bc3d962a125d6991a6 100644 --- a/interface/web/designer/lib/lang/cz_module_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_edit.lng @@ -20,3 +20,5 @@ $wb['description_txt'] = ' Rada: Všechny cesty jsou relativně k adresáři web web. '; ?> + + diff --git a/interface/web/designer/lib/lang/cz_module_list.lng b/interface/web/designer/lib/lang/cz_module_list.lng index b568f69d63b2965e2371648651f39211f17a1de7..b37872cedc376f886678982854783efedab79ff1 100644 --- a/interface/web/designer/lib/lang/cz_module_list.lng +++ b/interface/web/designer/lib/lang/cz_module_list.lng @@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Backend modul'; $wb['module_txt'] = 'Modul'; $wb['title_txt'] = 'Titulek'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_module_nav_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_edit.lng index 01f5df68fb16558fb8b97f277125297884434937..8c21ea4a7d09fbb1127603a26cc4f7446dab3623 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_edit.lng @@ -4,3 +4,5 @@ $wb['header_txt'] = 'Navi vlastnosti'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng index 17e31319d7a7dbd750a52a6d5434bb7a8d3a7aca..65f6c765a65dce7acd836bd9a23ac8a2fa86aca8 100644 --- a/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/cz_module_nav_item_edit.lng @@ -6,3 +6,5 @@ $wb['header_txt'] = 'Navi properties'; $wb['save_txt'] = 'Uložit'; $wb['cancel_txt'] = 'Zrušit'; ?> + + diff --git a/interface/web/designer/lib/lang/cz_module_show.lng b/interface/web/designer/lib/lang/cz_module_show.lng index 95c2d85723cec55e4fc46f284511fa79530b9706..605d11de08594039db3432ac85f99be1d27e27fb 100644 --- a/interface/web/designer/lib/lang/cz_module_show.lng +++ b/interface/web/designer/lib/lang/cz_module_show.lng @@ -14,3 +14,5 @@ $wb['module_del_txt'] = 'Wollen Sie das Modul und alle im Modul angelegten Datei $wb['menu_del_txt'] = 'Wollen Sie das Menü mit allen Untereinträgen löschen?'; $wb['item_del_txt'] = 'Wollen Sie den Menüeintrag löschen?'; ?> + + diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng index acb6c3546c6150b4edbafb782d3ed85c499210b5..29f4a51efebb370aeb04c5144a604ca2c04e02be 100644 --- a/interface/web/designer/lib/lang/pl.lng +++ b/interface/web/designer/lib/lang/pl.lng @@ -1,2 +1,3 @@ + diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng index ee4f4c4100e9e738dc9b2f5c7f5594484ee56437..cff6b51b22cdca8068c9d34e929b02e686589354 100644 --- a/interface/web/designer/lib/lang/pl_form_edit.lng +++ b/interface/web/designer/lib/lang/pl_form_edit.lng @@ -22,3 +22,4 @@ $wb['auth_preset_perm_user_txt'] = 'Stały użytkownik'; $wb['auth_preset_perm_group_txt'] = 'Stała grupa'; $wb['auth_preset_perm_other_txt'] = 'Stała inna'; ?> + diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng index ac8572277cb0fbbd23843e783026585f5e1f2007..a0aacc35bd8a934c15afdf671e98178bbe755ef1 100644 --- a/interface/web/designer/lib/lang/pl_form_list.lng +++ b/interface/web/designer/lib/lang/pl_form_list.lng @@ -5,3 +5,4 @@ $wb['module_txt'] = 'Moduł'; $wb['title_txt'] = 'Tytuł'; $wb['description_txt'] = 'Opis'; ?> + diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng index db62af16b9cf666744f2013b0e99fb698e1f62d2..fbb82a426b46c51000c605f9c4004e39911ded00 100644 --- a/interface/web/designer/lib/lang/pl_form_show.lng +++ b/interface/web/designer/lib/lang/pl_form_show.lng @@ -16,3 +16,4 @@ $wb['module_del_txt'] = 'Usunąć moduł i wszystkie podkatalogi?'; $wb['menu_del_txt'] = 'Usunąć menu i wszystkie jego elementy?'; $wb['item_del_txt'] = 'Usunąc element menu?'; ?> + diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng index b87d04b1828c503410535d550a6b0cfb1d438000..d05cb9fadf4fe23b5b4794a4d39ced5be65311c1 100644 --- a/interface/web/designer/lib/lang/pl_module_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_edit.lng @@ -20,3 +20,4 @@ $wb['description_txt'] = ' Podpowiedź: Wszystkie ścieżki są względne według strony www.. '; ?> + diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng index 308d1c688bc14a1cf611cb4c876126a5c2e4a43c..2751633fa2955244842c832217b1f1d9f2f65261 100644 --- a/interface/web/designer/lib/lang/pl_module_list.lng +++ b/interface/web/designer/lib/lang/pl_module_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Nazwa modułu'; $wb['module_txt'] = 'Moduł'; $wb['title_txt'] = 'Tytuł'; ?> + diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng index fe8edabf660378d2cea342a83dfdf65cdbbe8692..54095f906d2cc0ab5b1446e8de67a940bdd2391c 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng @@ -4,3 +4,4 @@ $wb['header_txt'] = 'Parametry nawigacyjne'; $wb['save_txt'] = 'Zapisz'; $wb['cancel_txt'] = 'Usuń'; ?> + diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng index 779b3b4b3b418efa60072e2a7d9480b68a80606c..1e2fde46f0626e244417586e80ba4b9c4eaad8e8 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng @@ -6,3 +6,4 @@ $wb['header_txt'] = 'Parametry nawigacyjne'; $wb['save_txt'] = 'Zapisz'; $wb['cancel_txt'] = 'Usuń'; ?> + diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng index 9b98c4948239a2b8d5717ade5e90a2d8e2ca10ec..6daf82e396d9512b0efd9668dad541f4755bb35c 100644 --- a/interface/web/designer/lib/lang/pl_module_show.lng +++ b/interface/web/designer/lib/lang/pl_module_show.lng @@ -14,3 +14,4 @@ $wb['module_del_txt'] = 'Czy na pewno chcesz usunąć moduł wraz z wszystkimi p $wb['menu_del_txt'] = 'Czy na pewno chcesz usunąć menu z wszystkimi wpisami?'; $wb['item_del_txt'] = 'Czy na pewno chcesz usunąć wpis w menu?'; ?> + diff --git a/interface/web/dns/dns_mx_edit.php b/interface/web/dns/dns_mx_edit.php index d78ae720edeffbdb37d98bab4a57edad4267b8c3..73483f7ca3908cd28e6406c220426b0a44c760d4 100644 --- a/interface/web/dns/dns_mx_edit.php +++ b/interface/web/dns/dns_mx_edit.php @@ -108,6 +108,17 @@ class page_action extends tform_actions { parent::onSubmit(); } + function onInsert() { + global $app, $conf; + + // Check if record is existing already + $duplicate_mx = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ".$app->functions->intval($this->dataRecord["zone"])." AND name = '".$this->dataRecord["name"]."' AND type = '".$this->dataRecord["type"]."' AND data = '".$this->dataRecord["data"]."' AND ".$app->tform->getAuthSQL('r')); + + if(is_array($duplicate_mx) && !empty($duplicate_mx)) $app->error($app->tform->wordbook["duplicate_mx_record_txt"]); + + parent::onInsert(); + } + function onAfterInsert() { global $app, $conf; diff --git a/interface/web/dns/form/dns_a.tform.php b/interface/web/dns/form/dns_a.tform.php index bbd0d0107a6110cfb29098642e7ffc9b2a21eb14..d6e93ffb5bf3de523dab5aea1d322a2632d3ba28 100644 --- a/interface/web/dns/form/dns_a.tform.php +++ b/interface/web/dns/form/dns_a.tform.php @@ -86,7 +86,7 @@ $form["tabs"]['dns'] = array ( 'type' => 'TOLOWER') ), 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[\w\.\-\*]{0,64}$/', + 'regex' => '/^[\a-zA-Z0-9\.\-\*]{0,64}$/', 'errmsg'=> 'name_error_regex'), ), 'default' => '', diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng index f143b0b92266c5bca8bdd4b931f749cee4012c42..876a5751e295c4e553df618c71130b0380eef420 100644 --- a/interface/web/dns/lib/lang/cz.lng +++ b/interface/web/dns/lib/lang/cz.lng @@ -20,3 +20,5 @@ $wb['Templates'] = 'Šablony DNS'; $wb['Secondary Zones'] = 'Sekundární DNS zóny'; $wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng index 8b8c206b637752ecbc9b3c0be7107f66107de556..6d9a24d64c6380ac207025870ab9057d150f7b1d 100644 --- a/interface/web/dns/lib/lang/cz_dns_a.lng +++ b/interface/web/dns/lib/lang/cz_dns_a.lng @@ -14,3 +14,5 @@ $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; $wb['data_error_duplicate'] = 'Duplikace A záznamu'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng index 249808688f08043d83ab3124f11f6fca9bc7bf1f..9f16d3c36c8102759955e8daa59d57eca7333e90 100644 --- a/interface/web/dns/lib/lang/cz_dns_a_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng @@ -11,5 +11,7 @@ $wb['type_txt'] = 'Typ'; $wb['add_new_record_txt'] = 'Přidat DNS A záznam'; $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; -$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam?'; +$wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam ?'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng index 26c6ae90640b8ce342ecb74a2107866a700b80da..143885f969b75638200b997a28bed1c72e87aef0 100644 --- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'IP adresa je prázdná'; $wb['data_error_regex'] = 'IP adresa má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng index 572478a98b286753a551afcd6f1123516aaa1878..c25dc7b3ebd51c3d7050bcd784d63d8b78c224d7 100644 --- a/interface/web/dns/lib/lang/cz_dns_alias.lng +++ b/interface/web/dns/lib/lang/cz_dns_alias.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Cílový Hostname je prázdný'; $wb['data_error_regex'] = 'Cílový Hostname má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng index 0c5ebe21e151b5291efe353defc05cd2eb05add5..29587c8b154e3468a147596175be38566b74b442 100644 --- a/interface/web/dns/lib/lang/cz_dns_cname.lng +++ b/interface/web/dns/lib/lang/cz_dns_cname.lng @@ -12,5 +12,7 @@ $wb['name_error_empty'] = 'Hostname je prázdný.'; $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Cílový hostname je prázdný'; $wb['data_error_regex'] = 'Cílový hostname má chybný formát'; -$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record'; +$wb['data_error_duplicate'] = 'Duplikace A záznamu nebo CNAME-záznamu'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng index 5f67d5e826cc5eef8c92eae607834a856721786f..3633fdb80be22de243ba95843a550a2f8678afd0 100644 --- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Informace o hostovi je prázdná'; $wb['data_error_regex'] = 'Informace o hostovi má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng index 4020f8a9766212f0aa0e24a2f6e8643de132f241..9734b3e94751ec8fe7cca0503ab0b1a2d9d42df9 100644 --- a/interface/web/dns/lib/lang/cz_dns_import.lng +++ b/interface/web/dns/lib/lang/cz_dns_import.lng @@ -4,7 +4,7 @@ $wb['client_txt'] = 'Klient'; $wb['btn_save_txt'] = 'Importovat vybraný DNS zonový soubor'; $wb['btn_cancel_txt'] = 'Zrušit'; $wb['domain_txt'] = 'Doména'; -$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!'; +$wb['zone_file_successfully_imported_txt'] = 'Zónový soubor byl úspěšně importován !'; $wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!'; $wb['zonefile_to_import_txt'] = 'Vybrat soubor s DNS zónou '; $wb['domain_field_desc_txt'] = 'Může být ponechána nevyplněná, pokud je název domény názvem souboru nebo je v obsahu souboru s DNS zónou.'; @@ -12,3 +12,5 @@ $wb['title'] = 'Importovat soubory zón'; $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor'; $wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng index 9bb5ce280e8416bed3356d052ef05ddbd57137d3..e0e475bf14a68e70d622eeb2a124068f92ced215 100644 --- a/interface/web/dns/lib/lang/cz_dns_mx.lng +++ b/interface/web/dns/lib/lang/cz_dns_mx.lng @@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Server'; $wb['zone_txt'] = 'Zóna'; $wb['name_txt'] = 'Hostname'; $wb['type_txt'] = 'Typ'; -$wb['data_txt'] = 'Hostname mailserveru'; +$wb['data_txt'] = 'Hostname e-mailového serveru'; $wb['aux_txt'] = 'Priorita'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Aktivní'; @@ -11,6 +11,8 @@ $wb['limit_dns_record_txt'] = 'Dosažen maximální počet DNS záznamů pro Vá $wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny.'; $wb['name_error_empty'] = 'Hostname je prázdný.'; $wb['name_error_regex'] = 'Hostname má chybný formát.'; -$wb['data_error_empty'] = 'Hostname mailserveru je prázdný'; -$wb['data_error_regex'] = 'Hostname mailserveru má chybný formát'; +$wb['data_error_empty'] = 'Hostname e-mailového serveru je prázdný'; +$wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng index ba38e2a65e02170a41d48ac5be7c00381dfeec5b..4b011849f892b74a14eef566ef44be2b89561357 100644 --- a/interface/web/dns/lib/lang/cz_dns_ns.lng +++ b/interface/web/dns/lib/lang/cz_dns_ns.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Zóna má chybný formát.'; $wb['data_error_empty'] = 'Jmenný server je prázdný'; $wb['data_error_regex'] = 'Jmenný server má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng index 9617ea58529a1a339700588144c5e6057dfc6471..33f116631e0c8b6028536ebc3755d9a286dc1f94 100644 --- a/interface/web/dns/lib/lang/cz_dns_ptr.lng +++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Název má chybný formát.'; $wb['data_error_empty'] = 'Kanonický hostname je prázdný'; $wb['data_error_regex'] = 'Kanonického hostname má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng index 8b1e7e442ebe0e4a71b700f074d043d66dd13b20..bcebed3ef327bfd0b627c0bf286cdc59f3053c47 100644 --- a/interface/web/dns/lib/lang/cz_dns_rp.lng +++ b/interface/web/dns/lib/lang/cz_dns_rp.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Odpovědná osoba je prázdná'; $wb['data_error_regex'] = 'Odpovědná osoba má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng index 16617f6c595322dbc5e6479bfd5b47bbe24d6897..b8cc5f139fe5cbdcfa1799015560e6d12e3cb344 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave.lng @@ -15,3 +15,5 @@ $wb['eg_domain_tld'] = 'např. domena.cz'; $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4'; $wb['secondary_zone_txt'] = 'Sekundární DNS zóna'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng index 1e0a3d0106fd0c3a654292e116a0a3b120382751..eead22a8b7886b36519de41106e3ed44ab81a625 100644 --- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng @@ -7,3 +7,5 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu'; $wb['eg_domain_tld'] = 'např. domena.cz'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng index f770f8257ca884d3ae488a29eb17869834a0e639..8bc1eb8c536bda4586128ee97723e1a6fd151889 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa.lng @@ -29,10 +29,12 @@ $wb['eg_domain_tld'] = 'např. domena.cz'; $wb['eg_ns1_domain_tld'] = 'např. ns1.domena.cz'; $wb['eg_webmaster_domain_tld'] = 'např. webmaster@domena.cz'; $wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Doménu není možné měnit. Prosím, kontaktujte svého správce, pokud chcete změnit název domény.'; -$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.'; -$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; -$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.'; -$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.'; -$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.'; -$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['refresh_range_error'] = 'Min. čas obnovení je 60 sekund.'; +$wb['retry_range_error'] = 'Min. čas nového opakování je 60 sekund.'; +$wb['expire_range_error'] = 'Min. expirační doba je 60 sekund.'; +$wb['minimum_range_error'] = 'Minimální doba je 60 sekund.'; +$wb['ttl_range_error'] = 'Min. TTL čas je 60 sekund.'; +$wb['xfer_error_regex'] = 'Také oznámí: Prosím, použijte IP adresu.'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng index beba8a22b24da0f51ae36fbfc7d9a98a1e8b63d6..999e5bd68d96fafe9f22bacd83b31514505c5fee 100644 --- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng @@ -8,3 +8,5 @@ $wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)'; $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng index 6b6708fc010b637889a28a595d2210b0ba9e3aa9..60d844ac9b707d5c1c90eb3d9bf78bdd9d9494d3 100644 --- a/interface/web/dns/lib/lang/cz_dns_srv.lng +++ b/interface/web/dns/lib/lang/cz_dns_srv.lng @@ -17,3 +17,5 @@ $wb['data_error_regex'] = 'Záznam serveru má chybný formát'; $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru musí­ obsahovat 3 textové řetězce oddělené mezerami.'; $wb['aux_txt'] = 'Priority'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng index be4ac0e9491d74bd68c6a744791e4efa4bb47c04..b91b3ae257418df4b24b550f49c12ee9eb4dde51 100644 --- a/interface/web/dns/lib/lang/cz_dns_template.lng +++ b/interface/web/dns/lib/lang/cz_dns_template.lng @@ -4,3 +4,5 @@ $wb['fields_txt'] = 'Pole'; $wb['template_txt'] = 'Šablona'; $wb['visible_txt'] = 'Viditelný'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng index bdd6e182041668c593f2d0ae5861819babc42a02..a7218a497658d3c9e063ae57438f443e14d37111 100644 --- a/interface/web/dns/lib/lang/cz_dns_template_list.lng +++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng @@ -4,3 +4,5 @@ $wb['visible_txt'] = 'Viditelný'; $wb['name_txt'] = 'Název'; $wb['add_new_record_txt'] = 'Přidat záznam'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng index 76047b0cebcff637301959197c37e902bf140024..8784c7e2b4864ec231cedece16d2017df503b0c3 100644 --- a/interface/web/dns/lib/lang/cz_dns_txt.lng +++ b/interface/web/dns/lib/lang/cz_dns_txt.lng @@ -13,3 +13,5 @@ $wb['name_error_regex'] = 'Hostname má chybný formát.'; $wb['data_error_empty'] = 'Text je prázdný'; $wb['data_error_regex'] = 'Text má chybný formát'; ?> + + diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng index 8d68e6167d669e5b3ee0d77b69cebebbcf871c13..2c54eaf228d358cdfcfcb2f1beacf8d65305f3e4 100644 --- a/interface/web/dns/lib/lang/cz_dns_wizard.lng +++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng @@ -9,7 +9,7 @@ $wb['email_txt'] = 'E-mail'; $wb['ns1_txt'] = 'NS 1'; $wb['ns2_txt'] = 'NS 2'; $wb['ip_txt'] = 'IP adresa'; -$wb['error_origin_empty'] = 'Origin je prázdný.'; +$wb['error_origin_empty'] = 'Zdroj je prázdný.'; $wb['error_ns_empty'] = 'NS je prázdný.'; $wb['error_mbox_empty'] = 'Mbox je prázdný.'; $wb['error_refresh_empty'] = 'Refresh je prázdný.'; @@ -36,3 +36,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; $wb['list_head_txt'] = 'Průvodce vytvořením DNS zóny'; $wb['list_desc_txt'] = 'Vytvoření DNS zóny pomocí průvodce'; ?> + + diff --git a/interface/web/dns/lib/lang/de_dns_mx.lng b/interface/web/dns/lib/lang/de_dns_mx.lng index 2968a1322b08b92fb8347da44aa7c9ed57a8261e..f229c2cc6e3b8480ffc565e027a3ddbd70341ed0 100644 --- a/interface/web/dns/lib/lang/de_dns_mx.lng +++ b/interface/web/dns/lib/lang/de_dns_mx.lng @@ -13,4 +13,5 @@ $wb['name_error_empty'] = 'Der Hostname ist leer.'; $wb['name_error_regex'] = 'Der Hostname hat das falsche Format.'; $wb['data_error_empty'] = 'Mailserver Hostname ist leer'; $wb['data_error_regex'] = 'Mailserver Hostname Format ist ungültig'; +$wb["duplicate_mx_record_txt"] = 'Doppelter MX-Eintrag.'; ?> diff --git a/interface/web/dns/lib/lang/en_dns_mx.lng b/interface/web/dns/lib/lang/en_dns_mx.lng index d0bee5eba35ea8ad8d90153ee0552d647ebeee43..d61f592ec2c977884449b15b5d1f5a0a574f27ef 100644 --- a/interface/web/dns/lib/lang/en_dns_mx.lng +++ b/interface/web/dns/lib/lang/en_dns_mx.lng @@ -13,4 +13,5 @@ $wb["name_error_empty"] = 'The hostname is empty.'; $wb["name_error_regex"] = 'The hostname has the wrong format.'; $wb["data_error_empty"] = 'Mailserver hostname empty'; $wb["data_error_regex"] = 'Mailserver hostname format invalid'; +$wb["duplicate_mx_record_txt"] = 'Duplicate MX record.'; ?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng index 271572d2a75c2bc4b485a3cfb6b70620f6993151..65e3f92b09274f52760f7d2a44954a2af611b3ae 100644 --- a/interface/web/dns/lib/lang/en_dns_soa.lng +++ b/interface/web/dns/lib/lang/en_dns_soa.lng @@ -23,7 +23,7 @@ $wb["mbox_error_empty"] = 'Email is empty.'; $wb["mbox_error_regex"] = 'Email format invalid.'; $wb["also_notify_txt"] = 'Also Notify'; $wb['also_notify_error_regex'] = 'Also notify: Please use an IP address.'; -$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['xfer_error_regex'] = 'Xfer: Please use an IP address.'; $wb["update_acl_txt"] = 'Update ACL'; $wb['seconds_txt'] = 'Seconds'; $wb['eg_domain_tld'] = 'e.g. domain.tld'; diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng index 29a4a9b4b92402818f2f74443947e95b00c248ec..6fca5921ab1956f9844de8f8d505759e67aeac65 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -17,6 +17,7 @@ $wb['DNS TXT'] = 'DNS TXT'; $wb['DNS Wizard'] = 'Kreator DNS'; $wb['Add DNS Zone'] = 'Dodaj strefę DNS'; $wb['Templates'] = 'Szablony'; -$wb['Secondary Zones'] = 'Secondary Zones'; -$wb['Import Zone File'] = 'Import Zone File'; +$wb['Secondary Zones'] = 'Strefy Zapasowe'; +$wb['Import Zone File'] = 'Import pliku Strefy'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng index f9b09977319e1392ec3c81fd950c8003c0ab11bd..3aa2d6855ed57eac706289348f245db2f96fd5b3 100644 --- a/interface/web/dns/lib/lang/pl_dns_a.lng +++ b/interface/web/dns/lib/lang/pl_dns_a.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Adres IP jest pusty.'; $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.'; $wb['data_error_duplicate'] = 'Duplikat wpisu A.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng index 89fac7f967b5edee042ead67e22a4e227b55a20b..2fe8fbd6c73f26cf97b87da0e1f46ba147d10320 100644 --- a/interface/web/dns/lib/lang/pl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng @@ -6,10 +6,11 @@ $wb['zone_txt'] = 'Strefa'; $wb['name_txt'] = 'Nazwa'; $wb['data_txt'] = 'Data'; $wb['aux_txt'] = 'Priorytet'; -$wb['ttl_txt'] = 'TTL'; $wb['type_txt'] = 'Typ'; $wb['add_new_record_txt'] = 'Dodaj nowy rekord A DNS'; $wb['page_txt'] = 'Strona'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Czy jesteś pewny, że chcesz usunąć ten wpis?'; +$wb['ttl_txt'] = 'TTL'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng index f8e44e58f30b1e03febb2c0ed09f53973370db25..8c90e3fe5fb257f30723e04bd81abda2acf4e0de 100644 --- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.'; $wb['data_error_empty'] = 'Adres IP jest pusty.'; $wb['data_error_regex'] = 'Adres IP ma niepoprawny format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng index a950805e3b4378caa7b4d4162242f4580ace4909..44c377e38f9910aa11793a18f753d2c1f46d4873 100644 --- a/interface/web/dns/lib/lang/pl_dns_alias.lng +++ b/interface/web/dns/lib/lang/pl_dns_alias.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng index c007ea6f4c1ae0df2d432a6777b232079581677c..5fbe69356680c2fa439d633aab19fdfc4b449fde 100644 --- a/interface/web/dns/lib/lang/pl_dns_cname.lng +++ b/interface/web/dns/lib/lang/pl_dns_cname.lng @@ -14,3 +14,4 @@ $wb['data_error_empty'] = 'Docelowa nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Docelowa nazwa serwera ma niepoprawny format.'; $wb['data_error_duplicate'] = 'Zdublowany rekord A lub CNAME.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng index d408e14328ce0c90e7b588b9a45d333be99d4c57..18f3b9f4f6c247ca249ce5c3db9251c0ec047866 100644 --- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma niepoprawny format.'; $wb['data_error_empty'] = 'Informacje o serwerze są puste.'; $wb['data_error_regex'] = 'Informacje o serwerze mają niepoprawny format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng index 2d1fe083ea4f8faf5627223d2e50f3e8df38fa21..b6941851c0a2bbfd3bc9c2565687ff091c0a8137 100644 --- a/interface/web/dns/lib/lang/pl_dns_import.lng +++ b/interface/web/dns/lib/lang/pl_dns_import.lng @@ -1,14 +1,15 @@ + diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng index 4a3936a1b4a03a728d9d5fa2a37ad49cea18ba80..d244013dec926fd4eb1ceb3ae2403b1f4d94095a 100644 --- a/interface/web/dns/lib/lang/pl_dns_mx.lng +++ b/interface/web/dns/lib/lang/pl_dns_mx.lng @@ -14,3 +14,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Nazwa serwera poczty e-mail jest pusta.'; $wb['data_error_regex'] = 'Nazwa serwera poczty e-mail ma niepoprawny format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng index 18d7efd6cd3d6310b129234e6e2152d24b540602..d82dc4887f8680feed9a19a35b1f18b8db2ba0bd 100644 --- a/interface/web/dns/lib/lang/pl_dns_ns.lng +++ b/interface/web/dns/lib/lang/pl_dns_ns.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Strefa ma zły format.'; $wb['data_error_empty'] = 'Nazwa serwera jest pusta.'; $wb['data_error_regex'] = 'Nazwa serwera ma zły format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng index eae39817a0b36242ea5805da88414b963054eb7d..eeb03d6524ba0bc13b5642c06d52375b915f80f9 100644 --- a/interface/web/dns/lib/lang/pl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa ma zły format.'; $wb['data_error_empty'] = 'Standardowa nazwa serwera jest pusta'; $wb['data_error_regex'] = 'Standardowa nazwa serwera ma zły format'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng index 43cbc51225df11cf2bf59a45216ad7ba429eff6c..587c7353a7bec8fb4b3e9e71687e677413107f91 100644 --- a/interface/web/dns/lib/lang/pl_dns_rp.lng +++ b/interface/web/dns/lib/lang/pl_dns_rp.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Musisz podać osobę odpowiedzialna.'; $wb['data_error_regex'] = 'Nazwa osoby odpowiedzialnej ma niepoprawny format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng index b0c0265af2d62f069eb63d346b76c91bfc48df4a..115dfc6215dc9587a210ec5a6b497728e95f33ef 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave.lng @@ -11,7 +11,8 @@ $wb['origin_error_empty'] = 'Strefa jest pusta'; $wb['origin_error_unique'] = 'Jest już rekord w tej strefie.'; $wb['origin_error_regex'] = 'Strefa ma niepoprawny format.'; $wb['ns_error_regex'] = 'NS ma niepoprawny format.'; -$wb['eg_domain_tld'] = 'e.g. domain.tld.'; -$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4'; -$wb['secondary_zone_txt'] = 'Secondary DNS Zone'; +$wb['eg_domain_tld'] = 'np. domena.pl.'; +$wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1'; +$wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng index bbdb368f1d4590b1becc36c1174e39652d4144ad..010d78f36ebf10544c4e63738e37be5d3ba345bf 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng @@ -7,3 +7,4 @@ $wb['ns_txt'] = 'NS'; $wb['add_new_record_txt'] = 'Dodaj nową zapasową strefę DNS'; $wb['eg_domain_tld'] = 'np. domena.pl.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng index ea63910f6b0c26e75e5498fb5e3eb24f05dafdb1..c30b17be58d68394a3c5ac8b30211d46811395de 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa.lng @@ -27,12 +27,13 @@ $wb['update_acl_txt'] = 'Zaktualizuj ACL'; $wb['seconds_txt'] = 'Sekund'; $wb['eg_domain_tld'] = 'np. domena.pl'; $wb['eg_ns1_domain_tld'] = 'np. ns1.domena.pl'; -$wb['eg_webmaster_domain_tld'] = 'np. webmaster@domena.pl'; -$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'; -$wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.'; -$wb['retry_range_error'] = 'Min. Retry time is 60 seconds.'; -$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.'; -$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.'; -$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.'; -$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.'; +$wb['eg_webmaster_domain_tld'] = 'np. webmaster.domena.pl'; +$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Domena nie może być zmieniona. Prześlij prośbę o zmianę do Administratora.'; +$wb['xfer_error_regex'] = 'Także powiadom: Proszę użyć adresu IP'; +$wb['refresh_range_error'] = 'Min. czas odświeżania wynosi 60 sekund'; +$wb['retry_range_error'] = 'Min. czas powtórzenia wynosi 60 sekund'; +$wb['expire_range_error'] = 'Min. czas przedawnienia wynosi 60 sekund'; +$wb['minimum_range_error'] = 'Min. czas minimalny wynosi 60 sekund'; +$wb['ttl_range_error'] = 'Min. czas TTL wynosi 60 sekund'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng index d440e05469af6c0fe2831c2da79e465212af6616..0b17c903f11baca4ecfde4d320d9af93a433fa71 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng @@ -8,3 +8,4 @@ $wb['mbox_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nową strefę DNS (SOA)'; $wb['add_new_record_wizard_txt'] = 'Dodaj nową strefę DNS za pomocą Kreatora'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng index 9d6127d3299d2b61f766ac2e23cfb0af83f761e6..228df530f38afa6e660d52d1ee5c9773c1114015 100644 --- a/interface/web/dns/lib/lang/pl_dns_srv.lng +++ b/interface/web/dns/lib/lang/pl_dns_srv.lng @@ -3,9 +3,6 @@ $wb['server_id_txt'] = 'Serwer'; $wb['zone_txt'] = 'Strefa'; $wb['name_txt'] = 'Nazwa serwera'; $wb['type_txt'] = 'typ'; -$wb['target_txt'] = 'Target'; -$wb['weight_txt'] = 'Weight'; -$wb['port_txt'] = 'Port'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Aktywny'; $wb['limit_dns_record_txt'] = 'Maksymalna ilość wpisów DNS dla Twojego konta została przekroczona.'; @@ -16,4 +13,8 @@ $wb['data_error_empty'] = 'Wpis serwera jest pusty'; $wb['data_error_regex'] = 'Wpis serwera ma niepoprawny format'; $wb['srv_error_regex'] = 'Niepoprawny format rekordu serwera. Rekord serwera musi zawierać 3 łańcuchy znakowe oddzielone spacjami.'; $wb['aux_txt'] = 'Priorytet'; +$wb['target_txt'] = 'Cel'; +$wb['weight_txt'] = 'Waga'; +$wb['port_txt'] = 'Port'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng index f3e756357728ab5538d7c01600bc25c23439c1bc..fc7a0d6f92e15d74ffaff6fbcedf2e734f5eaf74 100644 --- a/interface/web/dns/lib/lang/pl_dns_template.lng +++ b/interface/web/dns/lib/lang/pl_dns_template.lng @@ -4,3 +4,4 @@ $wb['fields_txt'] = 'Pola'; $wb['template_txt'] = 'Szablon'; $wb['visible_txt'] = 'Widoczność'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng index 7deac3b2fa01cc7f62d7b9865abe0b969912a5d0..a74e0c52f47999829fb8b0b7fc8f2eed9a4ac101 100644 --- a/interface/web/dns/lib/lang/pl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng @@ -4,3 +4,4 @@ $wb['visible_txt'] = 'Widoczność'; $wb['name_txt'] = 'Nazwa'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng index f84620ed3ab8a052fe7983763a55e3c64aa017ac..324bf06aa166b95c71b0eaaa6aa49ec9c56e19a6 100644 --- a/interface/web/dns/lib/lang/pl_dns_txt.lng +++ b/interface/web/dns/lib/lang/pl_dns_txt.lng @@ -13,3 +13,4 @@ $wb['name_error_regex'] = 'Nazwa serwera ma zły format.'; $wb['data_error_empty'] = 'Tekst jest pusty.'; $wb['data_error_regex'] = 'Tekst ma zły format.'; ?> + diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng index 1323c43afaec18963b193624a8b2f7ce8ed5956d..8bf1cfa254f1c3f44e45e90e4cc76811372bda48 100644 --- a/interface/web/dns/lib/lang/pl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng @@ -26,13 +26,14 @@ $wb['error_domain_regex'] = 'Domena zawiera niepoprawne znaki.'; $wb['error_ns1_regex'] = 'NS1 zawiera niepoprawne znaki.'; $wb['error_ns2_regex'] = 'NS2 zawiera niepoprawne znaki.'; $wb['error_email_regex'] = 'Pole E-mail nie zawiera poprawnego adresu e-mail.'; -$wb['dns_zone_txt'] = 'DNS Zone'; -$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['list_head_txt'] = 'DNS Zone Wizard'; -$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard'; +$wb['list_head_txt'] = 'Kreator Stref DNS'; +$wb['list_desc_txt'] = 'Utwórz strefę DNS za pomocą Kreatora'; +$wb['dns_zone_txt'] = 'Strefa DNS'; +$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'; ?> + diff --git a/interface/web/help/faq_list.php b/interface/web/help/faq_list.php index 96d281a6023e9eafd6f55b53de141a689f670be4..df69273884e7e6f68a953b555cbf7d956545cef4 100644 --- a/interface/web/help/faq_list.php +++ b/interface/web/help/faq_list.php @@ -29,9 +29,9 @@ if(!$hf_section) $app->listform_actions->SQLExtWhere = "hf_section = $hf_section"; -$res = $app->db->queryOneRecord("SELECT hfs_name FROM help_faq_sections WHERE hfs_id=$hf_section"); +if($hf_section) $res = $app->db->queryOneRecord("SELECT hfs_name FROM help_faq_sections WHERE hfs_id=$hf_section"); // Start the form rendering and action ahndling echo "

FAQ: ".$res['hfs_name']."

"; -$app->listform_actions->onLoad(); +if($hf_section) $app->listform_actions->onLoad(); ?> diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng index 18f8f210b70ab3d2c7835b41a508e44a99a6d319..721aaf388efb3f9f3e0a0d39b3927862df0c5e16 100644 --- a/interface/web/help/lib/lang/cz.lng +++ b/interface/web/help/lib/lang/cz.lng @@ -12,3 +12,5 @@ $wb['Manage Sections'] = 'Spravovat sekce'; $wb['Manage Questions'] = 'Spravovat dotazy'; $wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď'; ?> + + diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng index 73feee6955ca1ea13de8f949cc9d7b2a260a4703..dc951a40abc6bde45696720b3fc46a4fedddb0b7 100644 --- a/interface/web/help/lib/lang/cz_faq_form.lng +++ b/interface/web/help/lib/lang/cz_faq_form.lng @@ -4,3 +4,5 @@ $wb['faq_question_txt'] = 'Otázka'; $wb['faq_answer_txt'] = 'Odpověď'; $wb['faq_section_txt'] = 'Sekce'; ?> + + diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng index a9488445ca9a6872e55e18b39be996dab5c82760..ab5d07c4e16fb0433f1a5c4f4bd8a9934f229723 100644 --- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng @@ -7,3 +7,5 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_questions_txt'] = 'Často kladené dotazy'; $wb['faq_new_question_txt'] = 'Přidat nový dotaz'; ?> + + diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng index b6c7b460b9ecab5767e64a0b73350772e5a7027b..15eb20ad58e679247d2e8c40da3ed7fd690c3875 100644 --- a/interface/web/help/lib/lang/cz_help_faq_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_list.lng @@ -1,3 +1,5 @@ + + diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng index 967b0abfcd017a69309c088df9d07e6ea9ea2395..60906e5d3e3be699958bb760a94fb92c2172b5be 100644 --- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng @@ -6,3 +6,5 @@ $wb['faq_sections_txt'] = 'Sekce'; $wb['faq_faq_sections_txt'] = 'Sekce FAQ'; $wb['faq_new_section_txt'] = 'Přidat novou sekci'; ?> + + diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng index 6c27284432b73dbc9246504a12961fbe11d02620..63bce28898ea2cde84ea366719f23c5ac82181e1 100644 --- a/interface/web/help/lib/lang/cz_support_message.lng +++ b/interface/web/help/lib/lang/cz_support_message.lng @@ -6,3 +6,5 @@ $wb['message_txt'] = 'Zpráva'; $wb['tstamp_txt'] = 'Časové razítko'; $wb['reply_txt'] = 'Odpovědět'; ?> + + diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng index 8629a2f8a1ec899b6b411fd00c18960b7201e4b6..3a2c9a90d9a6ca1c489ce0618dba7f813f03262c 100644 --- a/interface/web/help/lib/lang/cz_support_message_list.lng +++ b/interface/web/help/lib/lang/cz_support_message_list.lng @@ -4,3 +4,5 @@ $wb['sender_id_txt'] = 'Odesílatel'; $wb['subject_txt'] = 'Předmět'; $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu'; ?> + + diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng index 6d9412c7a8e3c54269381aef3c7817a27d629eed..3120f36cb8b087738b0acc5bb25897832675d073 100644 --- a/interface/web/help/lib/lang/pl.lng +++ b/interface/web/help/lib/lang/pl.lng @@ -4,7 +4,7 @@ $wb['Message'] = 'Wiadomość'; $wb['Send message'] = 'Wyślij wiadomość'; $wb['View messages'] = 'Pokaż wiadomość'; $wb['Support'] = 'Pomoc'; -$wb['About ISPConfig'] = 'O ISPConfig'; +$wb['About ISPConfig'] = 'Informacje o ISPConfig'; $wb['Version'] = 'Wersja'; $wb['Frequently Asked Questions'] = 'Pomoc Techniczna'; $wb['FAQ Sections'] = 'Sekcje FAQ'; @@ -12,3 +12,4 @@ $wb['Manage Sections'] = 'Zarządzaj sekcjami'; $wb['Add a Question & Answer Pair'] = 'Dodaj nowe pytanie i odpowiedź'; $wb['Manage Questions'] = 'Zarządzaj pytaniami'; ?> + diff --git a/interface/web/help/lib/lang/pl_faq_form.lng b/interface/web/help/lib/lang/pl_faq_form.lng index a39383e99eaf60231714223bf113e242fac7e1ee..6495e6352d15c9b82c884053b41527f4b5bebc87 100644 --- a/interface/web/help/lib/lang/pl_faq_form.lng +++ b/interface/web/help/lib/lang/pl_faq_form.lng @@ -4,3 +4,4 @@ $wb['faq_question_txt'] = 'Pytanie'; $wb['faq_answer_txt'] = 'Odpowiedź'; $wb['faq_section_txt'] = 'Sekcja'; ?> + diff --git a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng index 4c07503eee8361e65a78d6f9333b3791f274d81f..c50ff019ace371555c6694117405668ab09098f9 100644 --- a/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng +++ b/interface/web/help/lib/lang/pl_faq_manage_questions_list.lng @@ -7,3 +7,4 @@ $wb['faq_sections_txt'] = 'Sekcja'; $wb['faq_faq_questions_txt'] = 'Pomoc Techniczna'; $wb['faq_new_question_txt'] = 'Dodaj nowe pytanie i odpowiedź'; ?> + diff --git a/interface/web/help/lib/lang/pl_faq_sections_form.lng b/interface/web/help/lib/lang/pl_faq_sections_form.lng index d4bb7ef9444cba484c961255458eb01bf2e1544b..21615bd07c2ef4f81112f5685e975f75ebedc954 100644 --- a/interface/web/help/lib/lang/pl_faq_sections_form.lng +++ b/interface/web/help/lib/lang/pl_faq_sections_form.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/pl_help_faq_list.lng b/interface/web/help/lib/lang/pl_help_faq_list.lng index 072e3edbd23e81cbb724d696df64d7e274370d73..10a98c50cfe59d1f0de7c1c98181270b4b16e65d 100644 --- a/interface/web/help/lib/lang/pl_help_faq_list.lng +++ b/interface/web/help/lib/lang/pl_help_faq_list.lng @@ -1,3 +1,4 @@ + diff --git a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng index e21792dfd726bc4b3bf2813ca4459036595c7aa9..53a56a9289cdccddfc2ee1e35dc6c3f09a6df390 100644 --- a/interface/web/help/lib/lang/pl_help_faq_sections_list.lng +++ b/interface/web/help/lib/lang/pl_help_faq_sections_list.lng @@ -6,3 +6,4 @@ $wb['faq_sections_txt'] = 'Sekcje'; $wb['faq_faq_sections_txt'] = 'Sekcje FAQ'; $wb['faq_new_section_txt'] = 'Dodaj nową sekcję'; ?> + diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng index 5758dadec2b1acd28c1e51d1a137a155e9faff7b..63f2feb2ae3161134fc7870f8ce1afe98b3bf21e 100644 --- a/interface/web/help/lib/lang/pl_support_message.lng +++ b/interface/web/help/lib/lang/pl_support_message.lng @@ -4,5 +4,6 @@ $wb['sender_id_txt'] = 'ID nadawcy'; $wb['subject_txt'] = 'Temat'; $wb['message_txt'] = 'Wiadomość'; $wb['tstamp_txt'] = 'Kalendarz'; -$wb['reply_txt'] = 'Reply'; +$wb['reply_txt'] = 'Odpowiedź'; ?> + diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng index bc3285694b816cdfd17997548828a5f1c9225b8a..13c678e3b98482cae8cd51f15bb5ed1eacfb48b4 100644 --- a/interface/web/help/lib/lang/pl_support_message_list.lng +++ b/interface/web/help/lib/lang/pl_support_message_list.lng @@ -4,3 +4,4 @@ $wb['sender_id_txt'] = 'Nadawca'; $wb['subject_txt'] = 'Temat'; $wb['add_new_record_txt'] = 'Wyślij wiadomość'; ?> + diff --git a/interface/web/login/index.php b/interface/web/login/index.php index a158422f89baa7d8b3056fbfea6bd388be755bea..2c596f8b81455396078bfb97fc60effcefd1c8e2 100644 --- a/interface/web/login/index.php +++ b/interface/web/login/index.php @@ -213,7 +213,7 @@ class login_index { // check if the user theme is valid if($_SESSION['s']['user']['theme'] != 'default') { $tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme']; - if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ISPC_VERSION") || trim(file_get_contents($tmp_path."/ISPC_VERSION")) != ISPC_APP_VERSION) { + if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) { // fall back to default theme if this one is not compatible with current ispc version $_SESSION['s']['user']['theme'] = 'default'; $_SESSION['s']['theme'] = 'default'; diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng index a89f5f32efb6768f6b3add391e6a92f1b702ee43..a65862acc0c892afb832fdde1cbd2179171f1234 100644 --- a/interface/web/login/lib/lang/cz.lng +++ b/interface/web/login/lib/lang/cz.lng @@ -1,11 +1,11 @@ Výchozí motiv byl aktivován automaticky.'; ?> + + diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng index 2a7e58f6d6570ce39b11f192c67009daa88025fe..109af558f2260dd3113f9b63bf361fcb62e15f12 100644 --- a/interface/web/login/lib/lang/pl.lng +++ b/interface/web/login/lib/lang/pl.lng @@ -1,24 +1,25 @@ 64 znaki.'; +$wb['error_user_password_empty'] = 'Pusta nazwa użytkownika lub hasło.'; +$wb['error_user_password_incorrect'] = 'Niepoprawna nazwa użytownika lub hasło.'; +$wb['error_user_blocked'] = 'Konto użytkownika zostało zablokowane.'; +$wb['error_user_too_many_logins'] = 'Zbyt dużo niepoprawnych logowań. Prosimy spróbować ponownie za 15 minut.'; $wb['username_txt'] = 'Nazwa użytkownika'; $wb['password_txt'] = 'Hasło'; $wb['login_button_txt'] = 'Zaloguj'; -$wb['pw_lost_txt'] = 'Password lost'; -$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.'; $wb['login_txt'] = 'Login'; -$wb['pw_reset_txt'] = 'Password reset'; -$wb['pw_button_txt'] = 'Resend password'; -$wb['email_txt'] = 'Email'; -$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.
The default theme as been activated automatically.'; +$wb['pw_lost_txt'] = 'Zapomniałem hasła'; +$wb['pw_reset_txt'] = 'Reset hasła'; +$wb['pw_button_txt'] = 'Prześlij hasło ponownie'; +$wb['email_txt'] = 'E-mail'; +$wb['error_maintenance_mode'] = 'Ta instalacja ISPConfig jest aktualnie w trakcje modernizacji. Wracamy niebawem - proszę o cierpliwość.'; +$wb['theme_not_compatible'] = 'Wybrany temat nie jest kompatybilny z aktualną wersją ISPConfig. Proszę wybrać nową wersję tematu.
Został aktywowany automatycznie domyślny temat.'; ?> + diff --git a/interface/web/mail/form/mail_user_filter.tform.php b/interface/web/mail/form/mail_user_filter.tform.php index 2ea37233cef0d1afa2df1a53173eb9e73d86196f..8962e79ee6e53b1c10be4992db34299c4b668d7a 100644 --- a/interface/web/mail/form/mail_user_filter.tform.php +++ b/interface/web/mail/form/mail_user_filter.tform.php @@ -112,7 +112,7 @@ $form["tabs"]['filter'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^[a-zA-Z0-9\.\-\_\ ]{0,100}$/', + 'regex' => '/^[\p{Latin}0-9\.\-\_\ ]{0,100}$/u', 'errmsg'=> 'target_error_regex'), ), 'default' => '', diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng index 6a5afe06856be3ac43164c395a138a43f45946bb..6b5f3fc131d7d441b57d711ec8a2a142c600a288 100644 --- a/interface/web/mail/lib/lang/cz.lng +++ b/interface/web/mail/lib/lang/cz.lng @@ -46,3 +46,5 @@ $wb['Relay Recipients'] = 'Relay adresáti'; $wb['Statistics'] = 'Statistiky'; $wb['Mailbox quota'] = 'Mailbox kvóta'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng index 605e06b3c875fb13d96cf8ca19343684f6067166..414e1023c8eb4739d9c33db2072af0f6db8c5b54 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias.lng @@ -12,3 +12,5 @@ $wb['domain_txt'] = 'Doména'; $wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.'; $wb['source_txt'] = 'Alias'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng index de8cc2ef2ab3f5048883e3ab178a668cacc1fe77..0d8f779c33b3d680a51b9bcef5e17ad0b4fb0c6a 100644 --- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng @@ -6,3 +6,5 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový e-mailový alias'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng index 74611c2de0a0416931bc96d5859bccedfbf974e5..e0cde683501eaaf17d8e91fbcb449b185f12ed60 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng @@ -9,3 +9,5 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.'; $wb['source_error_unique'] = 'Duplikování zdrojové domény.'; $wb['source_error_regex'] = 'Chybná zdrojová doména.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng index fd850d6f5f64d77d64b50febe94ade6cc7962c88..cfc0154d84129c34018493a01e7a37b37619f6bf 100644 --- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng @@ -5,3 +5,5 @@ $wb['source_txt'] = 'Zdroj'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat doménový alias'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng index e1e6dab48f04bee0ad53d9a296d84527f9b3fce6..4719142aff8d261e445dd287c36c971596df93ca 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng @@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng index 0ef1d3417c1dbfa1ce022d39093fafbe48613851..fbf6e2d230c57ec73defaa130e372addeddb995e 100644 --- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng @@ -8,3 +8,5 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; $wb['access_txt'] = 'Přístup'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng index 459ca228a2149d868ea9dfb575253bbb10da261f..1405881fbb1a4c28f6e26b4df2340510fbb96520 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng @@ -7,3 +7,5 @@ $wb['action_txt'] = 'Akce'; $wb['active_txt'] = 'Aktivní'; $wb['pattern_error_empty'] = 'Vzor je prázdný.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng index da9709e7f98bb31d63bda148ece2efda717f320b..6e7ebf518677d14f6965b823436c76d165f1e9f7 100644 --- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng @@ -6,3 +6,5 @@ $wb['pattern_txt'] = 'Vzor'; $wb['action_txt'] = 'Akce'; $wb['add_new_record_txt'] = 'Přidat obsahový filtr'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng index 026a2f1d277da942abe985f003a8a81f57069647..be20bce450b46fc14d5d1e1925f06457df28a7a2 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain.lng @@ -11,3 +11,5 @@ $wb['limit_maildomain_txt'] = 'Dosažen maximální počet email domén pro Vá $wb['policy_txt'] = 'Spamový filtr'; $wb['no_policy'] = '- nepovoleno -'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng index b579d2de088d0995da33586a6f2a0731445daa76..da42190faccc8497d6706ac3a2d189736ea68210 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng @@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; $wb['sys_groupid_txt'] = 'Klient'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng index 488d0d5176a4c441e3b9ca94ab6793f3f7d3ecbf..75efd562185a0dc212f59148168f2866c8386cc7 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng @@ -9,3 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro $wb['source_txt'] = 'Zdroj'; $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng index 3b24645ec88a8dd4a411d33dbb7a8a0c93b48972..aa0b76df8c6faa9189e418da29e03b50a64889c9 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng @@ -7,3 +7,5 @@ $wb['server_id_txt'] = 'Server'; $wb['domain_txt'] = 'E-malová doména'; $wb['add_new_record_txt'] = 'Přidat e-mailový koš'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng index 2abb05cf74ba4442dedbe96a7720d1fb1035b678..05bb74753064ef9ba1a56e8447e89fb7c80450f7 100644 --- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng @@ -5,3 +5,5 @@ $wb['domain_txt'] = 'Doména'; $wb['add_new_record_txt'] = 'Přidat doménu'; $wb['active_txt'] = 'Aktivní'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng index a59bd9b52baa1cdbded7bdb71f601e631d3d32dd..ba79e1a2ff653a234c696b840fa42710fcbd28d2 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward.lng @@ -7,3 +7,5 @@ $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje'; $wb['domain_txt'] = 'Doména'; $wb['source_txt'] = 'Zdrojový e-mail'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng index e5381fe5f8c17d2bc90f41340114f025cc4299e6..bdbff701e1b1ef1abc043469f58b6c005ed4fcf0 100644 --- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng @@ -6,3 +6,5 @@ $wb['destination_txt'] = 'Cíl'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nové přesměrování'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng index 51b9f3403edb2cb37c835192860658706fc45e34..6fc9101699e951cc01352a08ca5dbc2ccf8bb9d0 100644 --- a/interface/web/mail/lib/lang/cz_mail_get.lng +++ b/interface/web/mail/lib/lang/cz_mail_get.lng @@ -16,3 +16,5 @@ $wb['source_server_error_regex'] = 'POP3/IMAP server není validní doménový n $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečtené pošty)'; $wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng index 9ca8b86dcb258320aee7376ca5a9bc06dc9cc9e4..824205f00a077efbbe4f4effa8b0ce516dcb6b89 100644 --- a/interface/web/mail/lib/lang/cz_mail_get_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng @@ -7,3 +7,5 @@ $wb['source_username_txt'] = 'Uživatelské jméno'; $wb['destination_txt'] = 'Cíl'; $wb['add_new_record_txt'] = 'Přidat účet'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng index 2d2278526e9ea34004ce9b52972c98a61d08123e..406df72ad9ef9a95c54b7d7b42ba2f6551a798e7 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng @@ -20,3 +20,5 @@ $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\". $wb['email_error_isemail'] = 'E-mailová adresa je neplatná.'; $wb['mailinglist_txt'] = 'Mailing list'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng index db31273f594bd45eed82a9364a984d7101fc8990..b3e2cf85ac4a46a3b6a7f6b2a1041bb649f9638b 100644 --- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng @@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'E-mailové konference'; $wb['domain_txt'] = 'Doména'; $wb['listname_txt'] = 'Název seznamu'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng index 0c07059c3408449422b4c1b23f9502a4c3a08aa4..b64c3113bc11a8a52802b521e0a167948728f202 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng @@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng index 1af959966c2dcf172cbdac4485f490fc6c9ecbab..bf34af6ec33b4c61372f84fa1abd6d58cca328c4 100644 --- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng @@ -7,3 +7,5 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat relay adresáta'; $wb['access_txt'] = 'Přístup'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng index 4b6cc2b5d8586f9843044622806ada40cf79f7f3..f19706dc3a292714bbb26395ce2993f2112ae4db 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng @@ -15,3 +15,5 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací zá $wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář'; $wb['days_txt'] = 'Dny.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng index 7560b570da284998e11f0c8a6ff99ecc1ecfac1f..f6170c635514b7846c90743aae014d146570dedc 100644 --- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng @@ -6,3 +6,5 @@ $wb['server_name_txt'] = 'server_name'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng index dfe185508436062eb14cffcfb755528e9a4a2072..710e577ecae0f6686d0aca3a459287a40eaf37a4 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport.lng @@ -9,3 +9,5 @@ $wb['active_txt'] = 'Aktivní'; $wb['limit_mailrouting_txt'] = 'Dosažen maximální počet email směrování pro Váš účet.'; $wb['transport_txt'] = 'Transport'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng index e833293a2fd89e00d54885eaec530793beb5e15c..9fb61fd886062c538f0856ebac14e00c504d9421 100644 --- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng @@ -7,3 +7,5 @@ $wb['transport_txt'] = 'Transport'; $wb['sort_order_txt'] = 'Třídit podle'; $wb['add_new_record_txt'] = 'Přidat transport'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index 2c441f2abaafc7eae0f89a4255a18a2e95026ad3..d8805f0fab289d1215b93ea61bb67e87144f4368 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -48,3 +48,5 @@ $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/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng index 6cd8ed7e8987780343352e22a55b721075afe4f4..097385684379b95c6ee6f3b293361b0c93b1d00e 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -18,3 +18,5 @@ $wb['ends_with_txt'] = 'Končí na'; $wb['move_to_txt'] = 'Přesunout do'; $wb['delete_txt'] = 'Smazat'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng index 60229ce3b599091aa8e52bb8bd7452b5495ce5ca..d9f6748c192900ff90f556ee3bcca982ea33e1fa 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng @@ -5,3 +5,5 @@ $wb['page_txt'] = 'Stránka'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng index e6dfd006ed2aee86054be10320bdd4174221d846..08d28fbc026f00168d85d59eaa837e141244fec1 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng @@ -6,3 +6,5 @@ $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku'; $wb['name_txt'] = 'Skutečný název'; $wb['login_txt'] = 'Přihlášení'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng index 50cbc31d5c21e1ffa2609b178d33432146db6468..92600a17d982c680c84f9284aa097e20b6950c4c 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng @@ -6,3 +6,5 @@ $wb['last_month_txt'] = 'Minulý měsíc'; $wb['this_year_txt'] = 'Tento rok'; $wb['last_year_txt'] = 'Minulý rok'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng index db55c18a0bb1606df3ea8a5eaab8087eee23481f..cd5d03295360d6ef84798362bb64c02f77644e99 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng @@ -7,3 +7,5 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng index 7fae3689995265473944ebefcf08893a8ae523d0..042cd71c5787412c547db5d454c187a1ccb63aef 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng @@ -8,3 +8,5 @@ $wb['recipient_txt'] = 'Příjemce (adresát)'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; $wb['access_txt'] = 'Přístup'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng index 5e0c6b779909284280bdc5a4278a01c005e471d5..98e7649ba5f5c2839206913e82725073d4b0ab62 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng @@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng index 83a732d6f3d2cc4d1ed67050dbf125903f285e48..76ab17ec17586034391068a39a43bc3d85d41308 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng @@ -7,3 +7,5 @@ $wb['rid_txt'] = 'Uživatel'; $wb['email_txt'] = 'Emaily na černé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng index 0f878cc7d8b3a0b45c521a97956a246588db6d7c..d0ebcc4bf63f5419424425f63759f20b8c03918f 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng @@ -18,3 +18,5 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo'; $wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng index fe2ee8d51ce0b3e2afd8f5c25403b1c27ff23832..8b5b1e758dcef47798d09499d66777f29ab59bf8 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng @@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'Konfigurace serveru'; $wb['server_name_txt'] = 'Server'; $wb['server_id_txt'] = 'server_id'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng index 54d0155d74a932b732f763488dd5f9ac3046d909..1a778301ebc7e8f3e96bd65ebd2fbfd4a084ce38 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng @@ -36,3 +36,5 @@ $wb['spam_admin_txt'] = 'SPAM admin'; $wb['message_size_limit_txt'] = 'Limit velikosti zprávy'; $wb['banned_rulenames_txt'] = 'Název pravidel zabanované'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng index 9a0c3619972097537f5e8847b27e24d9df73be74..37f41d3ace6a31a75190f259d4d2553c38214275 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng @@ -7,3 +7,5 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory'; $wb['bad_header_lover_txt'] = 'Špatné hlavičky'; $wb['add_new_record_txt'] = 'Přidat záznam politiky'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng index 914304c58b9e854c30aadcd60cda1593aaca05d3..d795af11df1ce93035e3fdef021260965177b8eb 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng @@ -6,3 +6,5 @@ $wb['email_txt'] = 'Email (vzor)'; $wb['fullname_txt'] = 'Název'; $wb['local_txt'] = 'Lokální'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng index 36bf3409e368f4941552e6803305c4da6c86d9b7..26c4df143f870448039261886145c39c259234c3 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng @@ -8,3 +8,5 @@ $wb['fullname_txt'] = 'Jméno'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng index 5e0c6b779909284280bdc5a4278a01c005e471d5..98e7649ba5f5c2839206913e82725073d4b0ab62 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng @@ -7,3 +7,5 @@ $wb['priority_txt'] = 'Priorita'; $wb['active_txt'] = 'Aktivní'; $wb['limit_spamfilter_wblist_txt'] = 'Dosažen maximální počet záznamů pro bílou / černou listinu pro Váš účet.'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng index ad13897004c305fbb7a6133ba447a60c39c3668e..3b74159b99dfd8fbc416db575a12420368e64b53 100644 --- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng @@ -7,3 +7,5 @@ $wb['rid_txt'] = 'Uživatel'; $wb['email_txt'] = 'Emaily na bílé listině'; $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu'; ?> + + diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng index c8b73a9e8e8a85152632b9c3c5b3edf752ee97db..0c30e7574e14f7d251ae8095041dbb9adbbcf8b2 100755 --- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng @@ -5,3 +5,5 @@ $wb['name_txt'] = 'Jméno'; $wb['email_txt'] = 'E-mailová adresa'; $wb['used_txt'] = 'Využité místo'; ?> + + diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng index 82bcf014e9a83c5673a13d9324f87506ef30bc47..afa99d7d4ed00ec0f5802dc219f7f268fe5cbfd7 100644 --- a/interface/web/mail/lib/lang/pl.lng +++ b/interface/web/mail/lib/lang/pl.lng @@ -44,5 +44,6 @@ $wb['Content Filter'] = 'Zawartość filtru'; $wb['Global Filters'] = 'Globalne filtry'; $wb['Domain Alias'] = 'Alias domeny'; $wb['Relay Recipients'] = 'Odbiorcy przekierowania'; -$wb['Mailbox quota'] = 'Mailbox quota'; +$wb['Mailbox quota'] = 'Użycie skrzynek email'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng index e3de56dc0862774c88ab21973fdce8ec4b7579c3..bf8e41e28f66979bfd071b841a4abd77f2d14138 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias.lng @@ -9,6 +9,7 @@ $wb['destination_error_isemail'] = 'Element docelowy adresów e-mail jest niepop $wb['limit_mailalias_txt'] = 'Maksymalna ilość aliasów e-mail dla Twojego konta została przekroczona.'; $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa z e-mailem o takiej nazwie.'; $wb['domain_txt'] = 'Domena'; -$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.'; +$wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.'; $wb['source_txt'] = 'Alias'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng index b6ce95d0c77a8a73e4ba729f13dd0f105a1c85f4..f5567ce92a0162ff849bfb24f3ad3fad2ec6c7fe 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Element docelowy'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowy alias e-mail'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng index 7735a4e87d27f68fe80c10a4266c091d44a6a2b2..ebbc0d02033f6ac04b8c26f12013e0ee1e7ad755 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng @@ -9,3 +9,4 @@ $wb['source_error_empty'] = 'Domena źródłowa jest pusta.'; $wb['source_error_unique'] = 'Duplikat źródłowej domeny.'; $wb['source_error_regex'] = 'Nieprawidłowa nazwa domeny źródłowej.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng index ba2e3b957584c38a178005398140d6ec9b9af58b..bdccec7d67b2cd4a88922c55f8e4edd308581945 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng @@ -5,3 +5,4 @@ $wb['source_txt'] = 'Źródło'; $wb['destination_txt'] = 'Cel'; $wb['add_new_record_txt'] = 'Dodaj nowy alias domeny'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng index 528f2f741aee3944e1f99f015010dee5fc0a140a..448658d8320f4bf727c471f2e8ae1647b8d7cbee 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów dla Twojego konta została przekroczona.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng index ebef66657b51451a74459325416366ceaec7e4e6..8351885ca0a456124f7e759d953f8e629e7c537c 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'Odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis czarnej listy'; $wb['access_txt'] = 'dostęp'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng index 54efa4fed020b24309cff19e25bde14247741d56..6ca25bccd1d4c3302a4e7f3f9ce2192a048ea095 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng @@ -7,3 +7,4 @@ $wb['action_txt'] = 'Akcja'; $wb['active_txt'] = 'Aktywny'; $wb['pattern_error_empty'] = 'Wzór jest pusty.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng index 9fc964cf5715be255d8f5edb7040a389864eba5b..fe5a78fd65a118fc5971eb405255b5ff53cbdb2b 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng @@ -6,3 +6,4 @@ $wb['pattern_txt'] = 'Wzór'; $wb['action_txt'] = 'Akcja'; $wb['add_new_record_txt'] = 'Dodaj nowy zbiór filtrów'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 6f9c68cdc64ba0a55299d1c645e395bc4ef41557..0e76cd0f01c36d2f8e4a948a44a3090c93b1f6fb 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -11,3 +11,4 @@ $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta $wb['policy_txt'] = 'Filtr spamu'; $wb['no_policy'] = '-nie używane-'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng index e214d92a92139df9c511c0e0b8b00c386a7c5079..de3a6654f435abc3e669bfa0fc5c466045963033 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['active_txt'] = 'Aktywne'; $wb['sys_groupid_txt'] = 'Klient'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng index 72f6f9b8974e68c1ec809b2dd659f8dfec40e041..c9667c519a1cdebc2da54958d73163fcaaa3ea30 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng @@ -6,6 +6,7 @@ $wb['domain_error_unique'] = 'Jest już wpis Catchall dla tej domeny.'; $wb['no_domain_perm'] = 'Nie masz dostępu do tej domeny.'; $wb['domain_error_regex'] = 'Nieprawidłowa nazwa domeny. Domena zawiera niedozolone znaki.'; $wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Twojej domeny została przekroczona.'; -$wb['source_txt'] = 'Source'; -$wb['destination_error_isemail'] = 'Destination is no valid email address.'; +$wb['source_txt'] = 'Źródło'; +$wb['destination_error_isemail'] = 'Cel nie jest poprawnym adresem email.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng index 1f0aad197d337e0f1f57cc44fa09336cd3e5d687..304bc3d9a4e57b085e55a458a0e2cf0380e4f93e 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng @@ -7,3 +7,4 @@ $wb['server_id_txt'] = 'Serwer'; $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nowy Catchall'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng index ec51e2cdb569c89bdac5328c67bea293e847194f..e14f2f0889a377acf3273d85825686fb14722cf7 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng @@ -5,3 +5,4 @@ $wb['domain_txt'] = 'Domena'; $wb['add_new_record_txt'] = 'Dodaj nową domenę'; $wb['active_txt'] = 'Aktywny'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng index 05ebbd7c35a1f07d524b3496e5edbc0cccafeddb..cc84d34b8b2b35712bdbc65517fc18a61156406c 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward.lng @@ -1,9 +1,10 @@ + diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng index 1044bd51210f9056a1c7f41ccde185fa4df35ed5..3f27975cf714efeb27fac42dfa46a47b946b40d0 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng @@ -6,3 +6,4 @@ $wb['destination_txt'] = 'Element docelowy'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowe przekierowanie E-mail'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng index 4d7c7f9a3dd798a0015134fa92ac9d99a9ebd9fa..ca27711e98693bb2d5ffc661db17458db610c94c 100644 --- a/interface/web/mail/lib/lang/pl_mail_get.lng +++ b/interface/web/mail/lib/lang/pl_mail_get.lng @@ -14,5 +14,6 @@ $wb['source_password_error_isempty'] = 'Hasło jest puste.'; $wb['destination_error_isemail'] = 'Nie wybrano elementu docelowego.'; $wb['source_server_error_regex'] = 'Serwer Pop3/Imap nie jest poprawną nazwą domenową.'; $wb['source_read_all_txt'] = 'Pobierz wszystkie maile (razem z przeczytanymi)'; -$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes'; +$wb['error_delete_read_all_combination'] = 'Nieprawidłowa kombinacja opcji. Nie możesz użyć jednocześnie opcji Delete emails after retrieval = no razem z Retrieve all emails = yes'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng index cd473d9ded2ecbd9802e267807e96fea4498aea9..cf5844f0d6bc9a7dab1a05e7dcfb3df33e6b496b 100644 --- a/interface/web/mail/lib/lang/pl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng @@ -7,3 +7,4 @@ $wb['source_username_txt'] = 'Nazwa użytkownika'; $wb['destination_txt'] = 'Element docelowy'; $wb['add_new_record_txt'] = 'Dodaj nowe konto'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng index cd622ad007d44e70a9f7b96274c19ade2bbdabbc..774da1802e308b10bde6146db878b2f6e728b911 100644 --- a/interface/web/mail/lib/lang/pl_mail_mailinglist.lng +++ b/interface/web/mail/lib/lang/pl_mail_mailinglist.lng @@ -12,11 +12,12 @@ $wb['listname_txt'] = 'Nazwa listy'; $wb['client_txt'] = 'Klient'; $wb['email_txt'] = 'Email'; $wb['password_txt'] = 'Hasło'; -$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['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.'; -$wb['email_error_isemail'] = 'Email address is invalid.'; -$wb['mailinglist_txt'] = 'Mailing list'; +$wb['mailinglist_txt'] = 'Lista Mailingowa'; +$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['listname_error_unique'] = 'Isnieje już lista mailingowa o tej nazwie, wybierz inną nazwę listy.'; +$wb['email_error_isemail'] = 'Adres e-mail jest nieprawidłowy'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng index 649db47bd0d101b393e0954dc2df0308e025fbdd..96cd9604d75736fc813b587406cb317f01cf97f2 100644 --- a/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_mailinglist_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Lista mailingowa'; $wb['domain_txt'] = 'Domena'; $wb['listname_txt'] = 'Nazwa listy'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng index 594aba1f2a75fe036089a4dffb80006df0fecffb..ab7926f8991b589e352c19cea87fd5e9ebac0a94 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta została przekroczona.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng index 310e27ca307ced9bb1be262e90e83433219a7707..84d08ba619ad0b19c51d9a9c9dbe82c30239ae9e 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng @@ -7,3 +7,4 @@ $wb['recipient_txt'] = 'Odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowego odbiorcę przekierowania'; $wb['access_txt'] = 'dostęp'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng index 3879f24247c4576d814349c4b6de7c58bbb5fa57..2849430c6dcf16e65dd5b54c29bfe21273e0ca93 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng @@ -15,3 +15,4 @@ $wb['email_error_unique'] = 'Istnieje już wpis z filtrem spamu dla tego adresu $wb['spam_redirect_maildir_purge_txt'] = 'Wyczyść później Maildir'; $wb['days_txt'] = 'Dni.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng index d6097bb3365c2352e7b55185c6f9235f4354e516..a6959a26e2d735f616998a54543bdee51a2e8344 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng @@ -6,3 +6,4 @@ $wb['server_name_txt'] = 'nazwa_serwera'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis z filtrem spamu'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng index 514fc263a5353673f867df8295eb240e16340983..364eba944549f6a3e4e98607b4ac7b0b1446d6b5 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport.lng @@ -9,3 +9,4 @@ $wb['active_txt'] = 'Aktywny'; $wb['limit_mailrouting_txt'] = 'Maksymalna ilość ścieżek dla Twojego konta została przekroczona.'; $wb['transport_txt'] = 'Transport'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng index fa5c584318b4d5a0588b7c8046102bb5e2ee3a31..837972c4f286d55934f911217863cdd02149685b 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng @@ -7,3 +7,4 @@ $wb['transport_txt'] = 'Przenieś'; $wb['sort_order_txt'] = 'Sortuj według'; $wb['add_new_record_txt'] = 'Dodaj nowe przeniesienie'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index d762af643ab89c5ec087df9123f1b45f9c79ae3a..4ccab2e93ecccaec86f466b6d50e31cbfe756958 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -18,7 +18,7 @@ $wb['maildir_txt'] = 'Maildir'; $wb['postfix_txt'] = 'Zezwól na odbiór poczty'; $wb['access_txt'] = 'Możliwy dostęp'; $wb['policy_txt'] = 'Filtr spamu'; -$wb['no_policy'] = '- nie dostępny -'; +$wb['no_policy'] = '- brak polityki -'; $wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.'; $wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: '; $wb['disableimap_txt'] = 'Wyłącz IMAP'; @@ -41,10 +41,11 @@ $wb['login_error_unique'] = 'Login jest już w użyciu.'; $wb['login_error_regex'] = 'Poprawne znaki to A-Z, a-z, 0-9, ., _ oraz -.'; $wb['login_txt'] = 'Login (opcjonalnie)'; $wb['error_login_email_txt'] = 'Ten login nie jest poprawny. Proszę wpisać inny lub użyć adresu e-mail jako loginu.'; -$wb['autoresponder_subject_txt'] = 'Email Subject'; -$wb['autoresponder_subject'] = 'Out of office reply'; -$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['autoresponder_subject_txt'] = 'Temat wiadomości'; +$wb['autoresponder_subject'] = 'Odpowiedź - poza biurem - '; +$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/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng index 99ac6a9e78a7bb2f5e8c1a4f4711b11ee510623e..1e1a7fd8957b79a8b0d25e539ea18d9a1fced47d 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng @@ -18,3 +18,4 @@ $wb['ends_with_txt'] = 'Kończy się na'; $wb['move_to_txt'] = 'Przenieś do'; $wb['delete_txt'] = 'Usuń'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng index ce235b892fe918ccc7aba13902de1928022a1626..4d45c5d23bf7b481a0b95cf24299665b425e23cb 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng @@ -5,3 +5,4 @@ $wb['page_txt'] = 'Strona'; $wb['page_of_txt'] = 'z'; $wb['delete_confirmation'] = 'Czy na pewno chcesz skasować filtr?'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng index 7c13db38d1d24c226d9c93e713e24abf91087e4b..8e47f96dcb6ca466630dbbbe2834ea30b752f701 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng @@ -6,3 +6,4 @@ $wb['add_new_record_txt'] = 'Dodaj nową skrzynkę pocztową'; $wb['name_txt'] = 'Nazwa rzeczywista'; $wb['login_txt'] = 'Login'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng index b9780687d79ba053a6e07842b3079e35716b4002..9e876805ba81f90b68ca1de5e0f6cbc3193c9517 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng @@ -6,3 +6,4 @@ $wb['last_month_txt'] = 'Ostatni miesiąc'; $wb['this_year_txt'] = 'Ten rok'; $wb['last_year_txt'] = 'Ostatni rok'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng index 203c5bae73b49489f47af28011cae1646f4880fd..4aa2f05609a05fbd400caf4907adc02fd4dfeddb 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng @@ -7,3 +7,4 @@ $wb['source_error_notempty'] = 'Adres jest pusty.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Maksymalna ilość filtrów e-mail dla Twojego konta zosała przekroczona.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng index 10e6dfcf0bb03424f92c145e3582481e6bc8e2a9..a7239ca95cdd169af0720d2362432095886b040b 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng @@ -8,3 +8,4 @@ $wb['recipient_txt'] = 'odbiorca'; $wb['add_new_record_txt'] = 'Dodaj nowy wpis białej listy'; $wb['access_txt'] = 'dostęp'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng index 6da8ddc9d97080df44893b5c4d23aadb859215b5..6c4c8d78fd6e86622ca5a074b91518578c1ef18c 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorytet'; $wb['active_txt'] = 'Aktywny'; $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość wpisów do białej i czarnej listy dla Twojego konta została przekroczona.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng index c237a7a778821b6d5b19a3669848325bef0ca392..65a9d37fda0105a224bd4ec8c49c474f375f8693 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Użytkownik'; $wb['email_txt'] = 'E-mail dodany do czarnej listy'; $wb['add_new_record_txt'] = 'Dodaj wpis czarnej listy'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng index c750d9593773b8362f19dd6ab18885a76516acc9..43fab4d4f3f03c231fae2e175136b00b88ff3056 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng @@ -18,3 +18,4 @@ $wb['relayhost_password_txt'] = 'Hasło Relayhost'; $wb['mailbox_size_limit_txt'] = 'Limit wielkości skrzynki pocztowej'; $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng index 45b3f315cdf378a9bfffb77c7b64fd031de9bd90..d31d7857ebef3878b1713b63fd46e2871bed3187 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'Konfiguracja serwer'; $wb['server_name_txt'] = 'Serwer'; $wb['server_id_txt'] = 'id_serwera'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng index 8a825b55946b39c68fb62b2fd44339a978b00561..b7bc37de8befe80326adf9e65cd14011ca23c3f5 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng @@ -36,3 +36,4 @@ $wb['spam_admin_txt'] = 'Admin obsługi spamu'; $wb['message_size_limit_txt'] = 'Limit wielkości wiadomości'; $wb['banned_rulenames_txt'] = 'Zabronione nazwy zasad'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng index 43d9d414d6d48636df7802aebcfed05e6469c69e..906006e75fec3320ebe33954b42f5a0a461be8a9 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng @@ -7,3 +7,4 @@ $wb['banned_files_lover_txt'] = 'Przyjmuj zablokowane pliki'; $wb['bad_header_lover_txt'] = 'Przyjmuj złe nagłowki'; $wb['add_new_record_txt'] = 'Dodaj wpis plityki'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng index 656c29ea1abcd2c31a10fe63326f8bca88737182..8529e455c4db3f39f4a1954651ca4697edb7e846 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng @@ -6,3 +6,4 @@ $wb['email_txt'] = 'E-mail (wzór)'; $wb['fullname_txt'] = 'Nazwa'; $wb['local_txt'] = 'Lokalne'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng index dde2a62c6ae1ca99ed1b7ae9a49d28989a82644b..0951df528fe615193d9c8586c25c4e37bfc7cb45 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng @@ -8,3 +8,4 @@ $wb['fullname_txt'] = 'Nazwa'; $wb['email_txt'] = 'E-mail'; $wb['add_new_record_txt'] = 'Dodaj filtr spamu użytkownika'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng index be836015dbccef70847b84d7199f6e7d7ad55fc4..a6f2e4306dbb2b4ee031117afcc0cabe9d87c6b8 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng @@ -7,3 +7,4 @@ $wb['priority_txt'] = 'Priorytet'; $wb['active_txt'] = 'Aktywny'; $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna liczba wpisów białej lub czarnej listy została przekroczona.'; ?> + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng index 6517cf41a1e86272d49ab38f544fa4975d78f280..425a6fe35af7e760e8872247a27382db80157d24 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng @@ -7,3 +7,4 @@ $wb['rid_txt'] = 'Użytkownik'; $wb['email_txt'] = 'Adres e-mail dodany do białej listy'; $wb['add_new_record_txt'] = 'Dodaj wpis do białej listy'; ?> + diff --git a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng index 91dc11aae39782511556c1ac94459794dc36dc10..2cffcf1d165c788cf0400c3344f5f1ac9f21ed0f 100755 --- a/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_user_quota_stats_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm index 16ea6fa3cce84aa04f83c54dfa42c8f90707b903..f7fb4c70a22bc30af439194bceb06e9556006012 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -12,13 +12,13 @@
- - +

+
- - +

+
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 74f1771d0dd1ff1926e6c4152d678e4768148e61..2d7a6deb7cdd20acda59fd61d057559fa8dcadf4 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -1,4 +1,3 @@ -
@@ -16,7 +15,7 @@

-
{tmpl_var name="toolsarea_head_txt"} +
{tmpl_var name="toolsarea_head_txt"}
- +
- \ No newline at end of file + diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm index 30745dd15d8303bb39ae5e64596dda619034e8f5..8070e0092b42d8899b28d8a1b79556cc88077be8 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm @@ -33,10 +33,6 @@ readonly="readonly" /> -
- -  MB -
 MB diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 2d7e9a9e2dc5b63be566848f76537db791ac2294..11946aa0fd881c68cd323c63798111b80196b87c 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -103,7 +103,7 @@ class page_action extends tform_actions { $web_config = $app->getconf->get_server_config($client['default_webserver'], 'web'); // Set the webserver to the default server of the client - $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".intval($client['default_webserver'])); $app->tpl->setVar("server_id",""); unset($tmp); @@ -123,7 +123,7 @@ class page_action extends tform_actions { unset($ips); //* Fill the IPv6 select field with the IP addresses that are allowed for this client - $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; + $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $ips = $app->db->queryAllRecords($sql); $ip_select = ""; //$ip_select = ""; @@ -142,10 +142,10 @@ class page_action extends tform_actions { if(!empty($web_config['server_type'])) $server_type = $web_config['server_type']; if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm'; if($this->dataRecord['php'] == 'php-fpm'){ - $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); + $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); } if($this->dataRecord['php'] == 'fast-cgi'){ - $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); + $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); } $php_select = ""; if(is_array($php_records) && !empty($php_records)) { @@ -177,7 +177,7 @@ class page_action extends tform_actions { $web_config = $app->getconf->get_server_config($client['default_webserver'], 'web'); // Set the webserver to the default server of the client - $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".intval($client['default_webserver'])); $app->tpl->setVar("server_id",""); unset($tmp); @@ -196,7 +196,7 @@ class page_action extends tform_actions { $app->tpl->setVar("client_group_id",$client_select); //* Fill the IPv4 select field with the IP addresses that are allowed for this client - $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; + $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $ips = $app->db->queryAllRecords($sql); $ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"":""; //$ip_select = ""; @@ -211,7 +211,7 @@ class page_action extends tform_actions { unset($ips); //* Fill the IPv6 select field with the IP addresses that are allowed for this client - $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; + $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $ips = $app->db->queryAllRecords($sql); $ip_select = ""; //$ip_select = ""; @@ -230,10 +230,10 @@ class page_action extends tform_actions { if(!empty($web_config['server_type'])) $server_type = $web_config['server_type']; if($server_type == 'nginx' && $this->dataRecord['php'] == 'fast-cgi') $this->dataRecord['php'] = 'php-fpm'; if($this->dataRecord['php'] == 'php-fpm'){ - $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); + $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); } if($this->dataRecord['php'] == 'fast-cgi') { - $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : $client['default_webserver'])." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); + $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ".($this->id > 0 ? $this->dataRecord['server_id'] : intval($client['default_webserver']))." AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"); } $php_select = ""; if(is_array($php_records) && !empty($php_records)) { @@ -311,11 +311,11 @@ class page_action extends tform_actions { $this->dataRecord["server_id"] = $tmp["server_id"]; unset($tmp); } - $server_id = @$this->dataRecord["server_id"]; + $server_id = intval(@$this->dataRecord["server_id"]); } else { // Get the first server ID $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1"); - $server_id = $tmp['server_id']; + $server_id = intval($tmp['server_id']); } //* get global web config @@ -552,7 +552,7 @@ class page_action extends tform_actions { //* Check the website quota of the client if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u')); + $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u')); $webquota = $tmp["webquota"]; $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]); if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) { @@ -588,7 +588,7 @@ class page_action extends tform_actions { //* Check the website quota of the client if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u')); + $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND type = 'vhost' AND ".$app->tform->getAuthSQL('u')); $webquota = $tmp["webquota"]; $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]); if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) { diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php index 58e2474a542749bccf975abdc4c69424705c0886..c9bdd2787644cdef247197e5b61d7597283ce56b 100644 --- a/interface/web/sites/web_vhost_subdomain_edit.php +++ b/interface/web/sites/web_vhost_subdomain_edit.php @@ -211,7 +211,7 @@ class page_action extends tform_actions { if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------'; $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt); } - + //* Admin: If the logged in user is admin } else { @@ -410,6 +410,10 @@ class page_action extends tform_actions { if(in_array($check_folder, $forbidden_folders)) { $app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."
"; } + + // vhostsubdomains do not have a quota of their own + $this->dataRecord["hd_quota"] = 0; + // check for duplicate folder usage /* $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'"); @@ -431,26 +435,10 @@ class page_action extends tform_actions { if($client['limit_perl'] != 'y') $this->dataRecord['perl'] = '-'; if($client['limit_ruby'] != 'y') $this->dataRecord['ruby'] = '-'; if($client['limit_python'] != 'y') $this->dataRecord['python'] = '-'; - if($client['force_suexec'] != 'n') $this->dataRecord['suexec'] = '-'; + if($client['force_suexec'] != 'n') $this->dataRecord['suexec'] = 'y'; if($client['limit_hterror'] != 'y') $this->dataRecord['errordocs'] = '-'; if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = '-'; if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = '-'; - - //* Check the website quota of the client - if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u')); - $webquota = $tmp["webquota"]; - $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]); - if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) { - $max_free_quota = floor($client["limit_web_quota"] - $webquota); - if($max_free_quota < 0) $max_free_quota = 0; - $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB
"; - // Set the quota field to the max free space - $this->dataRecord["hd_quota"] = $max_free_quota; - } - unset($tmp); - unset($tmp_quota); - } //* Check the traffic quota of the client if(isset($_POST["traffic_quota"]) && $client["limit_traffic_quota"] > 0) { @@ -472,22 +460,6 @@ class page_action extends tform_actions { // Get the limits of the reseller $reseller = $app->db->queryOneRecord("SELECT limit_traffic_quota, limit_web_subdomain, default_webserver, limit_web_quota FROM client WHERE client_id = ".$client['parent_client_id']); - //* Check the website quota of the client - if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u')); - $webquota = $tmp["webquota"]; - $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]); - if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) { - $max_free_quota = floor($reseller["limit_web_quota"] - $webquota); - if($max_free_quota < 0) $max_free_quota = 0; - $app->tform->errorMessage .= $app->tform->lng("limit_web_quota_free_txt").": ".$max_free_quota." MB
"; - // Set the quota field to the max free space - $this->dataRecord["hd_quota"] = $max_free_quota; - } - unset($tmp); - unset($tmp_quota); - } - //* Check the traffic quota of the client if(isset($_POST["traffic_quota"]) && $reseller["limit_traffic_quota"] > 0) { $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u')); @@ -627,4 +599,4 @@ class page_action extends tform_actions { $page = new page_action; $page->onLoad(); -?> \ No newline at end of file +?> diff --git a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng index cff29d541a9a25397d54f9ef3d50cf8856997aed..59a146cbfd045e45581126f417a2a9ca52d178cf 100644 --- a/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/cz_strengthmeter.lng @@ -6,3 +6,5 @@ $wb['password_strength_3_txt'] = 'Dobré'; $wb['password_strength_4_txt'] = 'Silné'; $wb['password_strength_5_txt'] = 'Velmi silné'; ?> + + diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng index df85c9712415acaa8c7d6fc19ad6700c23420566..79d031777b2937d362a74944181872ae0945384b 100644 --- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng @@ -6,3 +6,4 @@ $wb['password_strength_3_txt'] = 'Dobre'; $wb['password_strength_4_txt'] = 'Silne'; $wb['password_strength_5_txt'] = 'Bardzo mocne'; ?> + diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css index ff56da40cb0163bf7811ef7e5f7053efc2fd3e4e..1820dbcdff09791a9b42c4b8f99d453993b79604 100644 --- a/interface/web/themes/default/css/styles.css +++ b/interface/web/themes/default/css/styles.css @@ -384,6 +384,8 @@ table.list .tbl_col_limit { } .pnl_listarea th[class^="tbl_col"] { cursor:pointer; } .pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; } +.pnl_listarea th.tbl_col_nosort { cursor:default; } +.pnl_listarea th.tbl_col_nosort:hover { background-position:0 0!important; } .pageForm_description { font-size: 12px; } diff --git a/interface/web/tools/form/interface_settings.tform.php b/interface/web/tools/form/interface_settings.tform.php index 52db8aae7642d12adae735423310cdb827e778c6..c93da46a52a9819c5a35088b18a34a79ebf2ee26 100644 --- a/interface/web/tools/form/interface_settings.tform.php +++ b/interface/web/tools/form/interface_settings.tform.php @@ -96,7 +96,9 @@ if($_SESSION["s"]["user"]["typ"] == 'admin') { } } } else { - $modules = $conf['interface_modules_enabled']; + $tmp = $app->db->queryOneRecord("SELECT * FROM sys_user where username = '".$_SESSION["s"]["user"]['username']."'"); + $modules = $tmp['modules']; + //$modules = $conf['interface_modules_enabled']; if($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { $modules .= ',client'; } diff --git a/interface/web/tools/import_vpopmail.php b/interface/web/tools/import_vpopmail.php index 6d223fa82edba9357023e98c9e2b6d910585c642..cb997941852c6b831c0bc6b9b50214eb9e183701 100644 --- a/interface/web/tools/import_vpopmail.php +++ b/interface/web/tools/import_vpopmail.php @@ -264,4 +264,4 @@ function start_import() { } -?> \ No newline at end of file +?> diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng index 66bcaf49ae1aca04f3c85100ce9bf0a87f1c74c9..480434e148268e5bcf605b420d9c7a6b723296c2 100644 --- a/interface/web/tools/lib/lang/cz.lng +++ b/interface/web/tools/lib/lang/cz.lng @@ -11,3 +11,5 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server'; $wb['PDNS Tupa'] = 'PowerDNS Tupa'; $wb['Interface'] = 'Rozhraní'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng index 8ebf71795c1cdf46acba844e8389337533d3163c..ba24f58f758665a41192c8c71c441ae2e7dd18a7 100644 --- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng @@ -21,3 +21,5 @@ $wb['import_forward_txt'] = 'Import forward'; $wb['import_user_filter_txt'] = 'Importovat uživatelský filter'; $wb['import_spamfilter_txt'] = 'Importovat spamový filter'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng index 5ebf1ec341c14fab8c44a4b2313f80041839eb1f..b1f32ec119ad1a61026ee170c6fe64b66d1fb793 100644 --- a/interface/web/tools/lib/lang/cz_index.lng +++ b/interface/web/tools/lib/lang/cz_index.lng @@ -2,3 +2,5 @@ $wb['page_head_txt'] = 'ISPConfig nástroje'; $wb['page_desc_txt'] = 'Změna uživatelského nastavení'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng index 507b7c3cbeda904058d89d4929dfed78d349fa87..1125032b1f966e200731da1c7498eb73438ad439 100644 --- a/interface/web/tools/lib/lang/cz_interface.lng +++ b/interface/web/tools/lib/lang/cz_interface.lng @@ -5,3 +5,5 @@ $wb['language_txt'] = 'Jazyk'; $wb['startmodule_txt'] = 'Výchozí modul po přihlášení'; $wb['app_theme_txt'] = 'Výchozí grafické téma'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng index 96d622e28ab2441253a5cc1885ef280fae89cc93..3b53ca06a5f53cea35cf89979fbc8b76603a35eb 100644 --- a/interface/web/tools/lib/lang/cz_resync.lng +++ b/interface/web/tools/lib/lang/cz_resync.lng @@ -11,3 +11,5 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy'; $wb['btn_start_txt'] = 'Zahájit'; $wb['btn_cancel_txt'] = 'Zrušit'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng index 0f037f1590b07a7fdf6b5dbf3d4f2f951f7045fa..53e9bd84426ad5e634df3f6b05c30e89860e9ad0 100644 --- a/interface/web/tools/lib/lang/cz_tpl_default.lng +++ b/interface/web/tools/lib/lang/cz_tpl_default.lng @@ -5,3 +5,5 @@ $wb['no_settings_txt'] = 'Nejsou žádné nastavení pro výchozí motiv.'; $wb['btn_start_txt'] = 'Uložit'; $wb['btn_cancel_txt'] = 'Zpět'; ?> + + diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng index dec46b7a06de801c358648cd73bdb30c8370e482..7490e52f98945775198015ef5a892f24566c9924 100644 --- a/interface/web/tools/lib/lang/cz_usersettings.lng +++ b/interface/web/tools/lib/lang/cz_usersettings.lng @@ -10,3 +10,5 @@ $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/tools/lib/lang/en_import_vpopmail.lng b/interface/web/tools/lib/lang/en_import_vpopmail.lng index d212867479f8b3172e5334257be372f479cde4e7..1e4dd281f73e4c5ef4a3c43f06a5e2347e1804b4 100644 --- a/interface/web/tools/lib/lang/en_import_vpopmail.lng +++ b/interface/web/tools/lib/lang/en_import_vpopmail.lng @@ -5,4 +5,4 @@ $wb['btn_start_txt'] = 'Start Import'; $wb['btn_connect_txt'] = 'Connect to remote server'; $wb['btn_cancel_txt'] = 'Cancel'; -?> \ No newline at end of file +?> diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng index 8a5468df37af8907879f5bce4fef32f5ab492770..a807a75c3d1cff75bddd612c5deeb84e5033eae2 100644 --- a/interface/web/tools/lib/lang/pl.lng +++ b/interface/web/tools/lib/lang/pl.lng @@ -4,10 +4,11 @@ $wb['Settings'] = 'Ustawienia'; $wb['ISPConfig Tools'] = 'Narzędzia ISPConfig'; $wb['Password and Language'] = 'Hasło i język'; $wb['ispconfig_tools_note'] = 'Ten moduł pozwala na zmianę hasła i języka oraz na ponowną synchronizację rekordów DNS.'; -$wb['Resync'] = 'Resync'; -$wb['Sync Tools'] = 'Sync Tools'; +$wb['Resync'] = 'Resynchronizuj'; +$wb['Sync Tools'] = 'Narzędzia do synchronizacji'; $wb['Import'] = 'Import'; -$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail'; +$wb['ISPConfig 3 mail'] = 'Poczta ISPConfig 3'; $wb['PDNS Tupa'] = 'PowerDNS Tupa'; -$wb['Interface'] = 'Interface'; +$wb['Interface'] = 'Interfejs'; ?> + diff --git a/interface/web/tools/lib/lang/pl_import_ispconfig.lng b/interface/web/tools/lib/lang/pl_import_ispconfig.lng index ce47c4da4d24b0709be26b5ec28b82ef2ec33b79..bae9417da15247901cc5d59037b9c8c6eb1c1f61 100644 --- a/interface/web/tools/lib/lang/pl_import_ispconfig.lng +++ b/interface/web/tools/lib/lang/pl_import_ispconfig.lng @@ -1,23 +1,24 @@ + diff --git a/interface/web/tools/lib/lang/pl_index.lng b/interface/web/tools/lib/lang/pl_index.lng index a3ef38f21934a9d02669da2c2722feefc3f64325..0ff1c84dc4db92d4351279fec4201be88e5a7fe6 100644 --- a/interface/web/tools/lib/lang/pl_index.lng +++ b/interface/web/tools/lib/lang/pl_index.lng @@ -1,4 +1,5 @@ + diff --git a/interface/web/tools/lib/lang/pl_interface.lng b/interface/web/tools/lib/lang/pl_interface.lng index aab4fc89ffe72aab7529d850c4e1dc3bbd92dc77..7775fe861fc1d98a26bd8319245f8fcc085375bd 100644 --- a/interface/web/tools/lib/lang/pl_interface.lng +++ b/interface/web/tools/lib/lang/pl_interface.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng index ed9476720842d4438285ad600dd1992f1760eb82..e69bec4e938f7da9c8aa72695e68ed1c0374083e 100644 --- a/interface/web/tools/lib/lang/pl_resync.lng +++ b/interface/web/tools/lib/lang/pl_resync.lng @@ -1,13 +1,14 @@ + diff --git a/interface/web/tools/lib/lang/pl_tpl_default.lng b/interface/web/tools/lib/lang/pl_tpl_default.lng index c06246304d016300490b28f50eb168cff4cdbc4e..84c90f6761066ba51d3700fe3b6f99e5e85379aa 100644 --- a/interface/web/tools/lib/lang/pl_tpl_default.lng +++ b/interface/web/tools/lib/lang/pl_tpl_default.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng index 31b062a5dea869110b5ca43fa22264d8f164c3f4..2dbba9816b7d44d7a8f4ac94f18c63f52f10b3fa 100644 --- a/interface/web/tools/lib/lang/pl_usersettings.lng +++ b/interface/web/tools/lib/lang/pl_usersettings.lng @@ -5,8 +5,9 @@ $wb['language_txt'] = 'Język'; $wb['password_mismatch'] = 'Hasła nie pasują do siebie.'; $wb['Form to edit the user password and language.'] = 'Formularz do edycji języka i hasła użytkownika.'; $wb['Settings'] = 'Ustawienia'; -$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'] = 'Wygeneruj hasło'; +$wb['repeat_password_txt'] = 'Powtórz hasło'; +$wb['password_mismatch_txt'] = 'Hasła się nie zgadzają'; +$wb['password_match_txt'] = 'Hasła się zgadzają'; ?> + diff --git a/interface/web/tools/lib/module.conf.php b/interface/web/tools/lib/module.conf.php index c6b6aaeb87f18fdab4e2d92a193a0096025bfa5a..274e6aa3e1d641910aaa37e719318c5e60a50150 100644 --- a/interface/web/tools/lib/module.conf.php +++ b/interface/web/tools/lib/module.conf.php @@ -32,7 +32,7 @@ $items[] = array( 'title' => 'Interface', 'link' => 'tools/interface_settings.php', 'html_id' => 'interface_settings'); -include_once(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php'); +if(file_exists(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php')) include_once(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php'); $module['nav'][] = array( 'title' => 'Interface', 'open' => 1, diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm index 8a786617c29eed6434fc3755c2bb0290fd792c22..ade9476943acb525ef95e033c5fa1002800e0265 100644 --- a/interface/web/tools/templates/import_vpopmail.htm +++ b/interface/web/tools/templates/import_vpopmail.htm @@ -50,4 +50,4 @@
- \ No newline at end of file + diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng index 4167e14a8a150090ecfb1aa6738fb8a6abf17760..21224389a858b483872fa40b83b893650f9ec8be 100644 --- a/interface/web/vm/lib/lang/cz.lng +++ b/interface/web/vm/lib/lang/cz.lng @@ -5,3 +5,5 @@ $wb['VM Templates'] = 'VM Templates'; $wb['IP addresses'] = 'IP addresses'; $wb['OpenVZ'] = 'OpenVZ'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng index 3e2e3e0b84a82c5520e13f71eba231d40fe25eb1..2930fff65cf4738794991c2b7a8c569b20800826 100644 --- a/interface/web/vm/lib/lang/cz_openvz_action.lng +++ b/interface/web/vm/lib/lang/cz_openvz_action.lng @@ -14,3 +14,5 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng index 6016681df89f13323f60379acff5e7abd98f4c77..6afda02718ae432985307e38c8bea32b92b4623a 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng @@ -7,3 +7,5 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.'; $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng index e6a3a68c2c3b9cad34982f035b86d4446ea68439..e392e9c970107b173fa43af39f98af1c40aaab4c 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng @@ -5,3 +5,5 @@ $wb['ip_address_txt'] = 'IP address'; $wb['reserved_txt'] = 'Reserved'; $wb['vm_id_txt'] = 'VM'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng index 72838a20de8c8ff4944856821cfd1786cde17674..12f22178d04bb07f612c70557c384fec5af3bfe9 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng @@ -9,3 +9,5 @@ $wb['template_name_error_empty'] = 'Template name is empty.'; $wb['template_file_error_empty'] = 'Template filename is empty.'; $wb['Template'] = 'Šablona'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng index 7705a4d18f342e0d87d90f049fae07fc75efc721..264d944d2cc922805993b0045ac84d02c52815a3 100644 --- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng @@ -6,3 +6,5 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Exists on all servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng index 12c80bd6c121d85a5ab5cd906bffe7debd366b87..6f1f394d873b3c1313ac0bc3afb806d2ceab5971 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template.lng @@ -91,3 +91,5 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Šablona'; $wb['Advanced'] = 'Pokročilý'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng index 89c11ef5d1926da64f4f787a778b7c0f9793149f..fc3198560bfe0ed7e1d19afa49d453b4cf50e3ac 100644 --- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng @@ -3,3 +3,5 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Aktivní'; $wb['template_name_txt'] = 'Název šablony'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng index adfa56f0d531654ee4153a93bdd1b9cdd4dcf384..aeed11933e36f638fedef46c6445dd289370cc51 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng @@ -38,3 +38,5 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Pokročilý'; ?> + + diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng index 1371c4b70ea40b9670804d290c0b9f96f32cc05c..509764831fa3bb04e6667b314aff26a812b05020 100644 --- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng @@ -8,3 +8,5 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> + + diff --git a/interface/web/vm/lib/lang/pl.lng b/interface/web/vm/lib/lang/pl.lng index 4167e14a8a150090ecfb1aa6738fb8a6abf17760..5c1ab5822999a2616d1b6792b084893848cff580 100644 --- a/interface/web/vm/lib/lang/pl.lng +++ b/interface/web/vm/lib/lang/pl.lng @@ -5,3 +5,4 @@ $wb['VM Templates'] = 'VM Templates'; $wb['IP addresses'] = 'IP addresses'; $wb['OpenVZ'] = 'OpenVZ'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_action.lng b/interface/web/vm/lib/lang/pl_openvz_action.lng index 52f73285824f2d6c4107d8c9eec5980a251d505c..71e7263f9d5b28773b7735ae115df12209046d9e 100644 --- a/interface/web/vm/lib/lang/pl_openvz_action.lng +++ b/interface/web/vm/lib/lang/pl_openvz_action.lng @@ -14,3 +14,4 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.'; $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_ip.lng b/interface/web/vm/lib/lang/pl_openvz_ip.lng index 6016681df89f13323f60379acff5e7abd98f4c77..67f688576ac762561936a46e18120b84d7033f28 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ip.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ip.lng @@ -7,3 +7,4 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.'; $wb['ip_error_unique'] = 'This IP address does already exist.'; $wb['IP address'] = 'IP address'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng index e6a3a68c2c3b9cad34982f035b86d4446ea68439..365844325eecd8a27c7369ede26ab68125d7286e 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ip_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ip_list.lng @@ -1,7 +1,8 @@ + diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng index 256750f19a0cf4d459214a327d3f86773f9312d7..bfeb2990887a01281a27b62b467b929f6e3a775d 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate.lng @@ -9,3 +9,4 @@ $wb['template_name_error_empty'] = 'Template name is empty.'; $wb['template_file_error_empty'] = 'Template filename is empty.'; $wb['Template'] = 'Template'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng index 6471ec0e277b63b6e110ef8deef7ca35511a2a52..df01680e16c89ba24ec3aef446728a2e1a8103a1 100644 --- a/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_ostemplate_list.lng @@ -6,3 +6,4 @@ $wb['server_id_txt'] = 'Server'; $wb['allservers_txt'] = 'Exists on all servers'; $wb['ostemplate_id_txt'] = 'ID'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng index d285512dcab15fffb604da4ce421f5e5e056d485..0887164d393bf9bfbc9f785e63aa0d3cc5200e66 100644 --- a/interface/web/vm/lib/lang/pl_openvz_template.lng +++ b/interface/web/vm/lib/lang/pl_openvz_template.lng @@ -91,3 +91,4 @@ $wb['swappages_error_empty'] = 'Swappages is empty.'; $wb['Template'] = 'Template'; $wb['Advanced'] = 'Advanced'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_template_list.lng b/interface/web/vm/lib/lang/pl_openvz_template_list.lng index de4045c36a75506c0452b17c1e9d61080b534ce2..6e4d911c6bbad29d51bd305a60c8b09cec2ca2f5 100644 --- a/interface/web/vm/lib/lang/pl_openvz_template_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_template_list.lng @@ -3,3 +3,4 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template'; $wb['active_txt'] = 'Active'; $wb['template_name_txt'] = 'Template name'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng index f2be022dd0ae060ae8688cdcaa356b4200185d7c..4698fe681b4101b170b772e6a41517b13b80f587 100644 --- a/interface/web/vm/lib/lang/pl_openvz_vm.lng +++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng @@ -38,3 +38,4 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.'; $wb['Virtual server'] = 'Virtual server'; $wb['Advanced'] = 'Advanced'; ?> + diff --git a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng index 2238e2b8f4fa4db72f1b785d6e0849e356922faf..a534a65f203afb84fd5882c143d5c336e04c7ba6 100644 --- a/interface/web/vm/lib/lang/pl_openvz_vm_list.lng +++ b/interface/web/vm/lib/lang/pl_openvz_vm_list.lng @@ -8,3 +8,4 @@ $wb['hostname_txt'] = 'Hostname'; $wb['ip_address_txt'] = 'IP address'; $wb['veid_txt'] = 'VEID'; ?> + diff --git a/interface/web/vm/list/openvz_vm.list.php b/interface/web/vm/list/openvz_vm.list.php index 016165b0f7805185994ca92730658ad685b6733a..81a7c8e1e565edb227a83d95015f44112be0f808 100644 --- a/interface/web/vm/list/openvz_vm.list.php +++ b/interface/web/vm/list/openvz_vm.list.php @@ -59,7 +59,7 @@ $liste["item"][] = array( 'field' => "active", $liste["item"][] = array( 'field' => "veid", 'datatype' => "VARCHAR", 'formtype' => "TEXT", - 'op' => "==", + 'op' => "=", 'prefix' => "", 'suffix' => "", 'width' => "", diff --git a/interface/web/vm/openvz_vm_list.php b/interface/web/vm/openvz_vm_list.php index 874feabbfab4791d23b5d115faa4441cba8f93d4..02d165114465261df0d6dc67174fbec285270112 100644 --- a/interface/web/vm/openvz_vm_list.php +++ b/interface/web/vm/openvz_vm_list.php @@ -47,7 +47,7 @@ $app->auth->check_module_permissions('vm'); $app->uses('listform_actions'); // $app->listform_actions->SQLOrderBy = 'ORDER BY company_name, contact_name, client_id'; -// $app->listform_actions->SQLExtWhere = "limit_client = 0"; +//$app->listform_actions->SQLExtWhere = ""; $app->listform_actions->onLoad(); diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index bf02a7bc460337cc1f2f60493853a08892c04042..5fb0f2c1181d3ad09155cf8bbae96401b3ccccd0 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -67,6 +67,8 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m Alias /awstats-icon "/usr/share/awstats/icon" +NameVirtualHost *:80 +NameVirtualHost *:443 NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"} diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master index fc3f0870ecbf9da04ac3c2be9ca4ae2b3d90a96d..9f8ae8806dbfde15152824cd22c94a4c75f610b3 100644 --- a/server/conf/nginx_apps.vhost.master +++ b/server/conf/nginx_apps.vhost.master @@ -46,7 +46,7 @@ server { fastcgi_pass unix:{fpm_socket}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_script_name; + #fastcgi_param PATH_INFO $fastcgi_script_name; fastcgi_buffer_size 128k; fastcgi_buffers 256 4k; fastcgi_busy_buffers_size 256k; diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index e9327eb8bb2db26d59831cc82ed058bf4cc0a5b6..cf33b6feb1de597b606b72e58a5e9e827d140a84 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -13,7 +13,11 @@ DocumentRoot + + DocumentRoot + DocumentRoot + @@ -242,10 +246,10 @@ Action php5-fcgi /php5-fcgi Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} - FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -host 127.0.0.1: -pass-header Authorization + FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1: -pass-header Authorization - FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -socket -pass-header Authorization + FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket -pass-header Authorization @@ -254,11 +258,11 @@ RewriteEngine on RewriteCond %{HTTP_HOST} ^$ [NC] - RewriteRule ^(.*)$ http://$1 [R=301,L] + RewriteRule ^(.*)$ https://$1 [R=301,L] RewriteCond %{HTTP_HOST} ^$ [NC] - RewriteRule ^(.*)$ http://$1 [R=301,L] + RewriteRule ^(.*)$ https://$1 [R=301,L] RewriteCond %{HTTP_HOST} $ [NC] diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php index 5a5c3263639c4c60e35dcef5cbea6c7f953099ad..39f71ce51a83ba7e4c7d0c8e5a2a3167cd5a8d16 100644 --- a/server/lib/classes/aps_installer.inc.php +++ b/server/lib/classes/aps_installer.inc.php @@ -445,6 +445,11 @@ class ApsInstaller extends ApsBase $this->file_owner_user = $owner_res['system_user']; $this->file_owner_group = $owner_res['system_group']; exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath)); + + //* Chown stats directory back + if(is_dir($this->local_installpath.'stats')) { + exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats')); + } } } catch(Exception $e) @@ -579,6 +584,11 @@ class ApsInstaller extends ApsBase // The install succeeded, chown newly created files too exec('chown -R '.$this->file_owner_user.':'.$this->file_owner_group.' '.escapeshellarg($this->local_installpath)); + //* Chown stats directory back + if(is_dir($this->local_installpath.'stats')) { + exec('chown -R root:root '.escapeshellarg($this->local_installpath.'stats')); + } + $app->dbmaster->query('UPDATE aps_instances SET instance_status = "'.INSTANCE_SUCCESS.'" WHERE id = "'.$app->db->quote($task['instance_id']).'";'); } @@ -707,4 +717,4 @@ class ApsInstaller extends ApsBase unset($sxe); } } -?> \ No newline at end of file +?> diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 09d6640e11cc18b88ea124a7ce64f6760d6f00de..2974da09c9bcdd5812a5cbf725b9ee11a32060fa 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -61,7 +61,8 @@ class db extends mysqli parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName); $try = 0; - while(!is_null($this->connect_error) && $try < 10) { + //while(!is_null($this->connect_error) && $try < 10) { + while(mysqli_connect_error() && $try < 10) { if($try > 8) sleep(5); elseif($try > 0) sleep(1); @@ -71,7 +72,8 @@ class db extends mysqli parent::__construct($this->dbHost, $this->dbUser, $this->dbPass,$this->dbName); } - if(is_null($this->connect_error)) $this->isConnected = true; + //if(is_null($this->connect_error)) $this->isConnected = true; + if(!mysqli_connect_error()) $this->isConnected = true; $this->setCharacterEncoding(); } @@ -89,6 +91,7 @@ class db extends mysqli public function updateError($location) { global $app; + /* if(!is_null($this->connect_error)) { $this->errorNumber = $this->connect_errno; $this->errorMessage = $this->connect_error; @@ -96,6 +99,14 @@ 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) { diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php index afef438ba69209c8f6b1c16da356f5acfe20b9b7..d13317edba69ae8310b9365cc4c56b0fabb04381 100644 --- a/server/lib/classes/plugins.inc.php +++ b/server/lib/classes/plugins.inc.php @@ -43,7 +43,7 @@ class plugins { global $app,$conf; $subPath = 'plugins-enabled'; - if ($type == 'core') $subPath = 'plugins-core'; + //if ($type == 'core') $subPath = 'plugins-core'; $plugins_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div']; $tmp_plugins = array(); diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index 07bcc64f054a1c1cc379399a4611ee539f343710..1de54e29fff8e1938ca62d65a1eadd80ad5a739f 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1539,7 +1539,8 @@ class system{ } function is_mounted($mountpoint){ - $cmd = 'df 2>/dev/null | grep " '.$mountpoint.'$"'; + //$cmd = 'df 2>/dev/null | grep " '.$mountpoint.'$"'; + $cmd = 'mount 2>/dev/null | grep " on '.$mountpoint.' type "'; exec($cmd, $output, $return_var); return $return_var == 0 ? true : false; } diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 99ba79b39578d3e38dca8deda05a32ddeb34ad51..8df1dcf97ee84177f7c84a550578c9b5b23f7d6c 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -551,7 +551,7 @@ class apache2_plugin { exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); //* Change the home directory and group of the website user - $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod'; + $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' ; usermod'; $command .= ' --home '.escapeshellcmd($data['new']['document_root']); $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; @@ -740,8 +740,8 @@ class apache2_plugin { exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path); } // end copy error docs - // Set the quota for the user - if($username != '' && $app->system->is_user($username)) { + // Set the quota for the user, but only for vhosts, not vhostsubdomains + if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') { if($data['new']['hd_quota'] > 0) { $blocks_soft = $data['new']['hd_quota'] * 1024; $blocks_hard = $blocks_soft + 1024; @@ -911,6 +911,15 @@ class apache2_plugin { if(!stristr($data['new']['custom_php_ini'],'open_basedir') && $data['new']['php'] == 'suphp') { $data['new']['custom_php_ini'] .= "\nopen_basedir = '".$data['new']['php_open_basedir']."'\n"; } + + $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi'); + + if(trim($data['new']['fastcgi_php_version']) != ''){ + list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version'])); + if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir); + if(substr($custom_fastcgi_php_ini_dir,-1) == '/') $custom_fastcgi_php_ini_dir = substr($custom_fastcgi_php_ini_dir,0,-1); + } + //* Create custom php.ini if(trim($data['new']['custom_php_ini']) != '') { $has_custom_php_ini = true; @@ -919,8 +928,14 @@ class apache2_plugin { if($data['new']['php'] == 'mod') { $master_php_ini_path = $web_config['php_ini_path_apache']; } else { - if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) { - $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"]; + if($data["new"]['php'] == 'fast-cgi') { + if(trim($data['new']['fastcgi_php_version']) != '' && file_exists($custom_fastcgi_php_ini_dir)){ + $master_php_ini_path = $custom_fastcgi_php_ini_dir; + } elseif(file_exists($fastcgi_config["fastcgi_phpini_path"])){ + $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"]; + } else { + $master_php_ini_path = $web_config['php_ini_path_cgi']; + } } else { $master_php_ini_path = $web_config['php_ini_path_cgi']; } @@ -1190,7 +1205,6 @@ class apache2_plugin { */ if ($data['new']['php'] == 'fast-cgi') { - $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi'); $fastcgi_starter_path = str_replace('[system_user]',$data['new']['system_user'],$fastcgi_config['fastcgi_starter_path']); $fastcgi_starter_path = str_replace('[client_id]',$client_id,$fastcgi_starter_path); @@ -1213,8 +1227,6 @@ class apache2_plugin { // Support for multiple PHP versions (FastCGI) if(trim($data['new']['fastcgi_php_version']) != ''){ $default_fastcgi_php = false; - list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version'])); - if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir); if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/'; } else { $default_fastcgi_php = true; @@ -1261,7 +1273,6 @@ class apache2_plugin { } else { //remove the php fastgi starter script if available if ($data['old']['php'] == 'fast-cgi') { - $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi'); $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$fastcgi_config['fastcgi_starter_path']); $fastcgi_starter_path = str_replace('[client_id]',$client_id,$fastcgi_starter_path); if($data['old']['type'] == 'vhost') { @@ -1407,9 +1418,15 @@ class apache2_plugin { if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) { $tmp_vhost_arr = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443'); if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); - if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $ipv4_ssl_alias_seo_redirects = $alias_seo_redirects; + if(is_array($ipv4_ssl_alias_seo_redirects) && !empty($ipv4_ssl_alias_seo_redirects)){ + for($i=0;$i 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $ipv4_ssl_alias_seo_redirects); $vhosts[] = $tmp_vhost_arr; - unset($tmp_vhost_arr); + unset($tmp_vhost_arr, $ipv4_ssl_alias_seo_redirects); $app->log('Enable SSL for: '.$domain,LOGLEVEL_DEBUG); } @@ -1437,9 +1454,15 @@ class apache2_plugin { if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) { $tmp_vhost_arr = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443'); if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules); - if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects); + $ipv6_ssl_alias_seo_redirects = $alias_seo_redirects; + if(is_array($ipv6_ssl_alias_seo_redirects) && !empty($ipv6_ssl_alias_seo_redirects)){ + for($i=0;$i 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $ipv6_ssl_alias_seo_redirects); $vhosts[] = $tmp_vhost_arr; - unset($tmp_vhost_arr); + unset($tmp_vhost_arr, $ipv6_ssl_alias_seo_redirects); $app->log('Enable SSL for IPv6: '.$domain,LOGLEVEL_DEBUG); } } @@ -1510,13 +1533,13 @@ class apache2_plugin { } //* Create .htaccess and .htpasswd file for website statistics - if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) { - if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats'); - $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user"; - $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file); - $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755); - unset($ht_file); - } + //if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) { + if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats'); + $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user"; + $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file); + $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755); + unset($ht_file); + //} if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) { if(trim($data['new']['stats_password']) != '') { @@ -1641,6 +1664,7 @@ class apache2_plugin { $app->uses('getconf'); $app->uses('system'); $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); + $fastcgi_config = $app->getconf->get_server_config($conf['server_id'], 'fastcgi'); if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') $app->system->web_folder_protection($data['old']['document_root'],false); @@ -1703,10 +1727,12 @@ class apache2_plugin { if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){ if(is_array($log_folders) && !empty($log_folders)){ foreach($log_folders as $log_folder){ - if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null'); } } else { - if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null'); } } @@ -1820,13 +1846,13 @@ class apache2_plugin { //remove the php fastgi starter script if available if ($data['old']['php'] == 'fast-cgi') { - $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$web_config['fastcgi_starter_path']); + $fastcgi_starter_path = str_replace('[system_user]',$data['old']['system_user'],$fastcgi_config['fastcgi_starter_path']); if($data['old']['type'] == 'vhost') { if (is_dir($fastcgi_starter_path)) { exec('rm -rf '.$fastcgi_starter_path); } } else { - $fcgi_starter_script = $fastcgi_starter_path.$web_config['fastcgi_starter_script'].'_web'.$data['old']['domain_id']; + $fcgi_starter_script = $fastcgi_starter_path.$fastcgi_config['fastcgi_starter_script'].'_web'.$data['old']['domain_id']; if (file_exists($fcgi_starter_script)) { exec('rm -f '.$fcgi_starter_script); } @@ -1886,7 +1912,7 @@ class apache2_plugin { if($data['old']['type'] == 'vhost') { //delete the web user - $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel'; + $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' ; userdel'; $command .= ' '.escapeshellcmd($data['old']['system_user']); exec($command); if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php index f954e45e6eaac1edc3a12520c9451f2b105d6e82..3cec452c17bd6ef554cadbf74364222e43c57ff7 100644 --- a/server/plugins-available/apps_vhost_plugin.inc.php +++ b/server/plugins-available/apps_vhost_plugin.inc.php @@ -81,7 +81,12 @@ class apps_vhost_plugin { if($web_config['server_type'] == 'apache'){ // Dont just copy over the virtualhost template but add some custom settings - $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master"); + if(file_exists($conf["rootpath"]."/conf-custom/apache_apps.vhost.master")) { + $content = file_get_contents($conf["rootpath"]."/conf-custom/apache_apps.vhost.master"); + } else { + $content = file_get_contents($conf["rootpath"]."/conf/apache_apps.vhost.master"); + } + $vhost_conf_dir = $web_config['vhost_conf_dir']; $vhost_conf_enabled_dir = $web_config['vhost_conf_enabled_dir']; @@ -110,7 +115,11 @@ class apps_vhost_plugin { if($web_config['server_type'] == 'nginx'){ // Dont just copy over the virtualhost template but add some custom settings - $content = file_get_contents($conf["rootpath"]."/conf/nginx_apps.vhost.master"); + if(file_exists($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master")) { + $content = file_get_contents($conf["rootpath"]."/conf-custom/nginx_apps.vhost.master"); + } else { + $content = file_get_contents($conf["rootpath"]."/conf/nginx_apps.vhost.master"); + } $vhost_conf_dir = $web_config['nginx_vhost_conf_dir']; $vhost_conf_enabled_dir = $web_config['nginx_vhost_conf_enabled_dir']; @@ -153,7 +162,12 @@ class apps_vhost_plugin { // PHP-FPM // Dont just copy over the php-fpm pool template but add some custom settings - $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master"); + if(file_exists($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master")) { + $fpm_content = file_get_contents($conf["rootpath"]."/conf-custom/apps_php_fpm_pool.conf.master"); + } else { + $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master"); + } + $fpm_content = str_replace('{fpm_pool}', 'apps', $fpm_content); //$fpm_content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $fpm_content); $fpm_content = str_replace('{fpm_socket}', $fpm_socket, $fpm_content); diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php index 3727f8273038d837188c893a32343dd14741d015..78be959e6d0ae452c44d4cc7fe67c1be767923ba 100644 --- a/server/plugins-available/backup_plugin.inc.php +++ b/server/plugins-available/backup_plugin.inc.php @@ -87,8 +87,10 @@ class backup_plugin { include('lib/mysql_clientdb.conf'); if(file_exists($backup_dir.'/'.$backup['filename'])) { - $parts = explode('_',$backup['filename']); - $db_name = $parts[1]; + //$parts = explode('_',$backup['filename']); + //$db_name = $parts[1]; + preg_match('@^db_(.+)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql\.gz$@', $backup['filename'], $matches); + $db_name = $matches[1]; $command = "gunzip --stdout ".escapeshellarg($backup_dir.'/'.$backup['filename'])." | mysql -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' '".$db_name."'"; exec($command); } diff --git a/server/plugins-available/bind_dlz_plugin.inc.php b/server/plugins-available/bind_dlz_plugin.inc.php index b0ca8704e6847b18d47a62f94ddc9203aaccefce..28aff946c90d604f318fa03570a51a4d6ef43428 100644 --- a/server/plugins-available/bind_dlz_plugin.inc.php +++ b/server/plugins-available/bind_dlz_plugin.inc.php @@ -125,13 +125,13 @@ class bind_dlz_plugin { $ttl = $data["new"]["ttl"]; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; - $_db->query("INSERT INTO records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ". + $app->db->query("INSERT INTO named.records (zone, ttl, type, primary_ns, resp_contact, serial, refresh, retry, expire, minimum, ispconfig_id) VALUES ". "('$origin', $ttl, 'SOA', '{$data["new"]["ns"]}', '{$data["new"]["mbox"]}', '{$serial["serial"]}', '{$serial["refresh"]}'," . "'{$serial["retry"]}', '{$serial["expire"]}', '{$serial["minimum"]}', $ispconfig_id)"); - unset($_db); + //unset($_db); } function soa_update($event_name,$data) @@ -153,13 +153,13 @@ class bind_dlz_plugin { $ttl = $data["new"]["ttl"]; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; - $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, primary_ns = '{$data["new"]["ns"]}', resp_contact = '{$data["new"]["mbox"]}', ". + $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, primary_ns = '{$data["new"]["ns"]}', resp_contact = '{$data["new"]["mbox"]}', ". "serial = '{$serial["serial"]}', refresh = '{$serial["refresh"]}', retry = '{$serial["retry"]}', expire = '{$serial["expire"]}', ". "minimum = '{$serial["minimum"]}' WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'"); - unset($_db); + //unset($_db); } else { @@ -185,11 +185,11 @@ class bind_dlz_plugin { { global $app, $conf; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; - $_db->query("DELETE FROM records WHERE ispconfig_id = {$data["old"]["id"]}"); - unset($_db); + $app->db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]}"); + //unset($_db); } function rr_insert($event_name,$data) @@ -246,18 +246,18 @@ class bind_dlz_plugin { $ttl = $data["new"]["ttl"]; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; if ($type == 'MX') { - $_db->query("INSERT INTO records (zone, ttl, type, host, mx_priority, data, ispconfig_id)". + $app->db->query("INSERT INTO named.records (zone, ttl, type, host, mx_priority, data, ispconfig_id)". " VALUES ('$origin', $ttl, '$type', '$name', {$data["new"]["aux"]}, '$content', $ispconfig_id)"); } else { - $_db->query("INSERT INTO records (zone, ttl, type, host, data, ispconfig_id)". + $app->db->query("INSERT INTO named.records (zone, ttl, type, host, data, ispconfig_id)". " VALUES ('$origin', $ttl, '$type', '$name', '$content', $ispconfig_id)"); } - unset($_db); + //unset($_db); } function rr_update($event_name,$data) @@ -321,18 +321,18 @@ class bind_dlz_plugin { $ttl = $data["new"]["ttl"]; $prio = (int)$data["new"]["aux"]; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; if ($type == 'MX') { - $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', mx_priority = $prio, ". + $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', mx_priority = $prio, ". "data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'"); } else { - $_db->query("UPDATE records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', ". + $app->db->query("UPDATE named.records SET zone = '$origin', ttl = $ttl, type = '$type', host = '$name', ". "data = '$content' WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'"); } - unset($_db); + //unset($_db); } else { $this->rr_insert($event_name,$data); } @@ -342,11 +342,11 @@ class bind_dlz_plugin { function rr_delete($event_name,$data) { global $app, $conf; - $_db = clone $app->db; - $_db->dbName = 'named'; + //$_db = clone $app->db; + //$_db->dbName = 'named'; - $_db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]} AND type != 'SOA'"); - unset($_db); + $app->db->query("DELETE FROM named.records WHERE ispconfig_id = {$data["old"]["id"]} AND type != 'SOA'"); + //unset($_db); } } // end class ?> diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 49ca191ed546dda7b99528109008ff152f1467bb..e4f6e6c86fb2144f1f981721f681e12a053b8dd2 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -141,10 +141,10 @@ class bind_plugin { if($data['old']['origin'] != $data['new']['origin']) { //TODO : change this when distribution information has been integrated into server record if (file_exists('/etc/gentoo-release')) { - $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)); + $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1)); } else { - $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)); + $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1)); } if(is_file($filename)) unlink($filename); diff --git a/server/plugins-available/ftpuser_base_plugin.inc.php b/server/plugins-available/ftpuser_base_plugin.inc.php index 8cd2aa2dc1171bcee54d2e94dfe7090054d02cb4..1b4a016a8cb845b694ffbb171f6a3b60015d2a96 100644 --- a/server/plugins-available/ftpuser_base_plugin.inc.php +++ b/server/plugins-available/ftpuser_base_plugin.inc.php @@ -75,15 +75,15 @@ class ftpuser_base_plugin { $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id'])); //* Check if the resulting path is inside the docroot - if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) { + if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) { $app->log('User dir is outside of docroot.',LOGLEVEL_WARN); return false; } exec('mkdir -p '.escapeshellcmd($data['new']['dir'])); exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']); - - $app->log("Added ftpuser_dir: ".$data['new']['dir'],LOGLEVEL_DEBUG); + + $app->log("Added ftpuser_dir: ".$data['new']['dir'],LOGLEVEL_DEBUG); } } @@ -97,7 +97,7 @@ class ftpuser_base_plugin { $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id'])); //* Check if the resulting path is inside the docroot - if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) { + if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) { $app->log('User dir is outside of docroot.',LOGLEVEL_WARN); return false; } diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php index 5dbc65ebd3e0a695237378fc62363a25ce3dd1b4..6d55dd32bf3f50b8e5ccd73505c43ccf21589b5e 100644 --- a/server/plugins-available/maildeliver_plugin.inc.php +++ b/server/plugins-available/maildeliver_plugin.inc.php @@ -167,19 +167,30 @@ class maildeliver_plugin { } } + $app->log("Found " . count($addresses) . " addresses.",LOGLEVEL_DEBUG); + + $alias_addresses = array(); + $email_parts = explode('@',$data["new"]["email"]); $sql = "SELECT * FROM mail_forwarding WHERE type = 'aliasdomain' AND destination = '@".$app->db->quote($email_parts[1])."'"; $records = $app->db->queryAllRecords($sql); if(is_array($records) && count($records) > 0) { + $app->log("Found " . count($records) . " records (aliasdomains).",LOGLEVEL_DEBUG); foreach($records as $rec) { $aliasdomain = substr($rec['source'],1); foreach($addresses as $email) { $email_parts = explode('@',$email); - $addresses[] = $email_parts[0].'@'.$aliasdomain; + $alias_addresses[] = $email_parts[0].'@'.$aliasdomain; } } } + $app->log("Found " . count($addresses) . " addresses at all.",LOGLEVEL_DEBUG); + + $addresses = array_unique(array_merge($addresses, $alias_addresses)); + + $app->log("Found " . count($addresses) . " unique addresses at all.",LOGLEVEL_DEBUG); + $address_str = ''; if(is_array($addresses) && count($addresses) > 0) { $address_str .= ':addresses ['; diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index ce6bb5ab193ae5bbb7ff569538de42922997c6dd..7fa2b7b2327f9f5300e5ca3f047438dcbe68ea10 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -122,6 +122,47 @@ class mysql_clientdb_plugin { return $success; } + + function drop_or_revoke_user($database_id, $user_id, $host_list){ + global $app; + + // set to all hosts if none given + if(trim($host_list) == '') $host_list = '%'; + + $db_user_databases = $app->db->queryAllRecords("SELECT * FROM web_database WHERE (database_user_id = ".$user_id." OR database_ro_user_id = ".$user_id.") AND active = 'y' AND database_id != ".$database_id); + $db_user_host_list = array(); + if(is_array($db_user_databases) && !empty($db_user_databases)){ + foreach($db_user_databases as $db_user_database){ + if($db_user_database['remote_access'] == 'y'){ + if($db_user_database['remote_ips'] == ''){ + $db_user_host_list[] = '%'; + } else { + $tmp_remote_ips = explode(',', $db_user_database['remote_ips']); + if(is_array($tmp_remote_ips) && !empty($tmp_remote_ips)){ + foreach($tmp_remote_ips as $tmp_remote_ip){ + $tmp_remote_ip = trim($tmp_remote_ip); + if($tmp_remote_ip != '') $db_user_host_list[] = $tmp_remote_ip; + } + } + unset($tmp_remote_ips); + } + } + $db_user_host_list[] = 'localhost'; + } + } + $host_list_arr = explode(',', $host_list); + //print_r($host_list_arr); + $drop_hosts = array_diff($host_list_arr, $db_user_host_list); + //print_r($drop_hosts); + $revoke_hosts = array_diff($host_list_arr, $drop_hosts); + //print_r($revoke_hosts); + + $drop_host_list = implode(',', $drop_hosts); + $revoke_host_list = implode(',', $revoke_hosts); + //echo $drop_host_list."\n"; + //echo $revoke_host_list."\n"; + return array('revoke_hosts' => $revoke_host_list, 'drop_hosts' => $drop_host_list); + } function db_insert($event_name,$data) { global $app, $conf; @@ -188,6 +229,9 @@ class mysql_clientdb_plugin { function db_update($event_name,$data) { global $app, $conf; + // skip processing if database was and is inactive + if($data['new']['active'] == 'n' && $data['old']['active'] == 'n') return; + if($data['new']['type'] == 'mysql') { if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); @@ -213,6 +257,15 @@ class mysql_clientdb_plugin { } if($host_list != '') $host_list .= ','; $host_list .= 'localhost'; + + // REVOKES and DROPS have to be done on old host list, not new host list + $old_host_list = ''; + if($data['old']['remote_access'] == 'y') { + $old_host_list = $data['old']['remote_ips']; + if($old_host_list == '') $old_host_list = '%'; + } + if($old_host_list != '') $old_host_list .= ','; + $old_host_list .= 'localhost'; // Create the database user if database was disabled before if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') { @@ -226,13 +279,36 @@ class mysql_clientdb_plugin { } } else if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link); + } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link); + if($db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_ro_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link); + } } + // Database is not active, so stop processing here + $link->query('FLUSH PRIVILEGES;'); + $link->close(); + return; } //* selected Users have changed @@ -240,8 +316,17 @@ class mysql_clientdb_plugin { if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) { $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); if($old_db_user) { - if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link); + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + } } } if($db_user) { @@ -253,8 +338,17 @@ class mysql_clientdb_plugin { if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) { $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'"); if($old_db_user) { - if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link); + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + } } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { @@ -272,8 +366,11 @@ class mysql_clientdb_plugin { //* set new priveliges if($data['new']['remote_access'] == 'y') { if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); + } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); @@ -281,32 +378,64 @@ class mysql_clientdb_plugin { } } else { if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link); + if($db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_ro_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + } } } $app->log('Changing MySQL remote access privileges for database: '.$data['new']['database_name'],LOGLEVEL_DEBUG); } elseif($data['new']['remote_access'] == 'y' && $data['new']['remote_ips'] != $data['old']['remote_ips']) { //* Change remote access list if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else { - $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else { - $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + if($db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['new']['database_id'], $data['new']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true); } } - } + } $link->query('FLUSH PRIVILEGES;'); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 1a593aa53f4affa139511ed618852bca92cf7891..7a1e562ad576a884fdd0d8d385fec47716e0c1b8 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -466,7 +466,7 @@ class nginx_plugin { exec('chown --recursive --from='.escapeshellcmd($data['old']['system_user']).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data['new']['system_user']).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir); //* Change the home directory and group of the website user - $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' && usermod'; + $command = 'killall -u '.escapeshellcmd($data['new']['system_user']).' ; usermod'; $command .= ' --home '.escapeshellcmd($data['new']['document_root']); $command .= ' --gid '.escapeshellcmd($data['new']['system_group']); $command .= ' '.escapeshellcmd($data['new']['system_user']).' 2>/dev/null'; @@ -655,8 +655,8 @@ class nginx_plugin { exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path); } // end copy error docs - // Set the quota for the user - if($username != '' && $app->system->is_user($username)) { + // Set the quota for the user, but only for vhosts, not vhostsubdomains + if($username != '' && $app->system->is_user($username) && $data['new']['type'] == 'vhost') { if($data['new']['hd_quota'] > 0) { $blocks_soft = $data['new']['hd_quota'] * 1024; $blocks_hard = $blocks_soft + 1024; @@ -1684,10 +1684,12 @@ class nginx_plugin { if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain'){ if(is_array($log_folders) && !empty($log_folders)){ foreach($log_folders as $log_folder){ - if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null'); } } else { - if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder)); + exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null'); } } @@ -1867,10 +1869,10 @@ class nginx_plugin { $vhost_logfile_dir = escapeshellcmd('/var/log/ispconfig/httpd/'.$data['old']['domain']); if($data['old']['domain'] != '' && !stristr($vhost_logfile_dir,'..')) exec('rm -rf '.$vhost_logfile_dir); $app->log('Removing website logfile directory: '.$vhost_logfile_dir,LOGLEVEL_DEBUG); - + if($data['old']['type'] == 'vhost') { //delete the web user - $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' && userdel'; + $command = 'killall -u '.escapeshellcmd($data['old']['system_user']).' ; userdel'; $command .= ' '.escapeshellcmd($data['old']['system_user']); exec($command); if($nginx_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' '.$command); diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index 98dd6751642e22a2ab073f9b40acc255f79c31a4..8d00e31804184f6a6820d4f15092d422eec18f1c 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -80,6 +80,7 @@ class postfix_server_plugin { // get the config $app->uses("getconf"); + $old_ini_data = $app->ini_parser->parse_ini_string($data['old']['config']); $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail'); copy('/etc/postfix/main.cf','/etc/postfix/main.cf~'); @@ -107,18 +108,23 @@ class postfix_server_plugin { exec("postconf -e 'relayhost ='"); } - if($mail_config['realtime_blackhole_list'] != '') { - $rbl_hosts = explode(",",str_replace(" ", "", $mail_config['realtime_blackhole_list'])); + if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) { + $rbl_hosts = trim(preg_replace('/\s+/', '', $mail_config['realtime_blackhole_list'])); + if($rbl_hosts != ''){ + $rbl_hosts = explode(",", $rbl_hosts); + } $options = explode(", ", exec("postconf -h smtpd_recipient_restrictions")); foreach ($options as $key => $value) { if (!preg_match('/reject_rbl_client/', $value)) { $new_options[] = $value; } } - foreach ($rbl_hosts as $key => $value) { - $new_options[] = "reject_rbl_client ".$value; + if(is_array($rbl_hosts) && !empty($rbl_hosts)){ + foreach ($rbl_hosts as $key => $value) { + $value = trim($value); + if($value != '') $new_options[] = "reject_rbl_client ".$value; + } } - exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'"); } diff --git a/server/plugins-available/webserver_plugin.inc.php b/server/plugins-available/webserver_plugin.inc.php index 56784445594a59e3fed4a8dae42aa1f431cbe0b3..0fcdf13c16144561540590183d8a8c28f8cc0df8 100644 --- a/server/plugins-available/webserver_plugin.inc.php +++ b/server/plugins-available/webserver_plugin.inc.php @@ -163,4 +163,4 @@ class webserver_plugin { } } -?> \ No newline at end of file +?> diff --git a/server/server.php b/server/server.php index e669c6ecc554a541a36c206b8c5002155015fa83..1cdcb85a473e7ea4af8258c2f9a4dceaae9caef3 100644 --- a/server/server.php +++ b/server/server.php @@ -196,8 +196,8 @@ if ($needStartCore) { $app->uses('modules,plugins,file,services'); // Load the modules that are im the mods-core folder $app->modules->loadModules('core'); - // Load the plugins that are in the plugins-core folder - $app->plugins->loadPlugins('core'); + // Load the plugins that are in the f folder + //$app->plugins->loadPlugins('core'); }