nextcloud / server

lib/private/Settings/Admin/Mail.php

Indentation +47 added lines, -47 removed lines

@@ -30,57 +30,57 @@
 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'] = '********';
+        }
 
-		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/Settings/Admin/Overview.php

Indentation +108 added lines, -108 removed lines

@@ -37,123 +37,123 @@
 use OCP\Settings\ISettings;
 
 class Overview implements ISettings {
-	/** @var IDBConnection|Connection */
-	private $db;
-	/** @var IRequest */
-	private $request;
-	/** @var IConfig */
-	private $config;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IL10N */
-	private $l;
+    /** @var IDBConnection|Connection */
+    private $db;
+    /** @var IRequest */
+    private $request;
+    /** @var IConfig */
+    private $config;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IL10N */
+    private $l;
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param ILockingProvider $lockingProvider
-	 * @param IL10N $l
-	 */
-	public function __construct(IDBConnection $db,
-								IRequest $request,
-								IConfig $config,
-								ILockingProvider $lockingProvider,
-								IL10N $l) {
-		$this->db = $db;
-		$this->request = $request;
-		$this->config = $config;
-		$this->lockingProvider = $lockingProvider;
-		$this->l = $l;
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param ILockingProvider $lockingProvider
+     * @param IL10N $l
+     */
+    public function __construct(IDBConnection $db,
+                                IRequest $request,
+                                IConfig $config,
+                                ILockingProvider $lockingProvider,
+                                IL10N $l) {
+        $this->db = $db;
+        $this->request = $request;
+        $this->config = $config;
+        $this->lockingProvider = $lockingProvider;
+        $this->l = $l;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		try {
-			if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
-				$invalidTransactionIsolationLevel = false;
-			} else {
-				$invalidTransactionIsolationLevel = $this->db->getTransactionIsolation() !== Connection::TRANSACTION_READ_COMMITTED;
-			}
-		} catch (DBALException $e) {
-			// ignore
-			$invalidTransactionIsolationLevel = false;
-		}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        try {
+            if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
+                $invalidTransactionIsolationLevel = false;
+            } else {
+                $invalidTransactionIsolationLevel = $this->db->getTransactionIsolation() !== Connection::TRANSACTION_READ_COMMITTED;
+            }
+        } catch (DBALException $e) {
+            // ignore
+            $invalidTransactionIsolationLevel = false;
+        }
 
-		$envPath = getenv('PATH');
+        $envPath = getenv('PATH');
 
-		// warn if outdated version of a memcache module is used
-		$caches = [
-			'apcu'	=> ['name' => $this->l->t('APCu'), 'version' => '4.0.6'],
-			'redis'	=> ['name' => $this->l->t('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[$php_module] = $data;
-			}
-		}
+        // warn if outdated version of a memcache module is used
+        $caches = [
+            'apcu'	=> ['name' => $this->l->t('APCu'), 'version' => '4.0.6'],
+            'redis'	=> ['name' => $this->l->t('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[$php_module] = $data;
+            }
+        }
 
-		if ($this->lockingProvider instanceof NoopLockingProvider) {
-			$fileLockingType = 'none';
-		} else if ($this->lockingProvider instanceof DBLockingProvider) {
-			$fileLockingType = 'db';
-		} else {
-			$fileLockingType = 'cache';
-		}
+        if ($this->lockingProvider instanceof NoopLockingProvider) {
+            $fileLockingType = 'none';
+        } else if ($this->lockingProvider instanceof DBLockingProvider) {
+            $fileLockingType = 'db';
+        } else {
+            $fileLockingType = 'cache';
+        }
 
-		$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 = '';
-			}
-		}
+        $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 = '';
+            }
+        }
 
