nextcloud / server

settings/templates/settings/admin/additional-mail.php

Indentation +22 added lines, -22 removed lines

@@ -25,26 +25,26 @@ 
 /** @var array $_ */
 
 $mail_smtpauthtype = [
-	''	=> $l->t('None'),
-	'LOGIN'	=> $l->t('Login'),
-	'PLAIN'	=> $l->t('Plain'),
-	'NTLM'	=> $l->t('NT LAN Manager'),
+    ''	=> $l->t('None'),
+    'LOGIN'	=> $l->t('Login'),
+    'PLAIN'	=> $l->t('Plain'),
+    'NTLM'	=> $l->t('NT LAN Manager'),
 ];
 
 $mail_smtpsecure = [
-	''		=> $l->t('None'),
-	'ssl'	=> $l->t('SSL/TLS'),
-	'tls'	=> $l->t('STARTTLS'),
+    ''		=> $l->t('None'),
+    'ssl'	=> $l->t('SSL/TLS'),
+    'tls'	=> $l->t('STARTTLS'),
 ];
 
 $mail_smtpmode = [
-	['smtp', 'SMTP'],
+    ['smtp', 'SMTP'],
 ];
 if ($_['sendmail_is_available']) {
-	$mail_smtpmode[] = ['sendmail', 'Sendmail'];
+    $mail_smtpmode[] = ['sendmail', 'Sendmail'];
 }
 if ($_['mail_smtpmode'] === 'qmail') {
-	$mail_smtpmode[] = ['qmail', 'qmail'];
+    $mail_smtpmode[] = ['qmail', 'qmail'];
 }
 
 ?>
@@ -62,10 +62,10 @@ 
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name="mail_smtpmode" id="mail_smtpmode">
 				<?php foreach ($mail_smtpmode as $smtpmode):
-					$selected = '';
-					if ($smtpmode[0] == $_['mail_smtpmode']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($smtpmode[0] == $_['mail_smtpmode']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -77,10 +77,10 @@ 
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] !== 'smtp') print_unescaped(' class="hidden"'); ?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
-					$selected = '';
-					if ($secure == $_['mail_smtpsecure']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($secure == $_['mail_smtpsecure']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>
@@ -98,10 +98,10 @@ 
 			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name="mail_smtpauthtype" id="mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
-					$selected = '';
-					if ($authtype == $_['mail_smtpauthtype']):
-						$selected = 'selected="selected"';
-					endif; ?>
+                    $selected = '';
+                    if ($authtype == $_['mail_smtpauthtype']):
+                        $selected = 'selected="selected"';
+                    endif; ?>
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
 				<?php endforeach;?>
 			</select>

lib/private/Settings/Admin/Mail.php

Indentation +50 added lines, -50 removed lines

@@ -30,61 +30,61 @@
 use OCP\Settings\ISettings;
 
 class Mail implements ISettings {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			// Mail
-			'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
-			'mail_domain'           => $this->config->getSystemValue('mail_domain', ''),
-			'mail_from_address'     => $this->config->getSystemValue('mail_from_address', ''),
-			'mail_smtpmode'         => $this->config->getSystemValue('mail_smtpmode', ''),
-			'mail_smtpsecure'       => $this->config->getSystemValue('mail_smtpsecure', ''),
-			'mail_smtphost'         => $this->config->getSystemValue('mail_smtphost', ''),
-			'mail_smtpport'         => $this->config->getSystemValue('mail_smtpport', ''),
-			'mail_smtpauthtype'     => $this->config->getSystemValue('mail_smtpauthtype', ''),
-			'mail_smtpauth'         => $this->config->getSystemValue('mail_smtpauth', false),
-			'mail_smtpname'         => $this->config->getSystemValue('mail_smtpname', ''),
-			'mail_smtppassword'     => $this->config->getSystemValue('mail_smtppassword', ''),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            // Mail
+            'sendmail_is_available' => (bool) \OC_Helper::findBinaryPath('sendmail'),
+            'mail_domain'           => $this->config->getSystemValue('mail_domain', ''),
+            'mail_from_address'     => $this->config->getSystemValue('mail_from_address', ''),
+            'mail_smtpmode'         => $this->config->getSystemValue('mail_smtpmode', ''),
+            'mail_smtpsecure'       => $this->config->getSystemValue('mail_smtpsecure', ''),
+            'mail_smtphost'         => $this->config->getSystemValue('mail_smtphost', ''),
+            'mail_smtpport'         => $this->config->getSystemValue('mail_smtpport', ''),
+            'mail_smtpauthtype'     => $this->config->getSystemValue('mail_smtpauthtype', ''),
+            'mail_smtpauth'         => $this->config->getSystemValue('mail_smtpauth', false),
+            'mail_smtpname'         => $this->config->getSystemValue('mail_smtpname', ''),
+            'mail_smtppassword'     => $this->config->getSystemValue('mail_smtppassword', ''),
+        ];
 
-		if ($parameters['mail_smtppassword'] !== '') {
-			$parameters['mail_smtppassword'] = '********';
-		}
+        if ($parameters['mail_smtppassword'] !== '') {
+            $parameters['mail_smtppassword'] = '********';
+        }
 
-		if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
-			$parameters['mail_smtpmode'] = 'smtp';
-		}
+        if ($parameters['mail_smtpmode'] === '' || $parameters['mail_smtpmode'] === 'php') {
+            $parameters['mail_smtpmode'] = 'smtp';
+        }
 
-		return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/additional-mail', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 10;
+    }
 }

