Continuation of filepaths for customers for ssl.

Author: cobrafast

customer_domains.php

@@ -742,25 +742,25 @@
 				// array openssl_x509_parse ( mixed $x509cert [, bool $shortnames = true ] )
 				// openssl_x509_parse() returns information about the supplied x509cert, including fields such as
 				// subject name, issuer name, purposes, valid from and valid to dates etc.
-				$cert_content = openssl_x509_parse($ssl_cert_file);
+				$cert_content = openssl_x509_parse(Settings::Get('system.ssl_customers_set_paths') == '1' ? file_get_contents($ssl_cert_file) : $ssl_cert_file);
 
 				if (is_array($cert_content) && isset($cert_content['subject']) && isset($cert_content['subject']['CN'])) {
 					// bool openssl_x509_check_private_key ( mixed $cert , mixed $key )
 					// Checks whether the given key is the private key that corresponds to cert.
-					if (openssl_x509_check_private_key($ssl_cert_file, $ssl_key_file) === false) {
+					if (openssl_x509_check_private_key(Settings::Get('system.ssl_customers_set_paths') == '1' ? file_get_contents($ssl_cert_file) : $ssl_cert_file, Settings::Get('system.ssl_customers_set_paths') == '1' ? file_get_contents($ssl_key_file) : $ssl_key_file) === false) {
 						standard_error('sslcertificateinvalidcertkeypair');
 					}
 
 					// check optional stuff
 					if ($ssl_ca_file != '') {
-						$ca_content = openssl_x509_parse($ssl_ca_file);
+						$ca_content = openssl_x509_parse(Settings::Get('system.ssl_customers_set_paths') == '1' ? file_get_contents($ssl_ca_file) : $ssl_ca_file);
 						if (!is_array($ca_content)) {
 							// invalid
 							standard_error('sslcertificateinvalidca');
 						}
 					}
 					if ($ssl_cert_chainfile != '') {
-						$chain_content = openssl_x509_parse($ssl_cert_chainfile);
+						$chain_content = openssl_x509_parse(Settings::Get('system.ssl_customers_set_paths') == '1' ? file_get_contents($ssl_cert_chainfile) : $ssl_cert_chainfile);
 						if (!is_array($chain_content)) {
 							// invalid
 							standard_error('sslcertificateinvalidchain');

lib/formfields/customer/domains/formfield.domain_ssleditor_paths.php

@@ -26,29 +26,29 @@
 				'fields' => array(
 					'ssl_cert_file' => array(
 						'style' => 'align-top',
-						'label' => $lng['admin']['ipsandports']['ssl_cert_file_content'],
-						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_file_path'],
+						'desc' => $lng['admin']['ipsandports']['ssl_path_description'],
 						'type' => 'text',
 						'value' => $result['ssl_cert_file']
 					),
 					'ssl_key_file' => array(
 						'style' => 'align-top',
-						'label' => $lng['admin']['ipsandports']['ssl_key_file_content'],
-						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'label' => $lng['admin']['ipsandports']['ssl_key_file_path'],
+						'desc' => $lng['admin']['ipsandports']['ssl_path_description'],
 						'type' => 'text',
 						'value' => $result['ssl_key_file']
 					),
 					'ssl_cert_chainfile' => array(
 						'style' => 'align-top',
-						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'],
-						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'].$lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_path'],
+						'desc' => $lng['admin']['ipsandports']['ssl_path_description'].$lng['admin']['ipsandports']['ssl_cert_chainfile_path_desc'],
 						'type' => 'text',
 						'value' => $result['ssl_cert_chainfile']
 					),
 					'ssl_ca_file' => array(
 						'style' => 'align-top',
-						'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'],
-						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'].$lng['admin']['ipsandports']['ssl_ca_file_content_desc'],
+						'label' => $lng['admin']['ipsandports']['ssl_ca_file_path'],
+						'desc' => $lng['admin']['ipsandports']['ssl_path_description'].$lng['admin']['ipsandports']['ssl_ca_file_path_desc'],
 						'type' => 'text',
 						'value' => $result['ssl_ca_file']
 					)

lng/english.lng.php

@@ -1703,6 +1703,13 @@
 $lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '<br /><br />Client authentification, set this only if you know what it is.';
 $lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Content of the certificate chainfile (optional)';
 $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'] = '<br /><br />Mostly CA_Bundle, or similar, you probably want to set this if you bought a SSL certificate.';
+$lng['admin']['ipsandports']['ssl_path_description'] = 'Specify the complete path to the certificate file in the textbox';
+$lng['admin']['ipsandports']['ssl_cert_file_path'] = 'Path to the ssl certificate';
+$lng['admin']['ipsandports']['ssl_key_file_path'] = 'Path to the ssl (private-) key file';
+$lng['admin']['ipsandports']['ssl_ca_file_path'] = 'Path to the ssl CA file (optional)';
+$lng['admin']['ipsandports']['ssl_ca_file_path_desc'] = '<br /><br />Client authentification, set this only if you know what it is.';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_path'] = 'Path to the certificate chainfile (optional)';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_path_desc'] = '<br /><br />Mostly CA_Bundle, or similar, you probably want to set this if you bought a SSL certificate.';
 $lng['error']['sslcertificateismissingprivatekey'] = 'You need to specify a private key for your certificate';
 $lng['error']['sslcertificatewrongdomain'] = 'The given certificate does not belong to this domain';
 $lng['error']['sslcertificateinvalidcert'] = 'The given certificate-content does not seem to be a valid certificate';

lng/german.lng.php

@@ -1431,6 +1431,13 @@
 $lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '<br /><br />Client Authentifizierung, dieses Feld sollte nur gesetzt werden, wenn es wirklich gebraucht wird.';
 $lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Inhalt des SSL-CertificateChainFile (optional)';
 $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'] = '<br /><br />Meist CA_Bundle, o. Ä. Dies ist das Feld, das gesetzt werden sollte, wenn ein gekauftes SSL-Zertifikat vorliegt.';
+$lng['admin']['ipsandports']['ssl_path_description'] = 'Bitte den Dateipfad zur Zertifikatsdatei in das Textfeld kopieren.';
+$lng['admin']['ipsandports']['ssl_cert_file_content'] = 'Dateipfad zum SSL-Zertifikat (Certificate)';
+$lng['admin']['ipsandports']['ssl_key_file_content'] = 'Dateipfad zur Key-Datei (Private-Key)';
+$lng['admin']['ipsandports']['ssl_ca_file_content'] = 'Dateipfad zur SSL-CA-Datei (optional)';
+$lng['admin']['ipsandports']['ssl_ca_file_content_desc'] = '<br /><br />Client Authentifizierung, dieses Feld sollte nur gesetzt werden, wenn es wirklich gebraucht wird.';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Dateipfad zum SSL-CertificateChainFile (optional)';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'] = '<br /><br />Meist CA_Bundle, o. Ä. Dies ist das Feld, das gesetzt werden sollte, wenn ein gekauftes SSL-Zertifikat vorliegt.';
 $lng['error']['sslcertificateismissingprivatekey'] = 'Für das Zertifikat muss eine Key-Datei (Private-Key) angegeben werden.';
 $lng['error']['sslcertificatewrongdomain'] = 'Das angegebene Zertifikat gilt nicht für die gewählte Domain.';
 $lng['error']['sslcertificateinvalidcert'] = 'Der angegebene Zertifikatsinhalt scheint kein gültiges Zertifikat zu sein.';