-		$parameters = [
-			// Diagnosis
-			'readOnlyConfigEnabled'            => \OC_Helper::isReadOnlyConfigEnabled(),
-			'isLocaleWorking'                  => \OC_Util::isSetLocaleWorking(),
-			'isAnnotationsWorking'             => \OC_Util::isAnnotationsWorking(),
-			'checkForWorkingWellKnownSetup'    => $this->config->getSystemValue('check_for_working_wellknown_setup', true),
-			'has_fileinfo'                     => \OC_Util::fileInfoLoaded(),
-			'invalidTransactionIsolationLevel' => $invalidTransactionIsolationLevel,
-			'getenvServerNotWorking'           => empty($envPath),
-			'OutdatedCacheWarning'             => $outdatedCaches,
-			'fileLockingType'                  => $fileLockingType,
-			'suggestedOverwriteCliUrl'         => $suggestedOverwriteCliUrl,
+        $parameters = [
+            // Diagnosis
+            'readOnlyConfigEnabled'            => \OC_Helper::isReadOnlyConfigEnabled(),
+            'isLocaleWorking'                  => \OC_Util::isSetLocaleWorking(),
+            'isAnnotationsWorking'             => \OC_Util::isAnnotationsWorking(),
+            'checkForWorkingWellKnownSetup'    => $this->config->getSystemValue('check_for_working_wellknown_setup', true),
+            'has_fileinfo'                     => \OC_Util::fileInfoLoaded(),
+            'invalidTransactionIsolationLevel' => $invalidTransactionIsolationLevel,
+            'getenvServerNotWorking'           => empty($envPath),
+            'OutdatedCacheWarning'             => $outdatedCaches,
+            'fileLockingType'                  => $fileLockingType,
+            'suggestedOverwriteCliUrl'         => $suggestedOverwriteCliUrl,
 
-			// Background jobs
-			'backgroundjobs_mode' => $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax'),
-			'lastcron'            => $this->config->getAppValue('core', 'lastcron', false),
-			'cronErrors'		  => $this->config->getAppValue('core', 'cronErrors'),
-			'cli_based_cron_possible' => function_exists('posix_getpwuid'),
-			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir . 'config.php'))['name'] : '',
-		];
+            // Background jobs
+            'backgroundjobs_mode' => $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax'),
+            'lastcron'            => $this->config->getAppValue('core', 'lastcron', false),
+            'cronErrors'		  => $this->config->getAppValue('core', 'cronErrors'),
+            'cli_based_cron_possible' => function_exists('posix_getpwuid'),
+            'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir . 'config.php'))['name'] : '',
+        ];
 
-		return new TemplateResponse('settings', 'settings/admin/overview', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'settings/admin/overview', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'overview';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'overview';
+    }
 
