nextcloud / server

apps/updatenotification/templates/admin.php

Indentation +19 added lines, -19 removed lines

@@ -1,25 +1,25 @@
 <?php
 declare(strict_types=1);
-	script('updatenotification', 'admin');
-	style('updatenotification', 'admin');
+    script('updatenotification', 'admin');
+    style('updatenotification', 'admin');
 
-	/** @var array $_ */
-	/** @var bool $isNewVersionAvailable */
-	$isNewVersionAvailable = $_['isNewVersionAvailable'];
-	/** @var string $newVersionString */
-	$newVersionString = $_['newVersionString'];
-	/** @var bool $isUpdateChecked */
-	$isUpdateChecked = $_['isUpdateChecked'];
-	/** @var string $lastCheckedDate */
-	$lastCheckedDate = $_['lastChecked'];
-	/** @var array $channels */
-	$channels = $_['channels'];
-	/** @var string $currentChannel */
-	$currentChannel = $_['currentChannel'];
-	/** @var string $updateServerURL */
-	$updateServerURL = $_['updateServerURL'];
-	/** @var bool $isDefaultUpdateServerURL */
-	$isDefaultUpdateServerURL = $_['isDefaultUpdateServerURL'];
+    /** @var array $_ */
+    /** @var bool $isNewVersionAvailable */
+    $isNewVersionAvailable = $_['isNewVersionAvailable'];
+    /** @var string $newVersionString */
+    $newVersionString = $_['newVersionString'];
+    /** @var bool $isUpdateChecked */
+    $isUpdateChecked = $_['isUpdateChecked'];
+    /** @var string $lastCheckedDate */
+    $lastCheckedDate = $_['lastChecked'];
+    /** @var array $channels */
+    $channels = $_['channels'];
+    /** @var string $currentChannel */
+    $currentChannel = $_['currentChannel'];
+    /** @var string $updateServerURL */
+    $updateServerURL = $_['updateServerURL'];
+    /** @var bool $isDefaultUpdateServerURL */
+    $isDefaultUpdateServerURL = $_['isDefaultUpdateServerURL'];
 ?>
 <form id="oca_updatenotification_section" class="followupsection">
 	<p>

apps/updatenotification/lib/Notification/BackgroundJob.php

Indentation +237 added lines, -237 removed lines