lib/private/Mail/Mailer.php

Indentation +196 added lines, -196 removed lines

@@ -57,227 +57,227 @@
  * @package OC\Mail
  */
 class Mailer implements IMailer {
-	/** @var \Swift_Mailer Cached mailer */
-	private $instance = null;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-	/** @var Defaults */
-	private $defaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
+    /** @var \Swift_Mailer Cached mailer */
+    private $instance = null;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+    /** @var Defaults */
+    private $defaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
 
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param Defaults $defaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IConfig $config,
-						 ILogger $logger,
-						 Defaults $defaults,
-						 IURLGenerator $urlGenerator,
-						 IL10N $l10n) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->defaults = $defaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param Defaults $defaults
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l10n
+     */
+    public function __construct(IConfig $config,
+                            ILogger $logger,
+                            Defaults $defaults,
+                            IURLGenerator $urlGenerator,
+                            IL10N $l10n) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->defaults = $defaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Creates a new message object that can be passed to send()
-	 *
-	 * @return IMessage
-	 */
-	public function createMessage(): IMessage {
-		$plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
-		return new Message(new \Swift_Message(), $plainTextOnly);
-	}
+    /**
+     * Creates a new message object that can be passed to send()
+     *
+     * @return IMessage
+     */
+    public function createMessage(): IMessage {
+        $plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
+        return new Message(new \Swift_Message(), $plainTextOnly);
+    }
 
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
-		return new Attachment(new \Swift_Attachment($data, $filename, $contentType));
-	}
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
+        return new Attachment(new \Swift_Attachment($data, $filename, $contentType));
+    }
 
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
-		return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
-	}
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
+        return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
+    }
 
-	/**
-	 * Creates a new email template object
-	 *
-	 * @param string $emailId
-	 * @param array $data
-	 * @return IEMailTemplate
-	 * @since 12.0.0
-	 */
-	public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
-		$class = $this->config->getSystemValue('mail_template_class', '');
+    /**
+     * Creates a new email template object
+     *
+     * @param string $emailId
+     * @param array $data
+     * @return IEMailTemplate
+     * @since 12.0.0
+     */
+    public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
+        $class = $this->config->getSystemValue('mail_template_class', '');
 
-		if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
-			return new $class(
-				$this->defaults,
-				$this->urlGenerator,
-				$this->l10n,
-				$emailId,
-				$data
-			);
-		}
+        if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
+            return new $class(
+                $this->defaults,
+                $this->urlGenerator,
+                $this->l10n,
+                $emailId,
+                $data
+            );
+        }
 
-		return new EMailTemplate(
-			$this->defaults,
-			$this->urlGenerator,
-			$this->l10n,
-			$emailId,
-			$data
-		);
-	}
+        return new EMailTemplate(
+            $this->defaults,
+            $this->urlGenerator,
+            $this->l10n,
+            $emailId,
+            $data
+        );
+    }
 