-	/**
-	 * @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;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 
 		$suggestedOverwriteCliUrl = '';
 		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+			$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);
@@ -133,7 +133,7 @@ 
 			'lastcron'            => $this->config->getAppValue('core', 'lastcron', false),
 			'cronErrors'		  => $this->config->getAppValue('core', 'cronErrors'),
 			'cli_based_cron_possible' => function_exists('posix_getpwuid'),
-			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir . 'config.php'))['name'] : '',
+			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir.'config.php'))['name'] : '',
 		];
 
 		return new TemplateResponse('settings', 'settings/admin/overview', $parameters, '');

apps/files/lib/Settings/Admin.php

Indentation +43 added lines, -43 removed lines

@@ -32,56 +32,56 @@
 
 class Admin implements ISettings {
 
-	/** @var IniGetWrapper */
-	private $iniWrapper;
+    /** @var IniGetWrapper */
+    private $iniWrapper;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
-		$this->iniWrapper = $iniWrapper;
-		$this->request = $request;
-	}
+    public function __construct(IniGetWrapper $iniWrapper, IRequest $request) {
+        $this->iniWrapper = $iniWrapper;
+        $this->request = $request;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$htaccessWorking  = (getenv('htaccessWorking') === 'true');
-		$htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
-		$userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $htaccessWorking  = (getenv('htaccessWorking') === 'true');
+        $htaccessWritable = is_writable(\OC::$SERVERROOT.'/.htaccess');
+        $userIniWritable  = is_writable(\OC::$SERVERROOT.'/.user.ini');
 
-		$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
-		$post_max_size = $this->iniWrapper->getBytes('post_max_size');
-		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
+        $upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
+        $post_max_size = $this->iniWrapper->getBytes('post_max_size');
+        $maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 
-		$parameters = [
-			'uploadChangable'              => ($htaccessWorking and $htaccessWritable) or $userIniWritable,
-			'uploadMaxFilesize'            => $maxUploadFilesize,
-			// max possible makes only sense on a 32 bit system
-			'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
-			'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
-		];
+        $parameters = [
+            'uploadChangable'              => ($htaccessWorking and $htaccessWritable) or $userIniWritable,
+            'uploadMaxFilesize'            => $maxUploadFilesize,
+            // max possible makes only sense on a 32 bit system
+            'displayMaxPossibleUploadSize' => PHP_INT_SIZE === 4,
+            'maxPossibleUploadSize'        => Util::humanFileSize(PHP_INT_MAX),
+        ];
 
-		return new TemplateResponse('files', 'admin', $parameters, '');
-	}
+        return new TemplateResponse('files', 'admin', $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 5;
-	}
+    /**
+     * @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 5;
+    }
 
 }

apps/dav/lib/Settings/CalDAVSettings.php

Indentation +32 added lines, -32 removed lines

@@ -29,41 +29,41 @@
 
 class CalDAVSettings implements ISettings {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * CalDAVSettings constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * CalDAVSettings constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$parameters = [
-			'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'),
-			'generate_birthday_calendar' => $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'),
-		];
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $parameters = [
+            'send_invitations' => $this->config->getAppValue('dav', 'sendInvitations', 'yes'),
+            'generate_birthday_calendar' => $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes'),
+        ];
 
-		return new TemplateResponse('dav', 'settings-admin-caldav', $parameters);
-	}
+        return new TemplateResponse('dav', 'settings-admin-caldav', $parameters);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSection() {
-		return 'server';
-	}
+    /**
+     * @return string
+     */
+    public function getSection() {
+        return 'server';
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return 20;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return 20;
+    }
 }

apps/updatenotification/lib/Settings/Admin.php

Indentation +110 added lines, -110 removed lines