@@ -37,241 +37,241 @@
 
 class BackgroundJob extends TimedJob {
 
-	protected $connectionNotifications = [3, 7, 14, 30];
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IClientService */
-	protected $client;
-
-	/** @var Installer */
-	protected $installer;
-
-	/** @var string[] */
-	protected $users;
-
-	/**
-	 * NotificationBackgroundJob constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IGroupManager $groupManager
-	 * @param IAppManager $appManager
-	 * @param IClientService $client
-	 * @param Installer $installer
-	 */
-	public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client, Installer $installer) {
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-
-		$this->config = $config;
-		$this->notificationManager = $notificationManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->client = $client;
-		$this->installer = $installer;
-	}
-
-	protected function run($argument) {
-		$this->checkCoreUpdate();
-		$this->checkAppUpdates();
-	}
-
-	/**
-	 * Check for ownCloud update
-	 */
-	protected function checkCoreUpdate() {
-		if (\in_array($this->getChannel(), ['daily', 'git'], true)) {
-			// "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
-			return;
-		}
-
-		$updater = $this->createVersionCheck();
-
-		$status = $updater->check();
-		if ($status === false) {
-			$errors = 1 + (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			$this->config->setAppValue('updatenotification', 'update_check_errors', $errors);
-
-			if (\in_array($errors, $this->connectionNotifications, true)) {
-				$this->sendErrorNotifications($errors);
-			}
-		} else if (\is_array($status)) {
-			$this->config->setAppValue('updatenotification', 'update_check_errors', 0);
-			$this->clearErrorNotifications();
-
-			if (isset($status['version'])) {
-				$this->createNotifications('core', $status['version'], $status['versionstring']);
-			}
-		}
-	}
-
-	/**
-	 * Send a message to the admin when the update server could not be reached
-	 * @param int $numDays
-	 */
-	protected function sendErrorNotifications($numDays) {
-		$this->clearErrorNotifications();
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setDateTime(new \DateTime())
-				->setObject('updatenotification', 'error')
-				->setSubject('connection_error', ['days' => $numDays]);
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-	}
-
-	/**
-	 * Remove error notifications again
-	 */
-	protected function clearErrorNotifications() {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setSubject('connection_error')
-				->setObject('updatenotification', 'error');
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * Check all installed apps for updates
-	 */
-	protected function checkAppUpdates() {
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			$update = $this->isUpdateAvailable($app);
-			if ($update !== false) {
-				$this->createNotifications($app, $update);
-			}
-		}
-	}
-
-	/**
-	 * Create notifications for this app version
-	 *
-	 * @param string $app
-	 * @param string $version
-	 * @param string $visibleVersion
-	 */
-	protected function createNotifications($app, $version, $visibleVersion = '') {
-		$lastNotification = $this->config->getAppValue('updatenotification', $app, false);
-		if ($lastNotification === $version) {
-			// We already notified about this update
-			return;
-		}
-
-		if ($lastNotification !== false) {
-			// Delete old updates
-			$this->deleteOutdatedNotifications($app, $lastNotification);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setDateTime(new \DateTime())
-				->setObject($app, $version);
-
-			if ($visibleVersion !== '') {
-				$notification->setSubject('update_available', ['version' => $visibleVersion]);
-			} else {
-				$notification->setSubject('update_available');
-			}
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-
-		$this->config->setAppValue('updatenotification', $app, $version);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getUsersToNotify(): array {
-		if ($this->users !== null) {
-			return $this->users;
-		}
-
-		$notifyGroups = (array) json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-		$this->users = [];
-		foreach ($notifyGroups as $group) {
-			$groupToNotify = $this->groupManager->get($group);
-			if ($groupToNotify instanceof IGroup) {
-				foreach ($groupToNotify->getUsers() as $user) {
-					$this->users[$user->getUID()] = true;
-				}
-			}
-		}
-
-		$this->users = array_keys($this->users);
-
-		return $this->users;
-	}
-
-	/**
-	 * Delete notifications for old updates
-	 *
-	 * @param string $app
-	 * @param string $version
-	 */
-	protected function deleteOutdatedNotifications($app, $version) {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp('updatenotification')
-				->setObject($app, $version);
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * @return VersionCheck
-	 */
-	protected function createVersionCheck(): VersionCheck {
-		return new VersionCheck(
-			$this->client,
-			$this->config
-		);
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getChannel(): string {
-		return \OC_Util::getChannel();
-	}
-
-	/**
-	 * @param string $app
-	 * @return string|false
-	 */
-	protected function isUpdateAvailable($app) {
-		return $this->installer->isUpdateAvailable($app);
-	}
+    protected $connectionNotifications = [3, 7, 14, 30];
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var IClientService */
+    protected $client;
+
+    /** @var Installer */
+    protected $installer;
+
+    /** @var string[] */
+    protected $users;
+
+    /**
+     * NotificationBackgroundJob constructor.
+     *
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IGroupManager $groupManager
+     * @param IAppManager $appManager
+     * @param IClientService $client
+     * @param Installer $installer
+     */
+    public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client, Installer $installer) {
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+
+        $this->config = $config;
+        $this->notificationManager = $notificationManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->client = $client;
+        $this->installer = $installer;
+    }
+
+    protected function run($argument) {
+        $this->checkCoreUpdate();
+        $this->checkAppUpdates();
+    }
+
+    /**
+     * Check for ownCloud update
+     */
+    protected function checkCoreUpdate() {
+        if (\in_array($this->getChannel(), ['daily', 'git'], true)) {
+            // "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
+            return;
+        }
+
+        $updater = $this->createVersionCheck();
+
+        $status = $updater->check();
+        if ($status === false) {
+            $errors = 1 + (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            $this->config->setAppValue('updatenotification', 'update_check_errors', $errors);
+
+            if (\in_array($errors, $this->connectionNotifications, true)) {
+                $this->sendErrorNotifications($errors);
+            }
+        } else if (\is_array($status)) {
+            $this->config->setAppValue('updatenotification', 'update_check_errors', 0);
+            $this->clearErrorNotifications();
+
+            if (isset($status['version'])) {
+                $this->createNotifications('core', $status['version'], $status['versionstring']);
+            }
+        }
+    }
+
+    /**
+     * Send a message to the admin when the update server could not be reached
+     * @param int $numDays
+     */
+    protected function sendErrorNotifications($numDays) {
+        $this->clearErrorNotifications();
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setDateTime(new \DateTime())
+                ->setObject('updatenotification', 'error')
+                ->setSubject('connection_error', ['days' => $numDays]);
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+    }
+
+    /**
+     * Remove error notifications again
+     */
+    protected function clearErrorNotifications() {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setSubject('connection_error')
+                ->setObject('updatenotification', 'error');
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * Check all installed apps for updates
+     */
+    protected function checkAppUpdates() {
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            $update = $this->isUpdateAvailable($app);
+            if ($update !== false) {
+                $this->createNotifications($app, $update);
+            }
+        }
+    }
+
+    /**
+     * Create notifications for this app version
+     *
+     * @param string $app
+     * @param string $version
+     * @param string $visibleVersion
+     */
+    protected function createNotifications($app, $version, $visibleVersion = '') {
+        $lastNotification = $this->config->getAppValue('updatenotification', $app, false);
+        if ($lastNotification === $version) {
+            // We already notified about this update
+            return;
+        }
+
+        if ($lastNotification !== false) {
+            // Delete old updates
+            $this->deleteOutdatedNotifications($app, $lastNotification);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setDateTime(new \DateTime())
+                ->setObject($app, $version);
+
+            if ($visibleVersion !== '') {
+                $notification->setSubject('update_available', ['version' => $visibleVersion]);
+            } else {
+                $notification->setSubject('update_available');
+            }
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+
+        $this->config->setAppValue('updatenotification', $app, $version);
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getUsersToNotify(): array {
+        if ($this->users !== null) {
+            return $this->users;
+        }
+
+        $notifyGroups = (array) json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+        $this->users = [];
+        foreach ($notifyGroups as $group) {
+            $groupToNotify = $this->groupManager->get($group);
+            if ($groupToNotify instanceof IGroup) {
+                foreach ($groupToNotify->getUsers() as $user) {
+                    $this->users[$user->getUID()] = true;
+                }
+            }
+        }
+
+        $this->users = array_keys($this->users);
+
+        return $this->users;
+    }
+
+    /**
+     * Delete notifications for old updates
+     *
+     * @param string $app
+     * @param string $version
+     */
+    protected function deleteOutdatedNotifications($app, $version) {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp('updatenotification')
+                ->setObject($app, $version);
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * @return VersionCheck
+     */
+    protected function createVersionCheck(): VersionCheck {
+        return new VersionCheck(
+            $this->client,
+            $this->config
+        );
+    }
+
+    /**
+     * @return string
+     */
+    protected function getChannel(): string {
+        return \OC_Util::getChannel();
+    }
+
+    /**
+     * @param string $app
+     * @return string|false
+     */
+    protected function isUpdateAvailable($app) {
+        return $this->installer->isUpdateAvailable($app);
+    }
 }

apps/updatenotification/lib/Notification/Notifier.php

Indentation +137 added lines, -137 removed lines

@@ -38,141 +38,141 @@
 
 class Notifier implements INotifier {
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IFactory */
-	protected $l10NFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $appVersions;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IURLGenerator $url
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IFactory $l10NFactory
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
-		$this->url = $url;
-		$this->notificationManager = $notificationManager;
-		$this->config = $config;
-		$this->l10NFactory = $l10NFactory;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->appVersions = $this->getAppVersions();
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, $languageCode): INotification {
-		if ($notification->getApp() !== 'updatenotification') {
-			throw new \InvalidArgumentException('Unknown app id');
-		}
-
-		$l = $this->l10NFactory->get('updatenotification', $languageCode);
-		if ($notification->getSubject() === 'connection_error') {
-			$errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
-			if ($errors === 0) {
-				$this->notificationManager->markProcessed($notification);
-				throw new \InvalidArgumentException('Update checked worked again');
-			}
-
-			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
-		} elseif ($notification->getObjectType() === 'core') {
-			$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
-
-			$parameters = $notification->getSubjectParameters();
-			$notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater');
-			}
-		} else {
-			$appInfo = $this->getAppInfo($notification->getObjectType());
-			$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
-
-			if (isset($this->appVersions[$notification->getObjectType()])) {
-				$this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
-			}
-
-			$notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
-				->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
-					'app' => [
-						'type' => 'app',
-						'id' => $notification->getObjectType(),
-						'name' => $appName,
-					]
-				]);
-
-			if ($this->isAdmin()) {
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
-			}
-		}
-
-		$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
-
-		return $notification;
-	}
-
-	/**
-	 * Remove the notification and prevent rendering, when the update is installed
-	 *
-	 * @param INotification $notification
-	 * @param string $installedVersion
-	 * @throws \InvalidArgumentException When the update is already installed
-	 */
-	protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
-		if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
-			$this->notificationManager->markProcessed($notification);
-			throw new \InvalidArgumentException('Update already installed');
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isAdmin(): bool {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions(): string {
-		return implode('.', Util::getVersion());
-	}
-
-	protected function getAppVersions(): array {
-		return \OC_App::getAppVersions();
-	}
-
-	protected function getAppInfo($appId) {
-		return \OC_App::getAppInfo($appId);
-	}
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IFactory */
+    protected $l10NFactory;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $appVersions;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IURLGenerator $url
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IFactory $l10NFactory
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IURLGenerator $url, IConfig $config, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
+        $this->url = $url;
+        $this->notificationManager = $notificationManager;
+        $this->config = $config;
+        $this->l10NFactory = $l10NFactory;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->appVersions = $this->getAppVersions();
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, $languageCode): INotification {
+        if ($notification->getApp() !== 'updatenotification') {
+            throw new \InvalidArgumentException('Unknown app id');
+        }
+
+        $l = $this->l10NFactory->get('updatenotification', $languageCode);
+        if ($notification->getSubject() === 'connection_error') {
+            $errors = (int) $this->config->getAppValue('updatenotification', 'update_check_errors', 0);
+            if ($errors === 0) {
+                $this->notificationManager->markProcessed($notification);
+                throw new \InvalidArgumentException('Update checked worked again');
+            }
+
+            $notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
+                ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
+        } elseif ($notification->getObjectType() === 'core') {
+            $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+
+            $parameters = $notification->getSubjectParameters();
+            $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index') . '#updater');
+            }
+        } else {
+            $appInfo = $this->getAppInfo($notification->getObjectType());
+            $appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
+
+            if (isset($this->appVersions[$notification->getObjectType()])) {
+                $this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
+            }
+
+            $notification->setParsedSubject($l->t('Update for %1$s to version %2$s is available.', [$appName, $notification->getObjectId()]))
+                ->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
+                    'app' => [
+                        'type' => 'app',
+                        'id' => $notification->getObjectType(),
+                        'name' => $appName,
+                    ]
+                ]);
+
+            if ($this->isAdmin()) {
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+            }
+        }
+
+        $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('updatenotification', 'notification.svg')));
+
+        return $notification;
+    }
+
+    /**
+     * Remove the notification and prevent rendering, when the update is installed
+     *
+     * @param INotification $notification
+     * @param string $installedVersion
+     * @throws \InvalidArgumentException When the update is already installed
+     */
+    protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion) {
+        if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
+            $this->notificationManager->markProcessed($notification);
+            throw new \InvalidArgumentException('Update already installed');
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdmin(): bool {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions(): string {
+        return implode('.', Util::getVersion());
+    }
+
+    protected function getAppVersions(): array {
+        return \OC_App::getAppVersions();
+    }
+
+    protected function getAppInfo($appId) {
+        return \OC_App::getAppInfo($appId);
+    }
 }

apps/updatenotification/lib/Controller/AdminController.php

Indentation +54 added lines, -54 removed lines

@@ -38,63 +38,63 @@
 use OCP\Util;
 
 class AdminController extends Controller {
-	/** @var IJobList */
-	private $jobList;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var IL10N */
-	private $l10n;
+    /** @var IJobList */
+    private $jobList;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var IL10N */
+    private $l10n;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l10n
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IJobList $jobList,
-								ISecureRandom $secureRandom,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								IL10N $l10n) {
-		parent::__construct($appName, $request);
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l10n
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IJobList $jobList,
+                                ISecureRandom $secureRandom,
+                                IConfig $config,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10n) {
+        parent::__construct($appName, $request);
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel(string $channel): DataResponse {
-		Util::setChannel($channel);
-		$this->config->setAppValue('core', 'lastupdatedat', 0);
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
-	}
+    /**
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel(string $channel): DataResponse {
+        Util::setChannel($channel);
+        $this->config->setAppValue('core', 'lastupdatedat', 0);
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
+    }
 
-	/**
-	 * @return DataResponse
-	 */
-	public function createCredentials(): DataResponse {
-		// Create a new job and store the creation date
-		$this->jobList->add(ResetTokenBackgroundJob::class);
-		$this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
+    /**
+     * @return DataResponse
+     */
+    public function createCredentials(): DataResponse {
+        // Create a new job and store the creation date
+        $this->jobList->add(ResetTokenBackgroundJob::class);
+        $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime());
 
-		// Create a new token
-		$newToken = $this->secureRandom->generate(64);
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
+        // Create a new token
+        $newToken = $this->secureRandom->generate(64);
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
 
-		return new DataResponse($newToken);
-	}
+        return new DataResponse($newToken);
+    }
 }