-	/**
-	 * Send the specified message. Also sets the from address to the value defined in config.php
-	 * if no-one has been passed.
-	 *
-	 * @param IMessage|Message $message Message to send
-	 * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
-	 * therefore should be considered
-	 * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
-	 * has been supplied.)
-	 */
-	public function send(IMessage $message): array {
-		$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
+    /**
+     * Send the specified message. Also sets the from address to the value defined in config.php
+     * if no-one has been passed.
+     *
+     * @param IMessage|Message $message Message to send
+     * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
+     * therefore should be considered
+     * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
+     * has been supplied.)
+     */
+    public function send(IMessage $message): array {
+        $debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
 
-		if (empty($message->getFrom())) {
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
-		}
+        if (empty($message->getFrom())) {
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($this->defaults->getName()) => $this->defaults->getName()]);
+        }
 
-		$failedRecipients = [];
+        $failedRecipients = [];
 
-		$mailer = $this->getInstance();
+        $mailer = $this->getInstance();
 
-		// Enable logger if debug mode is enabled
-		if($debugMode) {
-			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
-			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
-		}
+        // Enable logger if debug mode is enabled
+        if($debugMode) {
+            $mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
+            $mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
+        }
 
-		$mailer->send($message->getSwiftMessage(), $failedRecipients);
+        $mailer->send($message->getSwiftMessage(), $failedRecipients);
 
-		// Debugging logging
-		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
-		$this->logger->debug($logMessage, ['app' => 'core']);
-		if($debugMode && isset($mailLogger)) {
-			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
-		}
+        // Debugging logging
+        $logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
+        $this->logger->debug($logMessage, ['app' => 'core']);
+        if($debugMode && isset($mailLogger)) {
+            $this->logger->debug($mailLogger->dump(), ['app' => 'core']);
+        }
 
-		return $failedRecipients;
-	}
+        return $failedRecipients;
+    }
 
-	/**
-	 * Checks if an e-mail address is valid
-	 *
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 */
-	public function validateMailAddress(string $email): bool {
-		$validator = new EmailValidator();
-		$validation = new RFCValidation();
+    /**
+     * Checks if an e-mail address is valid
+     *
+     * @param string $email Email address to be validated
+     * @return bool True if the mail address is valid, false otherwise
+     */
+    public function validateMailAddress(string $email): bool {
+        $validator = new EmailValidator();
+        $validation = new RFCValidation();
 
-		return $validator->isValid($this->convertEmail($email), $validation);
-	}
+        return $validator->isValid($this->convertEmail($email), $validation);
+    }
 
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 *
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param string $email
-	 * @return string Converted mail address if `idn_to_ascii` exists
-	 */
-	protected function convertEmail(string $email): string {
-		if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
-			return $email;
-		}
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     *
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param string $email
+     * @return string Converted mail address if `idn_to_ascii` exists
+     */
+    protected function convertEmail(string $email): string {
+        if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
+            return $email;
+        }
 
-		list($name, $domain) = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
-		return $name.'@'.$domain;
-	}
+        list($name, $domain) = explode('@', $email, 2);
+        $domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+        return $name.'@'.$domain;
+    }
 
-	protected function getInstance(): \Swift_Mailer {
-		if (!is_null($this->instance)) {
-			return $this->instance;
-		}
+    protected function getInstance(): \Swift_Mailer {
+        if (!is_null($this->instance)) {
+            return $this->instance;
+        }
 
-		$transport = null;
+        $transport = null;
 
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'sendmail':
-				$transport = $this->getSendMailInstance();
-				break;
-			case 'smtp':
-			default:
-				$transport = $this->getSmtpInstance();
-				break;
-		}
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'sendmail':
+                $transport = $this->getSendMailInstance();
+                break;
+            case 'smtp':
+            default:
+                $transport = $this->getSmtpInstance();
+                break;
+        }
 
-		return new \Swift_Mailer($transport);
-	}
+        return new \Swift_Mailer($transport);
+    }
 
