Skip to content

Commit 967607b

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 90f3c77 + 80e4c48 commit 967607b

29 files changed

+147
-96
lines changed

‎interface/lib/classes/remote.d/sites.inc.php‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,56 @@ public function databasequota_get_by_user($session_id, $client_id)
10171017
return $app->quota_lib->get_databasequota_data($client_id, false);
10181018
}
10191019

1020+
// ----------------------------------------------------------------------------------------------------------
1021+
1022+
//* Get record details
1023+
public function sites_webdav_user_get($session_id, $primary_id)
1024+
{
1025+
global $app;
1026+
1027+
if(!$this->checkPerm($session_id, 'sites_webdav_user_get')) {
1028+
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
1029+
return false;
1030+
}
1031+
$app->uses('remoting_lib');
1032+
$app->remoting_lib->loadFormDef('../sites/form/webdav_user.tform.php');
1033+
return $app->remoting_lib->getDataRecord($primary_id);
1034+
}
1035+
1036+
//* Add a record
1037+
public function sites_webdav_user_add($session_id, $client_id, $params)
1038+
{
1039+
if(!$this->checkPerm($session_id, 'sites_webdav_user_add')) {
1040+
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
1041+
return false;
1042+
}
1043+
return $this->insertQuery('../sites/form/webdav_user.tform.php', $client_id, $params);
1044+
}
1045+
1046+
//* Update a record
1047+
public function sites_webdav_user_update($session_id, $client_id, $primary_id, $params)
1048+
{
1049+
if(!$this->checkPerm($session_id, 'sites_webdav_user_update')) {
1050+
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
1051+
return false;
1052+
}
1053+
$affected_rows = $this->updateQuery('../sites/form/webdav_user.tform.php', $client_id, $primary_id, $params);
1054+
return $affected_rows;
1055+
}
1056+
1057+
//* Delete a record
1058+
public function sites_webdav_user_delete($session_id, $primary_id)
1059+
{
1060+
global $app;
1061+
if(!$this->checkPerm($session_id, 'sites_webdav_user_delete')) {
1062+
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
1063+
return false;
1064+
}
1065+
1066+
$affected_rows = $this->deleteQuery('../sites/form/webdav_user.tform.php', $primary_id);
1067+
return $affected_rows;
1068+
}
1069+
10201070

10211071
}
10221072

‎interface/lib/lang/cz.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $wb['top_menu_monitor'] = 'Monitor';
3333
$wb['top_menu_sites'] = 'Stránky';
3434
$wb['top_menu_dns'] = 'DNS';
3535
$wb['top_menu_tools'] = 'Nástroje';
36-
$wb['top_menu_help'] = 'Pomoc';
36+
$wb['top_menu_help'] = 'Podpora';
3737
$wb['toolsarea_head_txt'] = 'Nástroje';
3838
$wb['top_menu_billing'] = 'Fakturace';
3939
$wb['top_menu_domain'] = 'Doména';

‎interface/web/admin/lib/lang/cz_server_php.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ $wb['php_fastcgi_ini_dir_txt'] = 'Cesta k php.ini adresáři';
1313
$wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
1414
$wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
1515
$wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
16-
$wb['active_txt'] = 'Active';
16+
$wb['active_txt'] = 'Aktivní';
1717
?>

‎interface/web/admin/lib/lang/cz_server_php_list.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ $wb['server_id_txt'] = 'Server';
44
$wb['add_new_record_txt'] = 'Přidat verzi PHP';
55
$wb['client_id_txt'] = 'Klient';
66
$wb['name_txt'] = 'Verze PHP';
7-
$wb['active_txt'] = 'Active';
7+
$wb['active_txt'] = 'Aktivní';
88
?>

‎interface/web/admin/lib/lang/cz_system_config.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ $wb['default_dnsserver_txt'] = 'Výchozí DNS server';
7777
$wb['default_slave_dnsserver_txt'] = 'Výchozí sekundární DNS server';
7878
$wb['default_dbserver_txt'] = 'Výchozí databázový server';
7979
$wb['company_name_txt'] = 'Název společnosti v panelu (listu) webového prohlížeče';
80-
$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
80+
$wb['reseller_can_use_options_txt'] = 'Distributor (prodejce) může použít kartu možností pro weby.';
8181
$wb['custom_login_text_txt'] = 'Vlastní text na přihlašovací stránce';
8282
$wb['custom_login_link_txt'] = 'Vlastní odkaz (URL) na přihlašovací stránce (vlastní text)';
8383
$wb['login_link_error_regex'] = 'Neplatný formát URL pro vlastní odkaz na přihlašovací stránce';
84-
$wb['ca_name_txt'] = 'Name';
85-
$wb['ca_issue_txt'] = 'Issue';
86-
$wb['ca_wildcard_txt'] = 'Use Wildcard';
87-
$wb['ca_critical_txt'] = 'Strict Check';
84+
$wb['ca_name_txt'] = 'Název vydavatele';
85+
$wb['ca_issue_txt'] = 'Doména vydavatele';
86+
$wb['ca_wildcard_txt'] = 'Použít Wildcard (*)';
87+
$wb['ca_critical_txt'] = 'Přísná kontrola';
8888
$wb['ca_iodef_txt'] = 'iodef';
89-
$wb['active_txt'] = 'Aktive';
90-
$wb['btn_save_txt'] = 'Save';
91-
$wb['btn_cancel_txt'] = 'Cancel';
89+
$wb['active_txt'] = 'Aktivní';
90+
$wb['btn_save_txt'] = 'Uložit';
91+
$wb['btn_cancel_txt'] = 'Zrušit';
9292
$wb['web_php_options_txt'] = 'PHP Handler (Apache only)';
9393
?>