apps/updatenotification/lib/Settings/Admin.php

Indentation +70 added lines, -70 removed lines

@@ -34,84 +34,84 @@
 use OCP\Util;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
+    /** @var IConfig */
+    private $config;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
 
-	/**
-	 * @param IConfig $config
-	 * @param UpdateChecker $updateChecker
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct(IConfig $config,
-								UpdateChecker $updateChecker,
-								IDateTimeFormatter $dateTimeFormatter) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
+    /**
+     * @param IConfig $config
+     * @param UpdateChecker $updateChecker
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct(IConfig $config,
+                                UpdateChecker $updateChecker,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        $this->config = $config;
+        $this->updateChecker = $updateChecker;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+    /**
+     * @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();
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
 
-		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels, true)) !== false) {
-			unset($channels[$key]);
-		}
-		$updateState = $this->updateChecker->getUpdateState();
+        // Remove the currently used channel from the channels list
+        if(($key = array_search($currentChannel, $channels, true)) !== false) {
+            unset($channels[$key]);
+        }
+        $updateState = $this->updateChecker->getUpdateState();
 
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
 
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/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'],
-			'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notify_groups' => implode('|', $notifyGroups),
-		];
+        $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'],
+            'isDefaultUpdateServerURL' => $updateServerURL === $defaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notify_groups' => implode('|', $notifyGroups),
+        ];
 
-		return new TemplateResponse('updatenotification', 'admin', $params, '');
-	}
+        return new TemplateResponse('updatenotification', 'admin', $params, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): string {
-		return 'server';
-	}
+    /**
+     * @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 1;
-	}
+    /**
+     * @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 1;
+    }
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +38 added lines, -38 removed lines

@@ -28,48 +28,48 @@
 use OC\Updater\VersionCheck;
 
 class UpdateChecker {
-	/** @var VersionCheck */
-	private $updater;
+    /** @var VersionCheck */
+    private $updater;
 
-	/**
-	 * @param VersionCheck $updater
-	 */
-	public function __construct(VersionCheck $updater) {
-		$this->updater = $updater;
-	}
+    /**
+     * @param VersionCheck $updater
+     */
+    public function __construct(VersionCheck $updater) {
+        $this->updater = $updater;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getUpdateState(): array {
-		$data = $this->updater->check();
-		$result = [];
+    /**
+     * @return array
+     */
+    public function getUpdateState(): array {
+        $data = $this->updater->check();
+        $result = [];
 
-		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
-			$result['updateAvailable'] = true;
-			$result['updateVersion'] = $data['versionstring'];
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
-			if (strpos($data['web'], 'https://') === 0) {
-				$result['updateLink'] = $data['web'];
-			}
-			if (strpos($data['url'], 'https://') === 0) {
-				$result['downloadLink'] = $data['url'];
-			}
+        if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+            $result['updateAvailable'] = true;
+            $result['updateVersion'] = $data['versionstring'];
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
+            if (strpos($data['web'], 'https://') === 0) {
+                $result['updateLink'] = $data['web'];
+            }
+            if (strpos($data['url'], 'https://') === 0) {
+                $result['downloadLink'] = $data['url'];
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * @param array $data
-	 */
-	public function populateJavaScriptVariables(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
-			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
-			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function populateJavaScriptVariables(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
+            'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
+        ]);
+    }
 }