@@ -35,114 +35,114 @@
 use OCP\Util;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	/**
-	 * @param IConfig $config
-	 * @param UpdateChecker $updateChecker
-	 * @param IGroupManager $groupManager
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct(IConfig $config,
-								UpdateChecker $updateChecker,
-								IGroupManager $groupManager,
-								IDateTimeFormatter $dateTimeFormatter) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->groupManager = $groupManager;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
-			'lastChecked' => $lastUpdateCheck,
-			'currentChannel' => $currentChannel,
-			'channels' => $channels,
-			'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
-			'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
-			'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
-			'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
-			'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notifyGroups' => $this->getSelectedGroups($notifyGroups),
-			'withSettings' => true,
-		];
-
-		$params = [
-			'json' => json_encode($params),
-			'withSettings' => true,
-		];
-
-		return new TemplateResponse('updatenotification', 'admin', $params, '');
-	}
-
-	/**
-	 * @param array $groupIds
-	 * @return array
-	 */
-	protected function getSelectedGroups(array $groupIds): array {
-		$result = [];
-		foreach ($groupIds as $groupId) {
-			$group = $this->groupManager->get($groupId);
-
-			if ($group === null) {
-				continue;
-			}
-
-			$result[] = ['value' => $group->getGID(), 'label' => $group->getDisplayName()];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): string {
-		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(): int {
-		return 90;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+
+    /**
+     * @param IConfig $config
+     * @param UpdateChecker $updateChecker
+     * @param IGroupManager $groupManager
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct(IConfig $config,
+                                UpdateChecker $updateChecker,
+                                IGroupManager $groupManager,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        $this->config = $config;
+        $this->updateChecker = $updateChecker;
+        $this->groupManager = $groupManager;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        $lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
+            'lastChecked' => $lastUpdateCheck,
+            'currentChannel' => $currentChannel,
+            'channels' => $channels,
+            'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+            'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
+            'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
+            'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
+            'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notifyGroups' => $this->getSelectedGroups($notifyGroups),
+            'withSettings' => true,
+        ];
+
+        $params = [
+            'json' => json_encode($params),
+            'withSettings' => true,
+        ];
+
+        return new TemplateResponse('updatenotification', 'admin', $params, '');
+    }
+
+    /**
+     * @param array $groupIds
+     * @return array
+     */
+    protected function getSelectedGroups(array $groupIds): array {
+        $result = [];
+        foreach ($groupIds as $groupId) {
+            $group = $this->groupManager->get($groupId);
+
+            if ($group === null) {
+                continue;
+            }
+
+            $result[] = ['value' => $group->getGID(), 'label' => $group->getDisplayName()];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection(): string {
+        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(): int {
+        return 90;
+    }
 }

apps/updatenotification/templates/admin.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright (c) 2018 Joas Schilling <coding@schilljs.com>
  *
@@ -12,9 +12,9 @@ 
 style('updatenotification', 'admin');
 /** @var array $_ */
 ?>
-<?php if($_['withSettings'] === true) { ?>
+<?php if ($_['withSettings'] === true) { ?>
 <div class="section">
-	<h2><?php p($l->t('Updates'));?></h2>
+	<h2><?php p($l->t('Updates')); ?></h2>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 </div>
 <?php }?>

apps/updatenotification/composer/composer/autoload_static.php

Spacing +16 added lines, -16 removed lines

@@ -6,35 +6,35 @@
 
 class ComposerStaticInitUpdateNotification
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\UpdateNotification\\' => 23,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\UpdateNotification\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__ . '/..' . '/../lib/Controller/APIController.php',
-        'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__ . '/..' . '/../lib/Controller/AdminController.php',
-        'OCA\\UpdateNotification\\Notification\\BackgroundJob' => __DIR__ . '/..' . '/../lib/Notification/BackgroundJob.php',
-        'OCA\\UpdateNotification\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\UpdateNotification\\ResetTokenBackgroundJob' => __DIR__ . '/..' . '/../lib/ResetTokenBackgroundJob.php',
-        'OCA\\UpdateNotification\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\UpdateNotification\\Settings\\AdminOverview' => __DIR__ . '/..' . '/../lib/Settings/AdminOverview.php',
-        'OCA\\UpdateNotification\\UpdateChecker' => __DIR__ . '/..' . '/../lib/UpdateChecker.php',
+    public static $classMap = array(
+        'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__.'/..'.'/../lib/Controller/APIController.php',
+        'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__.'/..'.'/../lib/Controller/AdminController.php',
+        'OCA\\UpdateNotification\\Notification\\BackgroundJob' => __DIR__.'/..'.'/../lib/Notification/BackgroundJob.php',
+        'OCA\\UpdateNotification\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\UpdateNotification\\ResetTokenBackgroundJob' => __DIR__.'/..'.'/../lib/ResetTokenBackgroundJob.php',
+        'OCA\\UpdateNotification\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\UpdateNotification\\Settings\\AdminOverview' => __DIR__.'/..'.'/../lib/Settings/AdminOverview.php',
+        'OCA\\UpdateNotification\\UpdateChecker' => __DIR__.'/..'.'/../lib/UpdateChecker.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitUpdateNotification::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitUpdateNotification::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitUpdateNotification::$classMap;

apps/updatenotification/composer/composer/autoload_classmap.php

Spacing +9 added lines, -9 removed lines

@@ -6,13 +6,13 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\UpdateNotification\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\UpdateNotification\\Controller\\APIController' => $baseDir . '/../lib/Controller/APIController.php',
-    'OCA\\UpdateNotification\\Controller\\AdminController' => $baseDir . '/../lib/Controller/AdminController.php',
-    'OCA\\UpdateNotification\\Notification\\BackgroundJob' => $baseDir . '/../lib/Notification/BackgroundJob.php',
-    'OCA\\UpdateNotification\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
-    'OCA\\UpdateNotification\\ResetTokenBackgroundJob' => $baseDir . '/../lib/ResetTokenBackgroundJob.php',
-    'OCA\\UpdateNotification\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\UpdateNotification\\Settings\\AdminOverview' => $baseDir . '/../lib/Settings/AdminOverview.php',
-    'OCA\\UpdateNotification\\UpdateChecker' => $baseDir . '/../lib/UpdateChecker.php',
+    'OCA\\UpdateNotification\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\UpdateNotification\\Controller\\APIController' => $baseDir.'/../lib/Controller/APIController.php',
+    'OCA\\UpdateNotification\\Controller\\AdminController' => $baseDir.'/../lib/Controller/AdminController.php',
+    'OCA\\UpdateNotification\\Notification\\BackgroundJob' => $baseDir.'/../lib/Notification/BackgroundJob.php',
+    'OCA\\UpdateNotification\\Notification\\Notifier' => $baseDir.'/../lib/Notification/Notifier.php',
+    'OCA\\UpdateNotification\\ResetTokenBackgroundJob' => $baseDir.'/../lib/ResetTokenBackgroundJob.php',
+    'OCA\\UpdateNotification\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\UpdateNotification\\Settings\\AdminOverview' => $baseDir.'/../lib/Settings/AdminOverview.php',
+    'OCA\\UpdateNotification\\UpdateChecker' => $baseDir.'/../lib/UpdateChecker.php',
 );

settings/templates/settings/admin/overview.php

Indentation +50 added lines, -50 removed lines

@@ -31,101 +31,101 @@ 
 	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information.'));?></p>
 	<ul>
 		<?php
-		// is php setup properly to query system environment variables like getenv('PATH')
-		if ($_['getenvServerNotWorking']) {
-			?>
+        // is php setup properly to query system environment variables like getenv('PATH')
+        if ($_['getenvServerNotWorking']) {
+            ?>
 			<li>
 				<?php p($l->t('PHP does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
 				<?php print_unescaped($l->t('Please check the <a target="_blank" rel="noreferrer noopener" href="%s">installation documentation ↗</a> for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// is read only config enabled
-		if ($_['readOnlyConfigEnabled']) {
-			?>
+        // is read only config enabled
+        if ($_['readOnlyConfigEnabled']) {
+            ?>
 			<li>
 				<?php p($l->t('The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Are doc blocks accessible?
-		if (!$_['isAnnotationsWorking']) {
-			?>
+        // Are doc blocks accessible?
+        if (!$_['isAnnotationsWorking']) {
+            ?>
 			<li>
 				<?php p($l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
 				<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Is the Transaction isolation level READ_COMMITTED?
-		if ($_['invalidTransactionIsolationLevel']) {
-			?>
+        // Is the Transaction isolation level READ_COMMITTED?
+        if ($_['invalidTransactionIsolationLevel']) {
+            ?>
 			<li>
 				<?php p($l->t('Your database does not run with "READ COMMITTED" transaction isolation level. This can cause problems when multiple actions are executed in parallel.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// Warning if memcache is outdated
-		foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
-			?>
+        // Warning if memcache is outdated
+        foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
+            ?>
 			<li>
 				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version.', $data)); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// if module fileinfo available?
-		if (!$_['has_fileinfo']) {
-			?>
+        // if module fileinfo available?
+        if (!$_['has_fileinfo']) {
+            ?>
 			<li>
 				<?php p($l->t('The PHP module \'fileinfo\' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection.')); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// locking configured optimally?
-		if ($_['fileLockingType'] === 'none') {
-			?>
+        // locking configured optimally?
+        if ($_['fileLockingType'] === 'none') {
+            ?>
 			<li>
 				<?php print_unescaped($l->t('Transactional file locking is disabled, this might lead to issues with race conditions. Enable \'filelocking.enabled\' in config.php to avoid these problems. See the <a target="_blank" rel="noreferrer noopener" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
 			</li>
 			<?php
-		}
+        }
 
-		// is locale working ?
-		if (!$_['isLocaleWorking']) {
-			?>
+        // is locale working ?
+        if (!$_['isLocaleWorking']) {
+            ?>
 			<li>
 				<?php
-				$locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
-				p($l->t('System locale can not be set to a one which supports UTF-8.'));
-				?>
+                $locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8';
+                p($l->t('System locale can not be set to a one which supports UTF-8.'));
+                ?>
 				<br>
 				<?php
-				p($l->t('This means that there might be problems with certain characters in filenames.'));
-				?>
+                p($l->t('This means that there might be problems with certain characters in filenames.'));
+                ?>
 				<br>
 				<?php
-				p($l->t('It is strongly proposed to install the required packages on your system to support one of the following locales: %s.', [$locales]));
-				?>
+                p($l->t('It is strongly proposed to install the required packages on your system to support one of the following locales: %s.', [$locales]));
+                ?>
 			</li>
 			<?php
-		}
+        }
 
-		if ($_['suggestedOverwriteCliUrl']) {
-			?>
+        if ($_['suggestedOverwriteCliUrl']) {
+            ?>
 			<li>
 				<?php p($l->t('If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
 			</li>
 			<?php
-		}
+        }
 
-		if ($_['cronErrors']) {
-			?>
+        if ($_['cronErrors']) {
+            ?>
 			<li>
 				<?php p($l->t('It was not possible to execute the cron job via CLI. The following technical errors have appeared:')); ?>
 				<br>
@@ -136,13 +136,13 @@ 
 				</ol>
 			</li>
 			<?php
-		}
-		?>
+        }
+        ?>
 		<?php if ($_['lastcron'] !== false):
-				$relative_time = relative_modified_date($_['lastcron']);
-				$formatter = \OC::$server->getDateTimeFormatter();
-				$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
-				if (time() - $_['lastcron'] > 3600): ?>
+                $relative_time = relative_modified_date($_['lastcron']);
+                $formatter = \OC::$server->getDateTimeFormatter();
+                $absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
+                if (time() - $_['lastcron'] > 3600): ?>
 					<li class="crondate" title="<?php p($absolute_time);?>">
 						<?php p($l->t("Last background job execution ran %s. Something seems wrong.", [$relative_time]));?>
 						<a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'server'])); ?>#backgroundjobs"><?php p($l->t('Check the background job settings')); ?></a>

Spacing +9 added lines, -9 removed lines

@@ -27,8 +27,8 @@ 
 ?>
 
 <div id="security-warning" class="section">
-	<h2><?php p($l->t('Security & setup warnings'));?></h2>
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information.'));?></p>
+	<h2><?php p($l->t('Security & setup warnings')); ?></h2>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Tricks section and the documentation for more information.')); ?></p>
 	<ul>
 		<?php
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -130,7 +130,7 @@ 
 				<?php p($l->t('It was not possible to execute the cron job via CLI. The following technical errors have appeared:')); ?>
 				<br>
 				<ol>
-					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
+					<?php foreach (json_decode($_['cronErrors']) as $error) { if (isset($error->error)) {?>
 						<li><?php p($error->error) ?> <?php p($error->hint) ?></li>
 					<?php }} ?>
 				</ol>
@@ -143,30 +143,30 @@ 
 				$formatter = \OC::$server->getDateTimeFormatter();
 				$absolute_time = $formatter->formatDateTime($_['lastcron'], 'long', 'long');
 				if (time() - $_['lastcron'] > 3600): ?>
-					<li class="crondate" title="<?php p($absolute_time);?>">
-						<?php p($l->t("Last background job execution ran %s. Something seems wrong.", [$relative_time]));?>
+					<li class="crondate" title="<?php p($absolute_time); ?>">
+						<?php p($l->t("Last background job execution ran %s. Something seems wrong.", [$relative_time])); ?>
 						<a href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'server'])); ?>#backgroundjobs"><?php p($l->t('Check the background job settings')); ?></a>
 					</li>
 				<?php endif; ?>
 			<?php endif; ?>
 	</ul>
 
-	<div id="postsetupchecks" data-check-wellknown="<?php if($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
+	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) { p('true'); } else { p('false'); } ?>">
 		<div class="loading"></div>
 		<ul class="errors hidden"></ul>
 		<ul class="warnings hidden"></ul>
 		<ul class="info hidden"></ul>
 		<p class="hint hidden">
-			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])] )); ?>
+			<?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?>
 		</p>
 	</div>
 	<div id="security-warning-state">
-		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span>
+		<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.')); ?></span>
 	</div>
 </div>
 
 <div class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 </div>