-	/**
-	 * Returns the SMTP transport
-	 *
-	 * @return \Swift_SmtpTransport
-	 */
-	protected function getSmtpInstance(): \Swift_SmtpTransport {
-		$transport = new \Swift_SmtpTransport();
-		$transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
-		$transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
-		$transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
-		if ($this->config->getSystemValue('mail_smtpauth', false)) {
-			$transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
-			$transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
-			$transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
-		}
-		$smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
-		if (!empty($smtpSecurity)) {
-			$transport->setEncryption($smtpSecurity);
-		}
+    /**
+     * Returns the SMTP transport
+     *
+     * @return \Swift_SmtpTransport
+     */
+    protected function getSmtpInstance(): \Swift_SmtpTransport {
+        $transport = new \Swift_SmtpTransport();
+        $transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
+        $transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
+        $transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
+        if ($this->config->getSystemValue('mail_smtpauth', false)) {
+            $transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
+            $transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
+            $transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
+        }
+        $smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
+        if (!empty($smtpSecurity)) {
+            $transport->setEncryption($smtpSecurity);
+        }
 
-		return $transport;
-	}
+        return $transport;
+    }
 
-	/**
-	 * Returns the sendmail transport
-	 *
-	 * @return \Swift_SendmailTransport
-	 */
-	protected function getSendMailInstance(): \Swift_SendmailTransport {
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'qmail':
-				$binaryPath = '/var/qmail/bin/sendmail';
-				break;
-			default:
-				$binaryPath = '/usr/sbin/sendmail';
-				break;
-		}
+    /**
+     * Returns the sendmail transport
+     *
+     * @return \Swift_SendmailTransport
+     */
+    protected function getSendMailInstance(): \Swift_SendmailTransport {
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'qmail':
+                $binaryPath = '/var/qmail/bin/sendmail';
+                break;
+            default:
+                $binaryPath = '/usr/sbin/sendmail';
+                break;
+        }
 
-		return new \Swift_SendmailTransport($binaryPath . ' -bs');
-	}
+        return new \Swift_SendmailTransport($binaryPath . ' -bs');
+    }
 }

settings/Controller/CheckSetupController.php

Indentation +496 added lines, -496 removed lines

@@ -59,289 +59,289 @@ 
  * @package OC\Settings\Controller
  */
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var \OC_Util */
-	private $util;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var Checker */
-	private $checker;
-	/** @var ILogger */
-	private $logger;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IDBConnection|Connection */
-	private $db;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IClientService $clientService,
-								IURLGenerator $urlGenerator,
-								\OC_Util $util,
-								IL10N $l10n,
-								Checker $checker,
-								ILogger $logger,
-								EventDispatcherInterface $dispatcher,
-								IDBConnection $db,
-								ILockingProvider $lockingProvider,
-								IDateTimeFormatter $dateTimeFormatter) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->util = $util;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->checker = $checker;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-		$this->db = $db;
-		$this->lockingProvider = $lockingProvider;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * Checks if the server can connect to the internet using HTTPS and HTTP
-	 * @return bool
-	 */
-	private function isInternetConnectionWorking() {
-		if ($this->config->getSystemValue('has_internet_connection', true) === false) {
-			return false;
-		}
-
-		$siteArray = ['www.nextcloud.com',
-						'www.startpage.com',
-						'www.eff.org',
-						'www.edri.org',
-			];
-
-		foreach($siteArray as $site) {
-			if ($this->isSiteReachable($site)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
-	* @return bool
-	*/
-	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
-
-		try {
-			$client = $this->clientService->newClient();
-			$client->get($httpSiteName);
-			$client->get($httpsSiteName);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'internet_connection_check']);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether a local memcache is installed or not
-	 * @return bool
-	 */
-	private function isMemcacheConfigured() {
-		return $this->config->getSystemValue('memcache.local', null) !== null;
-	}
-
-	/**
-	 * Whether /dev/urandom is available to the PHP controller
-	 *
-	 * @return bool
-	 */
-	private function isUrandomAvailable() {
-		if(@file_exists('/dev/urandom')) {
-			$file = fopen('/dev/urandom', 'rb');
-			if($file) {
-				fclose($file);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Public for the sake of unit-testing
-	 *
-	 * @return array
-	 */
-	protected function getCurlVersion() {
-		return curl_version();
-	}
-
-	/**
-	 * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
-	 * have multiple bugs which likely lead to problems in combination with
-	 * functionality required by ownCloud such as SNI.
-	 *
-	 * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
-	 * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
-	 * @return string
-	 */
-	private function isUsedTlsLibOutdated() {
-		// Don't run check when:
-		// 1. Server has `has_internet_connection` set to false
-		// 2. AppStore AND S2S is disabled
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
-			return '';
-		}
-		if(!$this->config->getSystemValue('appstoreenabled', true)
-			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
-			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
-			return '';
-		}
-
-		$versionString = $this->getCurlVersion();
-		if(isset($versionString['ssl_version'])) {
-			$versionString = $versionString['ssl_version'];
-		} else {
-			return '';
-		}
-
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
-		}
-
-		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if(strpos($versionString, 'OpenSSL/') === 0) {
-			$majorVersion = substr($versionString, 8, 5);
-			$patchRelease = substr($versionString, 13, 6);
-
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
-				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
-				return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
-			}
-		}
-
-		// Check if NSS and perform heuristic check
-		if(strpos($versionString, 'NSS/') === 0) {
-			try {
-				$firstClient = $this->clientService->newClient();
-				$firstClient->get('https://nextcloud.com/');
-
-				$secondClient = $this->clientService->newClient();
-				$secondClient->get('https://nextcloud.com/');
-			} catch (ClientException $e) {
-				if($e->getResponse()->getStatusCode() === 400) {
-					return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Whether the version is outdated
-	 *
-	 * @return bool
-	 */
-	protected function isPhpOutdated() {
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Whether the php version is still supported (at time of release)
-	 * according to: https://secure.php.net/supported-versions.php
-	 *
-	 * @return array
-	 */
-	private function isPhpSupported() {
-		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
-	}
-
-	/**
-	 * Check if the reverse proxy configuration is working as expected
-	 *
-	 * @return bool
-	 */
-	private function forwardedForHeadersWorking() {
-		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-		$remoteAddress = $this->request->getRemoteAddress();
-
-		if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
-			return false;
-		}
-
-		// either not enabled or working correctly
-		return true;
-	}
-
-	/**
-	 * Checks if the correct memcache module for PHP is installed. Only
-	 * fails if memcached is configured and the working module is not installed.
-	 *
-	 * @return bool
-	 */
-	private function isCorrectMemcachedPHPModuleInstalled() {
-		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
-			return true;
-		}
-
-		// there are two different memcached modules for PHP
-		// we only support memcached and not memcache
-		// https://code.google.com/p/memcached/wiki/PHPClientComparison
-		return !(!extension_loaded('memcached') && extension_loaded('memcache'));
-	}
-
-	/**
-	 * Checks if set_time_limit is not disabled.
-	 *
-	 * @return bool
-	 */
-	private function isSettimelimitAvailable() {
-		if (function_exists('set_time_limit')
-			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	public function rescanFailedIntegrityCheck() {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index')
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @return DataResponse
-	 */
-	public function getFailedIntegrityCheckFiles() {
-		if(!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if(!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var \OC_Util */
+    private $util;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var Checker */
+    private $checker;
+    /** @var ILogger */
+    private $logger;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IDBConnection|Connection */
+    private $db;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IClientService $clientService,
+                                IURLGenerator $urlGenerator,
+                                \OC_Util $util,
+                                IL10N $l10n,
+                                Checker $checker,
+                                ILogger $logger,
+                                EventDispatcherInterface $dispatcher,
+                                IDBConnection $db,
+                                ILockingProvider $lockingProvider,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->util = $util;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->checker = $checker;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+        $this->db = $db;
+        $this->lockingProvider = $lockingProvider;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * Checks if the server can connect to the internet using HTTPS and HTTP
+     * @return bool
+     */
+    private function isInternetConnectionWorking() {
+        if ($this->config->getSystemValue('has_internet_connection', true) === false) {
+            return false;
+        }
+
+        $siteArray = ['www.nextcloud.com',
+                        'www.startpage.com',
+                        'www.eff.org',
+                        'www.edri.org',
+            ];
+
+        foreach($siteArray as $site) {
+            if ($this->isSiteReachable($site)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+     * @return bool
+     */
+    private function isSiteReachable($sitename) {
+        $httpSiteName = 'http://' . $sitename . '/';
+        $httpsSiteName = 'https://' . $sitename . '/';
+
+        try {
+            $client = $this->clientService->newClient();
+            $client->get($httpSiteName);
+            $client->get($httpsSiteName);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'internet_connection_check']);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether a local memcache is installed or not
+     * @return bool
+     */
+    private function isMemcacheConfigured() {
+        return $this->config->getSystemValue('memcache.local', null) !== null;
+    }
+
+    /**
+     * Whether /dev/urandom is available to the PHP controller
+     *
+     * @return bool
+     */
+    private function isUrandomAvailable() {
+        if(@file_exists('/dev/urandom')) {
+            $file = fopen('/dev/urandom', 'rb');
+            if($file) {
+                fclose($file);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Public for the sake of unit-testing
+     *
+     * @return array
+     */
+    protected function getCurlVersion() {
+        return curl_version();
+    }
+
+    /**
+     * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
+     * have multiple bugs which likely lead to problems in combination with
+     * functionality required by ownCloud such as SNI.
+     *
+     * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
+     * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
+     * @return string
+     */
+    private function isUsedTlsLibOutdated() {
+        // Don't run check when:
+        // 1. Server has `has_internet_connection` set to false
+        // 2. AppStore AND S2S is disabled
+        if(!$this->config->getSystemValue('has_internet_connection', true)) {
+            return '';
+        }
+        if(!$this->config->getSystemValue('appstoreenabled', true)
+            && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+            && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+            return '';
+        }
+
+        $versionString = $this->getCurlVersion();
+        if(isset($versionString['ssl_version'])) {
+            $versionString = $versionString['ssl_version'];
+        } else {
+            return '';
+        }
+
+        $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+        if(!$this->config->getSystemValue('appstoreenabled', true)) {
+            $features = (string)$this->l10n->t('Federated Cloud Sharing');
+        }
+
+        // Check if at least OpenSSL after 1.01d or 1.0.2b
+        if(strpos($versionString, 'OpenSSL/') === 0) {
+            $majorVersion = substr($versionString, 8, 5);
+            $patchRelease = substr($versionString, 13, 6);
+
+            if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+                ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
+                return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
+            }
+        }
+
+        // Check if NSS and perform heuristic check
+        if(strpos($versionString, 'NSS/') === 0) {
+            try {
+                $firstClient = $this->clientService->newClient();
+                $firstClient->get('https://nextcloud.com/');
+
+                $secondClient = $this->clientService->newClient();
+                $secondClient->get('https://nextcloud.com/');
+            } catch (ClientException $e) {
+                if($e->getResponse()->getStatusCode() === 400) {
+                    return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Whether the version is outdated
+     *
+     * @return bool
+     */
+    protected function isPhpOutdated() {
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Whether the php version is still supported (at time of release)
+     * according to: https://secure.php.net/supported-versions.php
+     *
+     * @return array
+     */
+    private function isPhpSupported() {
+        return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
+    }
+
+    /**
+     * Check if the reverse proxy configuration is working as expected
+     *
+     * @return bool
+     */
+    private function forwardedForHeadersWorking() {
+        $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+        $remoteAddress = $this->request->getRemoteAddress();
+
+        if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
+            return false;
+        }
+
+        // either not enabled or working correctly
+        return true;
+    }
+
+    /**
+     * Checks if the correct memcache module for PHP is installed. Only
+     * fails if memcached is configured and the working module is not installed.
+     *
+     * @return bool
+     */
+    private function isCorrectMemcachedPHPModuleInstalled() {
+        if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+            return true;
+        }
+
+        // there are two different memcached modules for PHP
+        // we only support memcached and not memcache
+        // https://code.google.com/p/memcached/wiki/PHPClientComparison
+        return !(!extension_loaded('memcached') && extension_loaded('memcache'));
+    }
+
+    /**
+     * Checks if set_time_limit is not disabled.
+     *
+     * @return bool
+     */
+    private function isSettimelimitAvailable() {
+        if (function_exists('set_time_limit')
+            && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    public function rescanFailedIntegrityCheck() {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index')
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @return DataResponse
+     */
+    public function getFailedIntegrityCheckFiles() {
+        if(!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if(!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -350,220 +350,220 @@ 
 Results
 =======
 ';
-			foreach($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		$response = new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Checks whether a PHP opcache is properly set up
-	 * @return bool
-	 */
-	protected function isOpcacheProperlySetup() {
-		$iniWrapper = new IniGetWrapper();
-
-		$isOpcacheProperlySetUp = true;
-
-		if(!$iniWrapper->getBool('opcache.enable')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		return $isOpcacheProperlySetUp;
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasFreeTypeSupport() {
-		return function_exists('imagettfbbox') && function_exists('imagettftext');
-	}
-
-	protected function hasMissingIndexes(): array {
-		$indexInfo = new MissingIndexInformation();
-		// Dispatch event so apps can also hint for pending index updates if needed
-		$event = new GenericEvent($indexInfo);
-		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
-
-		return $indexInfo->getListOfMissingIndexes();
-	}
-
-	/**
-	 * warn if outdated version of a memcache module is used
-	 */
-	protected function getOutdatedCaches(): array {
-		$caches = [
-			'apcu'	=> ['name' => 'APCu', 'version' => '4.0.6'],
-			'redis'	=> ['name' => 'Redis', 'version' => '2.2.5'],
-		];
-		$outdatedCaches = [];
-		foreach ($caches as $php_module => $data) {
-			$isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<');
-			if ($isOutdated) {
-				$outdatedCaches[] = $data;
-			}
-		}
-
-		return $outdatedCaches;
-	}
-
-	protected function isSqliteUsed() {
-		return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
-	}
-
-	protected function isReadOnlyConfig(): bool {
-		return \OC_Helper::isReadOnlyConfigEnabled();
-	}
-
-	protected function hasValidTransactionIsolationLevel(): bool {
-		try {
-			if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
-				return true;
-			}
-
-			return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
-		} catch (DBALException $e) {
-			// ignore
-		}
-
-		return true;
-	}
-
-	protected function hasFileinfoInstalled(): bool {
-		return \OC_Util::fileInfoLoaded();
-	}
-
-	protected function hasWorkingFileLocking(): bool {
-		return !($this->lockingProvider instanceof NoopLockingProvider);
-	}
-
-	protected function getSuggestedOverwriteCliURL(): string {
-		$suggestedOverwriteCliUrl = '';
-		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
-			if (!$this->config->getSystemValue('config_is_read_only', false)) {
-				// Set the overwrite URL when it was not set yet.
-				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
-				$suggestedOverwriteCliUrl = '';
-			}
-		}
-		return $suggestedOverwriteCliUrl;
-	}
-
-	protected function getLastCronInfo(): array {
-		$lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
-		return [
-			'diffInSeconds' => time() - $lastCronRun,
-			'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
-			'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
-		];
-	}
-
-	protected function getCronErrors() {
-		$errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
-
-		if (is_array($errors)) {
-			return $errors;
-		}
-
-		return [];
-	}
-
-	protected function isPhpMailerUsed(): bool {
-		return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function check() {
-		return new DataResponse(
-			[
-				'isGetenvServerWorking' => !empty(getenv('PATH')),
-				'isReadOnlyConfig' => $this->isReadOnlyConfig(),
-				'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
-				'outdatedCaches' => $this->getOutdatedCaches(),
-				'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
-				'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
-				'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
-				'cronInfo' => $this->getLastCronInfo(),
-				'cronErrors' => $this->getCronErrors(),
-				'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
-				'isMemcacheConfigured' => $this->isMemcacheConfigured(),
-				'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
-				'isUrandomAvailable' => $this->isUrandomAvailable(),
-				'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
-				'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-				'phpSupported' => $this->isPhpSupported(),
-				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
-				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
-				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
-				'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
-				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
-				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
-				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
-				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
-				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
-				'missingIndexes' => $this->hasMissingIndexes(),
-				'isSqliteUsed' => $this->isSqliteUsed(),
-				'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
-				'isPhpMailerUsed' => $this->isPhpMailerUsed(),
-				'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin')
-			]
-		);
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        $response = new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+
+        return $response;
+    }
+
+    /**
+     * Checks whether a PHP opcache is properly set up
+     * @return bool
+     */
+    protected function isOpcacheProperlySetup() {
+        $iniWrapper = new IniGetWrapper();
+
+        $isOpcacheProperlySetUp = true;
+
+        if(!$iniWrapper->getBool('opcache.enable')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.save_comments')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.enable_cli')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        return $isOpcacheProperlySetUp;
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasFreeTypeSupport() {
+        return function_exists('imagettfbbox') && function_exists('imagettftext');
+    }
+
+    protected function hasMissingIndexes(): array {
+        $indexInfo = new MissingIndexInformation();
+        // Dispatch event so apps can also hint for pending index updates if needed
+        $event = new GenericEvent($indexInfo);
+        $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
+
+        return $indexInfo->getListOfMissingIndexes();
+    }
+
+    /**
+     * warn if outdated version of a memcache module is used
+     */
+    protected function getOutdatedCaches(): array {
+        $caches = [
+            'apcu'	=> ['name' => 'APCu', 'version' => '4.0.6'],
+            'redis'	=> ['name' => 'Redis', 'version' => '2.2.5'],
+        ];
+        $outdatedCaches = [];
+        foreach ($caches as $php_module => $data) {
+            $isOutdated = extension_loaded($php_module) && version_compare(phpversion($php_module), $data['version'], '<');
+            if ($isOutdated) {
+                $outdatedCaches[] = $data;
+            }
+        }
+
+        return $outdatedCaches;
+    }
+
+    protected function isSqliteUsed() {
+        return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
+    }
+
+    protected function isReadOnlyConfig(): bool {
+        return \OC_Helper::isReadOnlyConfigEnabled();
+    }
+
+    protected function hasValidTransactionIsolationLevel(): bool {
+        try {
+            if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
+                return true;
+            }
+
+            return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
+        } catch (DBALException $e) {
+            // ignore
+        }
+
+        return true;
+    }
+
+    protected function hasFileinfoInstalled(): bool {
+        return \OC_Util::fileInfoLoaded();
+    }
+
+    protected function hasWorkingFileLocking(): bool {
+        return !($this->lockingProvider instanceof NoopLockingProvider);
+    }
+
+    protected function getSuggestedOverwriteCliURL(): string {
+        $suggestedOverwriteCliUrl = '';
+        if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
+            $suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+            if (!$this->config->getSystemValue('config_is_read_only', false)) {
+                // Set the overwrite URL when it was not set yet.
+                $this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
+                $suggestedOverwriteCliUrl = '';
+            }
+        }
+        return $suggestedOverwriteCliUrl;
+    }
+
+    protected function getLastCronInfo(): array {
+        $lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
+        return [
+            'diffInSeconds' => time() - $lastCronRun,
+            'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
+            'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
+        ];
+    }
+
+    protected function getCronErrors() {
+        $errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
+
+        if (is_array($errors)) {
+            return $errors;
+        }
+
+        return [];
+    }
+
+    protected function isPhpMailerUsed(): bool {
+        return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php';
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function check() {
+        return new DataResponse(
+            [
+                'isGetenvServerWorking' => !empty(getenv('PATH')),
+                'isReadOnlyConfig' => $this->isReadOnlyConfig(),
+                'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
+                'outdatedCaches' => $this->getOutdatedCaches(),
+                'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
+                'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
+                'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
+                'cronInfo' => $this->getLastCronInfo(),
+                'cronErrors' => $this->getCronErrors(),
+                'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
+                'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+                'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
+                'isUrandomAvailable' => $this->isUrandomAvailable(),
+                'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
+                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
+                'phpSupported' => $this->isPhpSupported(),
+                'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
+                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
+                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
+                'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
+                'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
+                'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+                'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
+                'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
+                'missingIndexes' => $this->hasMissingIndexes(),
+                'isSqliteUsed' => $this->isSqliteUsed(),
+                'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
+                'isPhpMailerUsed' => $this->isPhpMailerUsed(),
+                'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin')
+            ]
+        );
+    }
 }