‎interface/web/client/lib/lang/cz_clients_list.lng‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $wb['country_txt'] = 'Stát';
88
$wb['add_new_record_txt'] = 'Vytvořit klienta';
99
$wb['username_txt'] = 'Uživatelské jméno';
1010
$wb['customer_no_txt'] = 'Zákaznické číslo';
11-
$wb['locked_txt'] = 'Locked';
12-
$wb['yes_txt'] = 'Yes';
13-
$wb['no_txt'] = 'No';
11+
$wb['locked_txt'] = 'Zamčené';
12+
$wb['yes_txt'] = 'Ano';
13+
$wb['no_txt'] = 'Ne';
1414
?>

‎interface/web/dashboard/lib/lang/cz_dashlet_invoices.lng‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $wb['invoices_txt'] = 'Invoices';
33
$wb['invoice_no_txt'] = 'Invoice No.';
44
$wb['amount_txt'] = 'Amount';
55
$wb['date_txt'] = 'Datum';
6-
$wb['invoice_status_txt'] = 'Status';
6+
$wb['invoice_status_txt'] = 'Stav';
77
$wb['no_invoices_txt'] = 'No Invoices available.';
88
$wb['paid_txt'] = 'Paid';
99
$wb['unpaid_txt'] = 'Unpaid';

‎interface/web/dashboard/lib/lang/cz_dashlet_limits.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$wb['limits_txt'] = 'Limity účtu';
2+
$wb['limits_txt'] = 'Limity účtů';
33
$wb['of_txt'] = 'z';
44
$wb['unlimited_txt'] = 'neomezeno';
55
$wb['limit_maildomain_txt'] = 'Počet e-mailových domén';
@@ -28,7 +28,7 @@ $wb['limit_client_txt'] = 'Počet klientů';
2828
$wb['limit_database_txt'] = 'Počet databází';
2929
$wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí';
3030
$wb['limit_domain_txt'] = 'Počet domén';
31-
$wb['limit_mailquota_txt'] = 'Assigned mailbox quota';
32-
$wb['limit_web_quota_txt'] = 'Assigned web quota';
33-
$wb['limit_database_quota_txt'] = 'Assigned database quota';
31+
$wb['limit_mailquota_txt'] = 'Přiřazená e-mailová kvóta';
32+
$wb['limit_web_quota_txt'] = 'Přiřazená webová kvóta';
33+
$wb['limit_database_quota_txt'] = 'Přiřazená databázová kvóta';
3434
?>

‎interface/web/dns/lib/lang/cz_dns_caa.lng‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php
2-
$wb['ca_list_txt'] = 'Certifiction Authority';
3-
$wb['ca_domain_txt'] = 'Domain';
4-
$wb['ca_hostname_txt'] = 'Additional Hostnamen';
5-
$wb['ca_hostname_note_txt'] = '(Sepearated list with commas - empty for all hostnames)';
6-
$wb['ca_options_txt'] = 'Additional Options';
7-
$wb['ca_options_note_txt'] = 'requested by the CA (Sepearated list with commas)';
8-
$wb['ca_wildcard_txt'] = 'Use Wildcard SSL';
9-
$wb['ca_critical_txt'] = 'Strict check';
2+
$wb['ca_list_txt'] = 'Certifikační autorita';
3+
$wb['ca_domain_txt'] = 'Doména';
4+
$wb['ca_hostname_txt'] = 'Omezit na názvy hostitelů';
5+
$wb['ca_hostname_note_txt'] = '(Oddělený seznam s čárkami - prázdný pro všechna jména hostitelů)';
6+
$wb['ca_options_txt'] = 'Další možnosti názvu hostitele';
7+
$wb['ca_options_note_txt'] = 'requested by the CA (Oddělený seznam s čárkami)';
8+
$wb['ca_wildcard_txt'] = 'Použití Wildcard (*) SSL';
9+
$wb['ca_critical_txt'] = 'Přísná kontrola';
1010
$wb['ttl_txt'] = 'TTL';
11-
$wb['active_txt'] = 'Active';
12-
$wb['select_txt'] = 'Select Certifiction Authority';
13-
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
14-
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
15-
$wb['ca_error_txt'] = 'No Certifiction Authority selected';
16-
$wb['caa_exists_error'] = 'CAA Record already exists';
17-
$wb['ca_option_error'] = 'Invalid format for additional options; OPTION=VALUE';
18-
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
11+
$wb['active_txt'] = 'Aktivní';
12+
$wb['select_txt'] = 'Vyberte certifikační autoritu';
13+
$wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny DNS.';
14+
$wb['limit_dns_record_txt'] = 'Byl dosažen max. počet DNS záznamů pro váš účet.';
15+
$wb['ca_error_txt'] = 'Nebyla vybrána žádná certifikační autorita';
16+
$wb['caa_exists_error'] = 'CAA záznam již existuje';
17+
$wb['ca_option_error'] = 'Neplatný formát pro další možnosti; OPTION=VALUE';
18+
$wb['ttl_range_error'] = 'Min. TTL čas je 60 sekund.';
1919
?>

‎interface/web/dns/lib/lang/cz_dns_dmarc.lng‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
4444
$wb['dmarc_invalid_email_txt'] = 'Neplatný e-mail';
4545
$wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option';
4646
$wb['record_exists_txt'] = 'DNS záznam již existuje';
47-
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
48-
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
47+
$wb['limit_dns_record_txt'] = 'Byl dosažen max. počet DNS záznamů pro váš účet.';
48+
$wb['no_zone_perm'] = 'Nemáte oprávnění přidat záznam do této zóny DNS.';
4949
$wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
5050
?>

0 commit comments

Comments
 (0)