Commit a008884b authored by tbrehm's avatar tbrehm
Browse files

Merged revisions 3536-3555 from 3.0.5 stable branch.

parent ae171fab
...@@ -55,6 +55,7 @@ class ispcmail { ...@@ -55,6 +55,7 @@ class ispcmail {
private $body = ''; private $body = '';
private $_mail_sender = ''; private $_mail_sender = '';
private $_sent_mails = 0; private $_sent_mails = 0;
private $user_agent = 'ISPConfig/3 (Mailer Class)';
/**#@-*/ /**#@-*/
/** /**
...@@ -100,6 +101,22 @@ class ispcmail { ...@@ -100,6 +101,22 @@ class ispcmail {
* How many mails should be sent via one single smtp connection * How many mails should be sent via one single smtp connection
*/ */
private $smtp_max_mails = 20; private $smtp_max_mails = 20;
/**
* Should the mail be signed
*/
private $sign_email = false;
/**
* The cert and key to use for email signing
*/
private $sign_key = '';
private $sign_key_pass = '';
private $sign_cert = '';
private $sign_bundle = '';
private $_is_signed = false;
/**
* get disposition notification
*/
private $notification = false;
/**#@-*/ /**#@-*/
public function __construct($options = array()) { public function __construct($options = array()) {
...@@ -110,6 +127,7 @@ class ispcmail { ...@@ -110,6 +127,7 @@ class ispcmail {
$this->attachments = array(); $this->attachments = array();
$this->headers['MIME-Version'] = '1.0'; $this->headers['MIME-Version'] = '1.0';
$this->headers['User-Agent'] = $this->user_agent;
if(is_array($options) && count($options) > 0) $this->setOptions($options); if(is_array($options) && count($options) > 0) $this->setOptions($options);
} }
...@@ -155,9 +173,27 @@ class ispcmail { ...@@ -155,9 +173,27 @@ class ispcmail {
if($value != 'ssl' && $value != 'tls') $value = ''; if($value != 'ssl' && $value != 'tls') $value = '';
$this->smtp_crypt = $value; $this->smtp_crypt = $value;
break; break;
case 'sign_email':
$this->sign_email = ($value == true ? true : false);
break;
case 'sign_key':
$this->sign_key = $value;
break;
case 'sign_key_pass':
$this->sign_key_pass = $value;
break;
case 'sign_cert':
$this->sign_cert = $value;
break;
case 'sign_bundle':
$this->sign_bundle = $value;
break;
case 'mail_charset': case 'mail_charset':
$this->mail_charset = $value; $this->mail_charset = $value;
break; break;
case 'notify':
$this->notification = ($value == true ? true : false);
break;
} }
} }
...@@ -394,7 +430,8 @@ class ispcmail { ...@@ -394,7 +430,8 @@ class ispcmail {
$this->body .= "--{$this->mime_boundary}\n" . $this->body .= "--{$this->mime_boundary}\n" .
"Content-Type: " . $att['type'] . ";\n" . "Content-Type: " . $att['type'] . ";\n" .
" name=\"" . $att['filename'] . "\"\n" . " name=\"" . $att['filename'] . "\"\n" .
"Content-Transfer-Encoding: base64\n\n" . "Content-Transfer-Encoding: base64\n" .
"Content-Disposition: attachment;\n\n" .
chunk_split(base64_encode($att['content'])) . "\n\n"; chunk_split(base64_encode($att['content'])) . "\n\n";
} }
} }
...@@ -415,6 +452,44 @@ class ispcmail { ...@@ -415,6 +452,44 @@ class ispcmail {
} }
} }
/**
* Function to sign an email body
*/
private function sign() {
if($this->sign_email == false || $this->sign_key == '' || $this->sign_cert == '') return false;
if(function_exists('openssl_pkcs7_sign') == false) return false;
$tmpin = tempnam(sys_get_temp_dir(), 'sign');
$tmpout = tempnam(sys_get_temp_dir(), 'sign');
if(!file_exists($tmpin) || !is_writable($tmpin)) return false;
file_put_contents($tmpin, 'Content-Type: ' . $this->getHeader('Content-Type') . "\n\n" . $this->body);
$tmpf_key = tempnam(sys_get_temp_dir(), 'sign');
file_put_contents($tmpf_key, $this->sign_key);
$tmpf_cert = tempnam(sys_get_temp_dir(), 'sign');
file_put_contents($tmpf_cert, $this->sign_cert);
if($this->sign_bundle != '') {
$tmpf_bundle = tempnam(sys_get_temp_dir(), 'sign');
file_put_contents($tmpf_bundle, $this->sign_bundle);
openssl_pkcs7_sign($tmpin, $tmpout, 'file://' . realpath($tmpf_cert), array('file://' . realpath($tmpf_key), $this->sign_key_pass), array(), PKCS7_DETACHED, realpath($tmpf_bundle));
} else {
openssl_pkcs7_sign($tmpin, $tmpout, 'file://' . realpath($tmpf_cert), array('file://' . realpath($tmpf_key), $this->sign_key_pass), array());
}
unlink($tmpin);
unlink($tmpf_cert);
unlink($tmpf_key);
if(file_exists($tmpf_bundle)) unlink($tmpf_bundle);
if(!file_exists($tmpout) || !is_readable($tmpout)) return false;
$this->body = file_get_contents($tmpout);
unlink($tmpout);
unset($this->headers['Content-Type']);
unset($this->headers['MIME-Version']);
$this->_is_signed = true;
}
/** /**
* Function to encode a header if necessary * Function to encode a header if necessary
* according to RFC2047 * according to RFC2047
...@@ -496,6 +571,7 @@ class ispcmail { ...@@ -496,6 +571,7 @@ class ispcmail {
else $this->_crlf = "\n"; else $this->_crlf = "\n";
$this->create(); $this->create();
if($this->sign_email == true) $this->sign();
$subject = ''; $subject = '';
if (!empty($this->headers['Subject'])) { if (!empty($this->headers['Subject'])) {
...@@ -506,6 +582,8 @@ class ispcmail { ...@@ -506,6 +582,8 @@ class ispcmail {
unset($this->headers['Subject']); unset($this->headers['Subject']);
} }
if($this->notification == true) $this->setHeader('Disposition-Notification-To', $this->getHeader('From'));
unset($this->headers['To']); // always reset the To header to prevent from sending to multiple users at once unset($this->headers['To']); // always reset the To header to prevent from sending to multiple users at once
$this->headers['Date'] = date('r'); //date('D, d M Y H:i:s O'); $this->headers['Date'] = date('r'); //date('D, d M Y H:i:s O');
...@@ -554,7 +632,7 @@ class ispcmail { ...@@ -554,7 +632,7 @@ class ispcmail {
$mail_content .= 'To: ' . $this->getHeader('To') . $this->_crlf; $mail_content .= 'To: ' . $this->getHeader('To') . $this->_crlf;
if($this->getHeader('Bcc') != '') $mail_content .= 'Bcc: ' . $this->_encodeHeader($this->getHeader('Bcc'), $this->mail_charset) . $this->_crlf; if($this->getHeader('Bcc') != '') $mail_content .= 'Bcc: ' . $this->_encodeHeader($this->getHeader('Bcc'), $this->mail_charset) . $this->_crlf;
if($this->getHeader('Cc') != '') $mail_content .= 'Cc: ' . $this->_encodeHeader($this->getHeader('Cc'), $this->mail_charset) . $this->_crlf; if($this->getHeader('Cc') != '') $mail_content .= 'Cc: ' . $this->_encodeHeader($this->getHeader('Cc'), $this->mail_charset) . $this->_crlf;
$mail_content .= implode($this->_crlf, $headers) . $this->_crlf . $this->_crlf . $this->body; $mail_content .= implode($this->_crlf, $headers) . $this->_crlf . ($this->_is_signed == false ? $this->_crlf : '') . $this->body;
fputs($this->_smtp_conn, $mail_content . $this->_crlf . '.' . $this->_crlf); fputs($this->_smtp_conn, $mail_content . $this->_crlf . '.' . $this->_crlf);
$response = fgets($this->_smtp_conn, 515); $response = fgets($this->_smtp_conn, 515);
...@@ -605,6 +683,7 @@ class ispcmail { ...@@ -605,6 +683,7 @@ class ispcmail {
$this->html_part = ''; $this->html_part = '';
$this->headers['MIME-Version'] = '1.0'; $this->headers['MIME-Version'] = '1.0';
$this->headers['User-Agent'] = $this->user_agent;
$this->smtp_helo = ''; $this->smtp_helo = '';
$this->smtp_host = ''; $this->smtp_host = '';
...@@ -615,6 +694,7 @@ class ispcmail { ...@@ -615,6 +694,7 @@ class ispcmail {
$this->smtp_crypt = false; $this->smtp_crypt = false;
$this->mail_charset = 'UTF-8'; $this->mail_charset = 'UTF-8';
$this->_sent_mails = 0; $this->_sent_mails = 0;
return; return;
} }
} }
......
...@@ -36,8 +36,8 @@ $wb['top_menu_sites'] = 'Webseiten'; ...@@ -36,8 +36,8 @@ $wb['top_menu_sites'] = 'Webseiten';
$wb['top_menu_dns'] = 'DNS'; $wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Einstellungen'; $wb['top_menu_tools'] = 'Einstellungen';
$wb['top_menu_help'] = 'Support'; $wb['top_menu_help'] = 'Support';
$wb['top_menu_billing'] = 'Billing'; $wb['top_menu_billing'] = 'Fakturierung';
$wb['top_menu_mailuser'] = 'Mailuser'; $wb['top_menu_mailuser'] = 'Mail Benutzer';
$wb['top_menu_domain'] = 'Domains'; $wb['top_menu_domain'] = 'Domains';
$wb['top_menu_dashboard'] = 'Home'; $wb['top_menu_dashboard'] = 'Home';
$wb['latest_news_txt'] = 'Neuigkeiten'; $wb['latest_news_txt'] = 'Neuigkeiten';
...@@ -70,7 +70,7 @@ $wb['monthnamesshort_nov'] = 'Nov'; ...@@ -70,7 +70,7 @@ $wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dez'; $wb['monthnamesshort_dec'] = 'Dez';
$wb['datepicker_nextText'] = 'Vor'; $wb['datepicker_nextText'] = 'Vor';
$wb['datepicker_prevText'] = 'Zurück'; $wb['datepicker_prevText'] = 'Zurück';
$wb['logout_txt'] = 'Logout'; $wb['logout_txt'] = 'Abmelden';
$wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?'; $wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
$wb['globalsearch_resultslimit_of_txt'] = 'von'; $wb['globalsearch_resultslimit_of_txt'] = 'von';
$wb['globalsearch_resultslimit_results_txt'] = 'Treffern'; $wb['globalsearch_resultslimit_results_txt'] = 'Treffern';
......
...@@ -11,12 +11,12 @@ $wb['Add group'] = 'Gruppe hinzufügen'; ...@@ -11,12 +11,12 @@ $wb['Add group'] = 'Gruppe hinzufügen';
$wb['Edit group'] = 'Gruppe bearbeiten'; $wb['Edit group'] = 'Gruppe bearbeiten';
$wb['Edit server'] = 'Server bearbeiten'; $wb['Edit server'] = 'Server bearbeiten';
$wb['Sync. Now'] = 'Jetzt synchronisieren'; $wb['Sync. Now'] = 'Jetzt synchronisieren';
$wb['DB Sync.'] = 'DB Synchronisation'; $wb['DB Sync.'] = 'Datenbank Synchronisation';
$wb['User Management'] = 'User Management'; $wb['User Management'] = 'Benutzerverwaltung';
$wb['CP Users'] = 'CP-Benutzer'; $wb['CP Users'] = 'CP Benutzer';
$wb['Remote Users'] = 'Remote-Benutzer'; $wb['Remote Users'] = 'Remote Benutzer';
$wb['System'] = 'System'; $wb['System'] = 'System';
$wb['Server Services'] = 'Server-Dienste'; $wb['Server Services'] = 'Server Dienste';
$wb['Services'] = 'Dienste'; $wb['Services'] = 'Dienste';
$wb['Server Config'] = 'Serverkonfiguration'; $wb['Server Config'] = 'Serverkonfiguration';
$wb['Server'] = 'Server'; $wb['Server'] = 'Server';
...@@ -25,26 +25,26 @@ $wb['Getmail'] = 'Getmail'; ...@@ -25,26 +25,26 @@ $wb['Getmail'] = 'Getmail';
$wb['Web'] = 'Web'; $wb['Web'] = 'Web';
$wb['FastCGI'] = 'FastCGI'; $wb['FastCGI'] = 'FastCGI';
$wb['Jailkit'] = 'Jailkit'; $wb['Jailkit'] = 'Jailkit';
$wb['Rescue'] = 'Rescue'; $wb['Rescue'] = 'Überwachung';
$wb['Server IP addresses'] = 'Server IP-Adressen'; $wb['Server IP addresses'] = 'Server IP Adressen';
$wb['Additional PHP Versions'] = 'Zusätzliche PHP-Versionen'; $wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen';
$wb['Directive Snippets'] = 'Direktiven-Schnipsel'; $wb['Directive Snippets'] = 'Direktiven Schnipsel';
$wb['Firewall'] = 'Firewall'; $wb['Firewall'] = 'Firewall';
$wb['Interface'] = 'Interface'; $wb['Interface'] = 'Benutzeroberfläche';
$wb['Interface Config'] = 'Main Config'; $wb['Interface Config'] = 'Einstellungen';
$wb['Domains'] = 'Domains'; $wb['Domains'] = 'Domains';
$wb['Misc'] = 'Misc'; $wb['Misc'] = 'Diverses';
$wb['Software'] = 'Apps & Addons'; $wb['Software'] = 'Apps & Addons';
$wb['Repositories'] = 'Repositories'; $wb['Repositories'] = 'Bibliotheken';
$wb['Packages'] = 'Packages'; $wb['Packages'] = 'Pakete';
$wb['Updates'] = 'Updates'; $wb['Updates'] = 'Updates';
$wb['Language Editor'] = 'Sprachen-Editor'; $wb['Language Editor'] = 'Sprachen Editor';
$wb['Languages'] = 'Sprachen'; $wb['Languages'] = 'Sprachen';
$wb['New Language'] = 'Neue Sprache'; $wb['New Language'] = 'Neue Sprache';
$wb['Merge'] = 'Zusammenführen'; $wb['Merge'] = 'Zusammenführen';
$wb['Export'] = 'Exportieren'; $wb['Export'] = 'Exportieren';
$wb['Import'] = 'Importieren'; $wb['Import'] = 'Importieren';
$wb['Remote Actions'] = 'Remote Actions'; $wb['Remote Actions'] = 'Wartung';
$wb['Do OS-Update'] = 'Do OS-Update'; $wb['Do OS-Update'] = 'Betriebssystem Update';
$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update'; $wb['Do ISPConfig-Update'] = 'ISPConfig Update';
?> ?>
<?php <?php
$wb["Directive Snippets"] = 'Direktiven-Schnipsel'; $wb['Directive Snippets'] = 'Direktiven Schnipsel';
$wb["name_txt"] = 'Name des Schnipsels'; $wb['name_txt'] = 'Name des Schnipsels';
$wb["type_txt"] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb["snippet_txt"] = 'Schnipsel'; $wb['snippet_txt'] = 'Schnipsel';
$wb["active_txt"] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb["directive_snippets_name_empty"] = 'Bitte geben Sie einen Namen für den Schnipsel an.'; $wb['directive_snippets_name_empty'] = 'Bitte geben Sie einen Namen für den Schnipsel an.';
$wb["directive_snippets_name_error_unique"] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.'; $wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.';
?> ?>
\ No newline at end of file
<?php <?php
$wb["list_head_txt"] = 'Direcktiven-Schnipsel'; $wb['list_head_txt'] = 'Direcktiven Schnipsel';
$wb["active_txt"] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb["name_txt"] = 'Name des Schnipsels'; $wb['name_txt'] = 'Name des Schnipsels';
$wb["type_txt"] = 'Typ'; $wb['type_txt'] = 'Typ';
$wb["add_new_record_txt"] = 'Direcktiven-Schnipsel hinzufügen'; $wb['add_new_record_txt'] = 'Direcktiven Schnipsel hinzufügen';
?> ?>
\ No newline at end of file
<?php <?php
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Offene TCP-Ports'; $wb['tcp_port_txt'] = 'Offene TCP Ports';
$wb['udp_port_txt'] = 'Offene UDP-Ports'; $wb['udp_port_txt'] = 'Offene UDP Ports';
$wb['tcp_port_help_txt'] = 'Getrennt durch Kommata'; $wb['tcp_port_help_txt'] = 'Getrennt durch Kommata';
$wb['udp_port_help_txt'] = 'Getrennt durch Kommata'; $wb['udp_port_help_txt'] = 'Getrennt durch Kommata';
$wb['active_txt'] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für diesen Server.'; $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für diesen Server.';
$wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP-Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; $wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
$wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP-Port Definition. Erlaubte Zeichen sind Nummern, : und ,.'; $wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
?> ?>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
$wb['list_head_txt'] = 'Firewall'; $wb['list_head_txt'] = 'Firewall';
$wb['active_txt'] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = 'Server';
$wb['tcp_port_txt'] = 'Offene TCP-Ports'; $wb['tcp_port_txt'] = 'Offene TCP Ports';
$wb['udp_port_txt'] = 'Offene UDP-Ports'; $wb['udp_port_txt'] = 'Offene UD Ports';
$wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen'; $wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen';
?> ?>
...@@ -4,10 +4,10 @@ $wb['multiport_txt'] = 'Multi Port'; ...@@ -4,10 +4,10 @@ $wb['multiport_txt'] = 'Multi Port';
$wb['singleport_txt'] = 'Single Port'; $wb['singleport_txt'] = 'Single Port';
$wb['protocol_txt'] = 'Protokoll'; $wb['protocol_txt'] = 'Protokoll';
$wb['table_txt'] = 'Table'; $wb['table_txt'] = 'Table';
$wb['target_txt'] = 'Target'; $wb['target_txt'] = 'Ziel';
$wb['state_txt'] = 'State'; $wb['state_txt'] = 'Status';
$wb['destination_ip_txt'] = 'Destination Address'; $wb['destination_ip_txt'] = 'Ziel Address';
$wb['source_ip_txt'] = 'Source Address'; $wb['source_ip_txt'] = 'Ausgangs Adresse';
$wb['active_txt'] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall-Regel für diesen Server.'; $wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?> ?>
<?php <?php
$wb['list_head_txt'] = 'IPTables'; $wb['list_head_txt'] = 'IPTables';
$wb['add_new_rule_txt'] = 'Neue IPTables-Regel hinzufügen'; $wb['add_new_rule_txt'] = 'Neue IPTables Regel hinzufügen';
$wb['server_id_txt'] = 'Server'; $wb['server_id_txt'] = 'Server';
$wb['multiport_txt'] = 'Multi Port'; $wb['multiport_txt'] = 'Multi Port';
$wb['singleport_txt'] = 'Single Port'; $wb['singleport_txt'] = 'Single Port';
$wb['protocol_txt'] = 'Protokoll'; $wb['protocol_txt'] = 'Protokoll';
$wb['table_txt'] = 'Table'; $wb['table_txt'] = 'Table';
$wb['target_txt'] = 'Target'; $wb['target_txt'] = 'Ziel';
$wb['state_txt'] = 'State'; $wb['state_txt'] = 'Status';
$wb['destination_ip_txt'] = 'Destination Address'; $wb['destination_ip_txt'] = 'Ziel Adresse';
$wb['source_ip_txt'] = 'Source Address'; $wb['source_ip_txt'] = 'Ausgangs Adresse';
$wb['active_txt'] = 'Aktiv'; $wb['active_txt'] = 'Aktiv';
$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall-Regel für diesen Server.'; $wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?> ?>
<?php <?php
$wb['list_head_txt'] = 'Sprachdatei-Editor'; $wb['list_head_txt'] = 'Sprachdatei Editor';
$wb['language_select_txt'] = 'Sprache auswählen'; $wb['language_select_txt'] = 'Sprache auswählen';
$wb['module_txt'] = 'Modul'; $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Sprachdatei'; $wb['lang_file_txt'] = 'Sprachdatei';
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
$wb['list_head_txt'] = 'Sprachdatei importieren'; $wb['list_head_txt'] = 'Sprachdatei importieren';
$wb['language_import_txt'] = 'Sprache auswählen'; $wb['language_import_txt'] = 'Sprache auswählen';
$wb['btn_save_txt'] = 'Ausgewählte Sprache importieren'; $wb['btn_save_txt'] = 'Ausgewählte Sprache importieren';
$wb['language_overwrite_txt'] = 'Datei überschreiben, falls sie existiert.'; $wb['language_overwrite_txt'] = 'Datei überschreiben, falls diese schon existiert.';
$wb['btn_cancel_txt'] = 'Zurück'; $wb['btn_cancel_txt'] = 'Zurück';
$wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen'; $wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen';
?> ?>
<?php <?php
$wb['list_head_txt'] = 'Sprachdatei-Editor'; $wb['list_head_txt'] = 'Sprachdatei Editor';
$wb['language_select_txt'] = 'Sprache wählen'; $wb['language_select_txt'] = 'Sprache wählen';
$wb['module_txt'] = 'Modul'; $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Sprachdatei'; $wb['lang_file_txt'] = 'Sprachdatei';
......
<?php <?php
$wb['repo_name_txt'] = 'Repository'; $wb['repo_name_txt'] = 'Bibliothek';
$wb['repo_url_txt'] = 'URL'; $wb['repo_url_txt'] = 'URL';
$wb['repo_username_txt'] = 'Benutzername (optional)'; $wb['repo_username_txt'] = 'Benutzername (optional)';
$wb['repo_password_txt'] = 'Passwort (optional)'; $wb['repo_password_txt'] = 'Passwort (optional)';
......
<?php <?php
$wb['select_server_txt'] = 'Server auswählen'; $wb['select_server_txt'] = 'Server auswählen';
$wb['btn_do_txt'] = 'Aktion ausführen'; $wb['btn_do_txt'] = 'Aktion ausführen';
$wb['do_osupdate_caption'] = 'Betriebssystem-Update auf entferntem Server ausführen'; $wb['do_osupdate_caption'] = 'Betriebssystem Update auf entferntem Server ausführen';
$wb['do_osupdate_desc'] = 'Diese Aktion wird ein aptitude -y upgrade auf dem ausgewählten Server ausführen.<br><br><strong>DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!</strong>'; $wb['do_osupdate_desc'] = 'Diese Aktion wird ein aptitude -y upgrade auf dem ausgewählten Server ausführen.<br><br><strong>DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!</strong>';
$wb['do_ispcupdate_caption'] = 'ISPConfig 3 - Update auf entferntem Server ausführen'; $wb['do_ispcupdate_caption'] = 'ISPConfig 3 Update auf entferntem Server ausführen';
$wb['do_ispcupdate_desc'] = 'Diese Aktion wird ein Update des ISPConfig3-Systems auf Ihrem ausgewählten Server ausführen.<br><br><strong>DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!</strong>'; $wb['do_ispcupdate_desc'] = 'Diese Aktion wird ein Update des ISPConfig 3 Systems auf Ihrem ausgewählten Server ausführen.<br><br><strong>DIES GESCHIEHT AUF IHRE EIGENE VERANTWORTUNG!</strong>';
$wb['action_scheduled'] = 'Die Aktion wurde zur Ausführung vorgemerkt'; $wb['action_scheduled'] = 'Die Aktion wurde zur Ausführung vorgemerkt';
$wb['select_all_server'] = 'Alle Server'; $wb['select_all_server'] = 'Alle Server';
$wb['ispconfig_update_title'] = 'ISPConfig Update-Anweisungen'; $wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>'; $wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
?> ?>
...@@ -20,13 +20,13 @@ $wb['Mail fetchmail functions'] = 'Mail Fetchmail Funktionen'; ...@@ -20,13 +20,13 @@ $wb['Mail fetchmail functions'] = 'Mail Fetchmail Funktionen';
$wb['Mail user filter functions'] = 'Mail Benutzer Filter Funktionen'; $wb['Mail user filter functions'] = 'Mail Benutzer Filter Funktionen';
$wb['Mail filter functions'] = 'Mail Filter Funktionen'; $wb['Mail filter functions'] = 'Mail Filter Funktionen';
$wb['Client functions'] = 'Kunden Funktionen'; $wb['Client functions'] = 'Kunden Funktionen';
$wb['Sites cron functions'] = 'Sites Cron Funktionen'; $wb['Sites cron functions'] = 'Webseiten Cron Funktionen';
$wb['Sites database functions'] = 'Sites Datenbanken Funktionen'; $wb['Sites database functions'] = 'Webseiten Datenbanken Funktionen';
$wb['Sites FTP-User functions'] = 'Sites FTP-Benutzer Funktionen'; $wb['Sites FTP-User functions'] = 'Webseiten FTP Benutzer Funktionen';
$wb['Sites Shell-User functions'] = 'Sites Shell-Benutzer Funktionen'; $wb['Sites Shell-User functions'] = 'Webseiten Shell Benutzer Funktionen';
$wb['Sites Domain functions'] = 'Sites Domain Funktionen'; $wb['Sites Domain functions'] = 'Webseiten Domain Funktionen';
$wb['Sites Aliasdomain functions'] = 'Sites Aliasdomain Funktionen'; $wb['Sites Aliasdomain functions'] = 'Webseiten Aliasdomain Funktionen';
$wb['Sites Subdomain functions'] = 'Sites Subdomain Funktionen'; $wb['Sites Subdomain functions'] = 'Webseiten Subdomain Funktionen';
$wb['DNS zone functions'] = 'DNS Zone Funktionen'; $wb['DNS zone functions'] = 'DNS Zone Funktionen';
$wb['DNS a functions'] = 'DNS a Funktionen'; $wb['DNS a functions'] = 'DNS a Funktionen';
$wb['DNS aaaa functions'] = 'DNS aaaa Funktionen'; $wb['DNS aaaa functions'] = 'DNS aaaa Funktionen';
...@@ -39,7 +39,7 @@ $wb['DNS ptr functions'] = 'DNS ptr Funktionen'; ...@@ -39,7 +39,7 @@ $wb['DNS ptr functions'] = 'DNS ptr Funktionen';
$wb['DNS rp functions'] = 'DNS rp Funktionen'; $wb['DNS rp functions'] = 'DNS rp Funktionen';
$wb['DNS srv functions'] = 'DNS srv Funktionen'; $wb['DNS srv functions'] = 'DNS srv Funktionen';
$wb['DNS txt functions'] = 'DNS txt Funktionen'; $wb['DNS txt functions'] = 'DNS txt Funktionen';
$wb['Mail mailing list functions'] = 'Mail mailinglist functions'; $wb['Mail mailing list functions'] = 'Mail Mailinglisten Funktionen';
$wb['generate_password_txt'] = 'Passwort erzeugen'; $wb['generate_password_txt'] = 'Passwort erzeugen';
$wb['repeat_password_txt'] = 'Passwort wiederholen'; $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.'; $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
......
<?php <?php
$wb['list_head_txt'] = 'Remote-Benutzer'; $wb['list_head_txt'] = 'Remote Benutzer';
$wb['list_desc_txt'] = ''; $wb['list_desc_txt'] = '';
$wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen'; $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['parent_remote_userid_txt'] = 'User ID'; $wb['parent_remote_userid_txt'] = 'Benutzer ID';
$wb['username_txt'] = 'Benutzername';