Skip to content
GitLab
Commit 71cae5df authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'stable-3.1'

parents 83bf799c 3cf7f969
Hide whitespace changes
Inline Side-by-side
install/lib/installer_base.lib.php
View file @ 71cae5df
......@@ -2085,7 +2085,7 @@ Email Address []:
$content = str_replace('{fpm_socket}', $fpm_socket, $content);
$content = str_replace('{cgi_socket}', $cgi_socket, $content);
if(file_exists('/var/run/php5-fpm.sock')){
if(file_exists('/var/run/php5-fpm.sock') || file_exists('/var/run/php/php7.0-fpm.sock')){
$use_tcp = '#';
$use_socket = '';
} else {
......
install/lib/update.lib.php
View file @ 71cae5df
......@@ -205,7 +205,11 @@ function updateDbAndIni() {
$cmd = "mysql --default-character-set=".escapeshellarg($conf['mysql']['charset'])." --force -h ".escapeshellarg($conf['mysql']['host'])." -u ".escapeshellarg($conf['mysql']['admin_user'])." ".escapeshellarg($conf['mysql']['database'])." < ".$sql_patch_filename;
}
if(in_array($next_db_version,explode(',',$silent_update_versions))) $cmd .= ' > /dev/null 2> /dev/null';
if(in_array($next_db_version,explode(',',$silent_update_versions))) {
$cmd .= ' > /dev/null 2> /dev/null';
} else {
$cmd .= ' > /var/log/ispconfig_install.log 2> /var/log/ispconfig_install.log';
}
system($cmd);
swriteln($inst->lng('Loading SQL patch file').': '.$sql_patch_filename);
......
install/sql/incremental/upd_0083.sql 0 → 100644
View file @ 71cae5df
ALTER TABLE `client` CHANGE `web_servers` `web_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `mail_servers` `mail_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `xmpp_servers` `xmpp_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `db_servers` `db_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `dns_servers` `dns_servers` TEXT NULL DEFAULT NULL;
UPDATE client SET web_servers = default_webserver WHERE (web_servers = '' OR web_servers IS NULL);
UPDATE client SET mail_servers = default_mailserver WHERE (mail_servers = '' OR mail_servers IS NULL);
UPDATE client SET xmpp_servers = default_xmppserver WHERE (xmpp_servers = '' OR xmpp_servers IS NULL);
UPDATE client SET db_servers = default_dbserver WHERE (db_servers = '' OR db_servers IS NULL);
UPDATE client SET dns_servers = default_dnsserver WHERE (dns_servers = '' OR dns_servers IS NULL);
ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT NOT NULL DEFAULT '0' AFTER `limit_dns_slave_zone`;
ALTER TABLE `client_template` ADD `mail_servers` TEXT NULL DEFAULT NULL AFTER `template_type`;
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
ALTER TABLE `client_template` ADD `dns_servers` TEXT NULL DEFAULT NULL AFTER `limit_aps`;
ALTER TABLE `client_template` ADD `db_servers` TEXT NULL DEFAULT NULL AFTER `limit_dns_record`;
\ No newline at end of file
install/sql/incremental/upd_dev_collection.sql
View file @ 71cae5df
ALTER TABLE `client` CHANGE `web_servers` `web_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `mail_servers` `mail_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `xmpp_servers` `xmpp_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `db_servers` `db_servers` TEXT NULL DEFAULT NULL;
ALTER TABLE `client` CHANGE `dns_servers` `dns_servers` TEXT NULL DEFAULT NULL;
UPDATE client SET web_servers = default_webserver WHERE (web_servers = '' OR web_servers IS NULL);
UPDATE client SET mail_servers = default_mailserver WHERE (mail_servers = '' OR mail_servers IS NULL);
UPDATE client SET xmpp_servers = default_xmppserver WHERE (xmpp_servers = '' OR xmpp_servers IS NULL);
UPDATE client SET db_servers = default_dbserver WHERE (db_servers = '' OR db_servers IS NULL);
UPDATE client SET dns_servers = default_dnsserver WHERE (dns_servers = '' OR dns_servers IS NULL);
ALTER TABLE `client_template` ADD `default_slave_dnsserver` INT NOT NULL DEFAULT '0' AFTER `limit_dns_slave_zone`;
ALTER TABLE `client_template` ADD `mail_servers` TEXT NULL DEFAULT NULL AFTER `template_type`;
ALTER TABLE `client_template` ADD `web_servers` TEXT NULL DEFAULT NULL AFTER `limit_xmpp_httparchive`;
ALTER TABLE `client_template` ADD `dns_servers` TEXT NULL DEFAULT NULL AFTER `limit_aps`;
ALTER TABLE `client_template` ADD `db_servers` TEXT NULL DEFAULT NULL AFTER `limit_dns_record`;
\ No newline at end of file
install/tpl/apache_ispconfig.vhost.master
View file @ 71cae5df
......@@ -9,9 +9,16 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
<VirtualHost _default_:<tmpl_var name="vhost_port">>
ServerAdmin webmaster@localhost
<FilesMatch "\.ph(p3?|tml)$">
SetHandler None
</FilesMatch>
<Directory /var/www/ispconfig/>
<FilesMatch "\.ph(p3?|tml)$">
SetHandler None
</FilesMatch>
</Directory>
<Directory /usr/local/ispconfig/interface/web/>
<FilesMatch "\.ph(p3?|tml)$">
SetHandler None
</FilesMatch>
</Directory>
<IfModule mod_fcgid.c>
DocumentRoot /var/www/ispconfig/
......
interface/lib/classes/client_templates.inc.php
View file @ 71cae5df
......@@ -19,7 +19,6 @@ class client_templates {
global $app, $conf;
if(!is_array($templates)) return false;
$new_tpl = array();
$used_assigned = array();
$needed_types = array();
......@@ -155,7 +154,6 @@ class client_templates {
/* we can remove this condition, but it is easier to debug with it (don't add ids and other non-limit values) */
if (strpos($k, 'limit') !== false or strpos($k, 'default') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec'){
$app->log('Template processing key ' . $k . ' for client ' . $clientId, LOGLEVEL_DEBUG);
/* process the numerical limits */
if (is_numeric($v)){
/* switch for special cases */
......@@ -195,6 +193,24 @@ class client_templates {
$limits[$k] = array();
}
$limits_values = $limits[$k];
if (is_string($limits[$k])){
$limits_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"], $limits[$k]);
}
$additional_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"], $v);
$app->log('Template processing key ' . $k . ' type CHECKBOXARRAY, lim / add: ' . implode(',', $limits_values) . ' / ' . implode(',', $additional_values) . ' for client ' . $clientId, LOGLEVEL_DEBUG);
/* unification of limits_values (master template) and additional_values (additional template) */
$limits_unified = array();
foreach($form["tabs"]["limits"]["fields"][$k]["value"] as $key => $val){
if (in_array($key, $limits_values) || in_array($key, $additional_values)) $limits_unified[] = $key;
}
$limits[$k] = implode($form["tabs"]["limits"]["fields"][$k]["separator"], $limits_unified);
break;
case 'MULTIPLE':
if (!isset($limits[$k])){
$limits[$k] = array();
}
$limits_values = $limits[$k];
if (is_string($limits[$k])){
$limits_values = explode($form["tabs"]["limits"]["fields"][$k]["separator"], $limits[$k]);
......@@ -245,7 +261,7 @@ class client_templates {
if (strpos($k, 'default') !== false and $v == 0) {
continue; // template doesn't define default server, client's default musn't be changed
}
if ((strpos($k, 'limit') !== false or strpos($k, 'default') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec') && !is_array($v)){
if ((strpos($k, 'limit') !== false or strpos($k, 'default') !== false or strpos($k, '_servers') !== false or $k == 'ssh_chroot' or $k == 'web_php_options' or $k == 'force_suexec') && !is_array($v)){
if ($update != '') $update .= ', ';
$update .= '?? = ?';
$update_values[] = $k;
......
interface/lib/classes/remote.d/sites.inc.php
View file @ 71cae5df
......@@ -481,7 +481,7 @@ class remoting_sites extends remoting {
return false;
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../sites/form/web_vhost_aliasdomain.tform.php');
$app->remoting_lib->loadFormDef('../sites/form/web_vhost_domain.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
}
......@@ -505,7 +505,7 @@ class remoting_sites extends remoting {
if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
$domain_id = $this->insertQuery('../sites/form/web_vhost_aliasdomain.tform.php', $client_id, $params, 'sites:web_vhost_aliasdomain:on_after_insert');
$domain_id = $this->insertQuery('../sites/form/web_vhost_domain.tform.php', $client_id, $params, 'sites:web_vhost_aliasdomain:on_after_insert');
return $domain_id;
}
......@@ -523,7 +523,7 @@ class remoting_sites extends remoting {
if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
$affected_rows = $this->updateQuery('../sites/form/web_vhost_aliasdomain.tform.php', $client_id, $primary_id, $params, 'sites:web_vhost_aliasdomain:on_after_insert');
$affected_rows = $this->updateQuery('../sites/form/web_vhost_domain.tform.php', $client_id, $primary_id, $params, 'sites:web_vhost_aliasdomain:on_after_insert');
return $affected_rows;
}
......@@ -534,7 +534,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->deleteQuery('../sites/form/web_vhost_aliasdomain.tform.php', $primary_id);
$affected_rows = $this->deleteQuery('../sites/form/web_vhost_domain.tform.php', $primary_id);
return $affected_rows;
}
......@@ -550,7 +550,7 @@ class remoting_sites extends remoting {
return false;
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../sites/form/web_vhost_subdomain.tform.php');
$app->remoting_lib->loadFormDef('../sites/form/web_vhost_domain.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
}
......@@ -574,7 +574,7 @@ class remoting_sites extends remoting {
if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
$domain_id = $this->insertQuery('../sites/form/web_vhost_subdomain.tform.php', $client_id, $params, 'sites:web_vhost_subdomain:on_after_insert');
$domain_id = $this->insertQuery('../sites/form/web_vhost_domain.tform.php', $client_id, $params, 'sites:web_vhost_subdomain:on_after_insert');
return $domain_id;
}
......@@ -592,7 +592,7 @@ class remoting_sites extends remoting {
if($params['pm_min_spare_servers'] == '') $params['pm_min_spare_servers'] = 1;
if($params['pm_max_spare_servers'] == '') $params['pm_max_spare_servers'] = 1;
$affected_rows = $this->updateQuery('../sites/form/web_vhost_subdomain.tform.php', $client_id, $primary_id, $params, 'sites:web_vhost_subdomain:on_after_insert');
$affected_rows = $this->updateQuery('../sites/form/web_vhost_domain.tform.php', $client_id, $primary_id, $params, 'sites:web_vhost_subdomain:on_after_insert');
return $affected_rows;
}
......@@ -603,7 +603,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->deleteQuery('../sites/form/web_vhost_subdomain.tform.php', $primary_id);
$affected_rows = $this->deleteQuery('../sites/form/web_vhost_domain.tform.php', $primary_id);
return $affected_rows;
}
......@@ -619,7 +619,7 @@ class remoting_sites extends remoting {
return false;
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../sites/form/web_aliasdomain.tform.php');
$app->remoting_lib->loadFormDef('../sites/form/web_childdomain.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
}
......@@ -630,7 +630,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
return $this->insertQuery('../sites/form/web_aliasdomain.tform.php', $client_id, $params);
return $this->insertQuery('../sites/form/web_childdomain.tform.php', $client_id, $params);
}
//* Update a record
......@@ -640,7 +640,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->updateQuery('../sites/form/web_aliasdomain.tform.php', $client_id, $primary_id, $params);
$affected_rows = $this->updateQuery('../sites/form/web_childdomain.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
......@@ -651,7 +651,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->deleteQuery('../sites/form/web_aliasdomain.tform.php', $primary_id);
$affected_rows = $this->deleteQuery('../sites/form/web_childdomain.tform.php', $primary_id);
return $affected_rows;
}
......@@ -667,7 +667,7 @@ class remoting_sites extends remoting {
return false;
}
$app->uses('remoting_lib');
$app->remoting_lib->loadFormDef('../sites/form/web_subdomain.tform.php');
$app->remoting_lib->loadFormDef('../sites/form/web_childdomain.tform.php');
return $app->remoting_lib->getDataRecord($primary_id);
}
......@@ -678,7 +678,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
return $this->insertQuery('../sites/form/web_subdomain.tform.php', $client_id, $params);
return $this->insertQuery('../sites/form/web_childdomain.tform.php', $client_id, $params);
}
//* Update a record
......@@ -688,7 +688,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->updateQuery('../sites/form/web_subdomain.tform.php', $client_id, $primary_id, $params);
$affected_rows = $this->updateQuery('../sites/form/web_childdomain.tform.php', $client_id, $primary_id, $params);
return $affected_rows;
}
......@@ -699,7 +699,7 @@ class remoting_sites extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
$affected_rows = $this->deleteQuery('../sites/form/web_subdomain.tform.php', $primary_id);
$affected_rows = $this->deleteQuery('../sites/form/web_childdomain.tform.php', $primary_id);
return $affected_rows;
}
......
interface/lib/classes/tform_base.inc.php
View file @ 71cae5df
......@@ -1488,8 +1488,10 @@ class tform_base {
$app->tpl->setVar('form_hint', $form_hint);
// Set Wordbook for this form
$app->tpl->setVar($this->wordbook);
foreach($this->wordbook as $key => $val) {
if(strstr($val,'\'')) $val = stripslashes($val);
$app->tpl->setVar($key,$val);
}
}
function getDataRecord($primary_id) {
......
interface/lib/classes/tools_sites.inc.php
View file @ 71cae5df
......@@ -157,7 +157,7 @@ class tools_sites {
$field = "domain";
$select = $field;
}
$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field = ?) AND";
$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field != ?) AND";
}
if ($_SESSION["s"]["user"]["typ"] == 'admin') {
$sql .= " 1";
......
interface/web/admin/lib/lang/ar_server_config.lng
View file @ 71cae5df
......@@ -280,4 +280,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP';
$wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
?>
interface/web/admin/lib/lang/bg_server_config.lng
View file @ 71cae5df
......@@ -280,4 +280,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP';
$wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
?>
interface/web/admin/lib/lang/br_server_config.lng
View file @ 71cae5df
......@@ -280,4 +280,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP';
$wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb['backup_time_txt'] = 'Backup time';
?>
interface/web/admin/lib/lang/ca.lng
View file @ 71cae5df
<?php
//Errors
$wb[1001] = "Username or password is empty.";
$wb[1002] = "Username or password is wrong.";
$wb['1001'] = 'Username or password is empty.';
$wb['1002'] = 'Username or password is wrong.';
$wb['Groups'] = 'Groups';
$wb['groups_description'] = 'Form to edit systemuser groups.';
$wb['Servers'] = 'Servers';
$wb['Config'] = 'Config';
$wb['Add user'] = 'Add user';
$wb['Edit user'] = 'Edit user';
$wb['Add group'] = 'Add group';
$wb['Edit group'] = 'Edit group';
$wb['Edit server'] = 'Edit server';
$wb['Sync. Now'] = 'Sync. Now';
$wb['DB Sync.'] = 'DB Sync.';
// subnav
$wb['User Management'] = 'User Management';
$wb['CP Users'] = 'CP Users';
$wb['Remote Users'] = 'Remote Users';
$wb['System'] = 'System';
$wb['Server Services'] = 'Server Services';
$wb['Services'] = 'Services';
$wb['Services'] = 'Services';
$wb['Server Config'] = 'Server Config';
$wb['Server'] = 'Server';
$wb['Mail'] = 'Mail';
$wb['Getmail'] = 'Getmail';
$wb['Web'] = 'Web';
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
$wb['Rescue'] = 'Rescue';
$wb['Server'] = 'Server';
$wb['Mail'] = 'Mail';
$wb['Getmail'] = 'Getmail';
$wb['Web'] = 'Web';
$wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit';
$wb['Rescue'] = 'Rescue';
$wb['Server IP addresses'] = 'Server IP addresses';
$wb['Additional PHP Versions'] = 'Additional PHP Versions';
$wb['Directive Snippets'] = 'Directive Snippets';
$wb['Firewall'] = 'Firewall';
$wb['Interface'] = 'Interface';
$wb['Interface Config'] = 'Main Config';
$wb['Sites'] = 'Sites';
$wb['DNS'] = 'DNS';
$wb['Domains'] = 'Domains';
$wb['Misc'] = 'Misc';
$wb['Sites'] = 'Sites';
$wb['DNS'] = 'DNS';
$wb['Domains'] = 'Domains';
$wb['Misc'] = 'Misc';
$wb['Software'] = 'Apps & Addons';
$wb['Repositories'] = 'Repositories';
$wb['Packages'] = 'Packages';
$wb['Updates'] = 'Updates';
$wb['Language Editor'] = 'Language Editor';
$wb['Languages'] = 'Languages';
$wb['New Language'] = 'New Language';
$wb['Merge'] = 'Merge';
$wb['Export'] = 'Export';
$wb['Import'] = 'Import';
$wb['Remote Actions'] = 'Remote Actions';
$wb['Do OS-Update'] = 'Do OS-Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
......
interface/web/admin/lib/lang/ca_directive_snippets.lng
View file @ 71cae5df
<?php
$wb["Directive Snippets"] = 'Directive Snippets';
$wb["name_txt"] = 'Name of Snippet';
$wb["type_txt"] = 'Type';
$wb["snippet_txt"] = 'Snippet';
$wb["active_txt"] = 'Active';
$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.';
$wb['Directive Snippets'] = 'Directive Snippets';
$wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Type';
$wb['snippet_txt'] = 'Snippet';
$wb['active_txt'] = 'Active';
$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.';
$wb['variables_txt'] = 'Variables';
$wb['customer_viewable_txt'] = 'Customer viewable';
?>
\ No newline at end of file
?>
interface/web/admin/lib/lang/ca_directive_snippets_list.lng
View file @ 71cae5df
<?php
$wb["list_head_txt"] = 'Directive Snippets';
$wb["active_txt"] = 'Active';
$wb["name_txt"] = 'Name of Snippet';
$wb["type_txt"] = 'Type';
$wb["add_new_record_txt"] = 'Add Directive Snippet';
$wb['list_head_txt'] = 'Directive Snippets';
$wb['active_txt'] = 'Active';
$wb['name_txt'] = 'Name of Snippet';
$wb['type_txt'] = 'Type';
$wb['add_new_record_txt'] = 'Add Directive Snippet';
$wb['customer_viewable_txt'] = 'Customer viewable';
?>
\ No newline at end of file
?>
interface/web/admin/lib/lang/ca_firewall.lng
View file @ 71cae5df
<?php
$wb["server_id_txt"] = 'Server';
$wb["tcp_port_txt"] = 'Open TCP ports';
$wb["udp_port_txt"] = 'Open UDP ports';
$wb["tcp_port_help_txt"] = 'Separated by comma';
$wb["udp_port_help_txt"] = 'Separated by comma';
$wb["active_txt"] = 'Active';
$wb["firewall_error_unique"] = 'There is already a firewall record for this server.';
$wb["active_txt"] = 'Active';
$wb["tcp_ports_error_regex"] = 'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".';
$wb["udp_ports_error_regex"] = 'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".';
?>
\ No newline at end of file
$wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Open TCP ports';
$wb['udp_port_txt'] = 'Open UDP ports';
$wb['tcp_port_help_txt'] = 'Separated by comma';
$wb['udp_port_help_txt'] = 'Separated by comma';
$wb['active_txt'] = 'Active';
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \":\" and \",\".';
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \":\" and \",\".';
?>
interface/web/admin/lib/lang/ca_firewall_list.lng
View file @ 71cae5df
<?php
$wb["list_head_txt"] = 'Firewall';
$wb["active_txt"] = 'Active';
$wb["server_id_txt"] = 'Server';
$wb["tcp_port_txt"] = 'Open TCP ports';
$wb["udp_port_txt"] = 'Open UDP ports';
$wb["add_new_record_txt"] = 'Add Firewall record';
?>
\ No newline at end of file
$wb['list_head_txt'] = 'Firewall';
$wb['active_txt'] = 'Active';
$wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Open TCP ports';
$wb['udp_port_txt'] = 'Open UDP ports';
$wb['add_new_record_txt'] = 'Add Firewall record';
?>
interface/web/admin/lib/lang/ca_groups.lng
View file @ 71cae5df
<?php
$wb["description_txt"] = 'Description';
$wb["name_txt"] = 'Group';
$wb["name_err"] = 'Group must be min 1, max 30 Chars.';
?>
\ No newline at end of file
$wb['description_txt'] = 'Description';
$wb['name_txt'] = 'Group';
$wb['name_err'] = 'Group must be min 1, max 30 Chars.';
?>
interface/web/admin/lib/lang/ca_groups_list.lng
View file @ 71cae5df
<?php
$wb["list_head_txt"] = 'Systemuser groups';
$wb["description_txt"] = 'Description';
$wb["name_txt"] = 'Group';
$wb["add_new_record_txt"] = 'Add new Group';
$wb["warning_txt"] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
?>
\ No newline at end of file
$wb['list_head_txt'] = 'Systemuser groups';
$wb['description_txt'] = 'Description';
$wb['name_txt'] = 'Group';
$wb['add_new_record_txt'] = 'Add new Group';
$wb['warning_txt'] = '<b>WARNING:</b> Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
?>
interface/web/admin/lib/lang/ca_iptables.lng
View file @ 71cae5df
<?php
$wb["server_id_txt"] = 'Server';
$wb["multiport_txt"] = 'Multi Port';
$wb["singleport_txt"] = 'Single Port';
$wb["protocol_txt"] = 'Protocol';
$wb["table_txt"] = 'Table';
$wb["target_txt"] = 'Target';
$wb["state_txt"] = 'State';
$wb["destination_ip_txt"] = 'Destination Address';
$wb["source_ip_txt"] = 'Source Address';
$wb["active_txt"] = 'Active';
$wb["iptables_error_unique"] = 'There is already a firewall record for this server.';
$wb['server_id_txt'] = 'Server';
$wb['multiport_txt'] = 'Multi Port';
$wb['singleport_txt'] = 'Single Port';
$wb['protocol_txt'] = 'Protocol';
$wb['table_txt'] = 'Table';
$wb['target_txt'] = 'Target';
$wb['state_txt'] = 'State';
$wb['destination_ip_txt'] = 'Destination Address';
$wb['source_ip_txt'] = 'Source Address';
$wb['active_txt'] = 'Active';
$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
?>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment