nextcloud / server

apps/provisioning_api/lib/Controller/AppConfigController.php

Indentation +123 added lines, -123 removed lines

@@ -31,127 +31,127 @@
 
 class AppConfigController extends OCSController {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								IAppConfig $appConfig) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->appConfig = $appConfig;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function getApps() {
-		return new DataResponse([
-			'data' => $this->appConfig->getApps(),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function getKeys($app) {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppKeys($app),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @param string $defaultValue
-	 * @return DataResponse
-	 */
-	public function getValue($app, $key, $defaultValue = '') {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppValue($app, $key, $defaultValue),
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setValue($app, $key, $value) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue($app, $key, $value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @return DataResponse
-	 */
-	public function deleteKey($app, $key) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->deleteAppValue($app, $key);
-		return new DataResponse();
-	}
-
-	/**
-	 * @param string $app
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyAppId($app) {
-		if (\OC_App::cleanAppId($app) !== $app) {
-			throw new \InvalidArgumentException('Invalid app id given');
-		}
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyConfigKey($app, $key) {
-		if (in_array($key, ['installed_version', 'enabled', 'types'])) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-
-		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IAppConfig $appConfig
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IAppConfig $appConfig) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->appConfig = $appConfig;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function getApps() {
+        return new DataResponse([
+            'data' => $this->appConfig->getApps(),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @return DataResponse
+     */
+    public function getKeys($app) {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppKeys($app),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @param string $defaultValue
+     * @return DataResponse
+     */
+    public function getValue($app, $key, $defaultValue = '') {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppValue($app, $key, $defaultValue),
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setValue($app, $key, $value) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue($app, $key, $value);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @return DataResponse
+     */
+    public function deleteKey($app, $key) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->deleteAppValue($app, $key);
+        return new DataResponse();
+    }
+
+    /**
+     * @param string $app
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyAppId($app) {
+        if (\OC_App::cleanAppId($app) !== $app) {
+            throw new \InvalidArgumentException('Invalid app id given');
+        }
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyConfigKey($app, $key) {
+        if (in_array($key, ['installed_version', 'enabled', 'types'])) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+
+        if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Indentation +16 added lines, -16 removed lines

@@ -7,22 +7,22 @@
 use OCP\AppFramework\App;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('provisioning_api', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('provisioning_api', $urlParams);
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
-			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
-			return new ProvisioningApiMiddleware(
-				$c['ControllerMethodReflector'],
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$container->registerMiddleWare('ProvisioningApiMiddleware');
-	}
+        $container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
+            $user = $server->getUserManager()->get($c['UserId']);
+            $isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
+            $isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+            return new ProvisioningApiMiddleware(
+                $c['ControllerMethodReflector'],
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $container->registerMiddleWare('ProvisioningApiMiddleware');
+    }
 }

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }
\ No newline at end of file

apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php

Indentation +45 added lines, -45 removed lines

@@ -10,55 +10,55 @@
 
 class ProvisioningApiMiddleware extends Middleware {
 
-	/** @var IControllerMethodReflector */
-	private $reflector;
+    /** @var IControllerMethodReflector */
+    private $reflector;
 
-	/** @var bool */
-	private $isAdmin;
+    /** @var bool */
+    private $isAdmin;
 
-	/** @var bool */
-	private $isSubAdmin;
+    /** @var bool */
+    private $isSubAdmin;
 
-	/**
-	 * ProvisioningApiMiddleware constructor.
-	 *
-	 * @param IControllerMethodReflector $reflector
-	 * @param bool $isAdmin
-	 * @param bool $isSubAdmin
-	 */
-	public function __construct(
-		IControllerMethodReflector $reflector,
-		$isAdmin,
-		$isSubAdmin) {
-		$this->reflector = $reflector;
-		$this->isAdmin = $isAdmin;
-		$this->isSubAdmin = $isSubAdmin;
-	}
+    /**
+     * ProvisioningApiMiddleware constructor.
+     *
+     * @param IControllerMethodReflector $reflector
+     * @param bool $isAdmin
+     * @param bool $isSubAdmin
+     */
+    public function __construct(
+        IControllerMethodReflector $reflector,
+        $isAdmin,
+        $isSubAdmin) {
+        $this->reflector = $reflector;
+        $this->isAdmin = $isAdmin;
+        $this->isSubAdmin = $isSubAdmin;
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws NotSubAdminException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
-			throw new NotSubAdminException();
-		}
-	}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     *
+     * @throws NotSubAdminException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
+            throw new NotSubAdminException();
+        }
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof NotSubAdminException) {
-			throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
-		}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof NotSubAdminException) {
+            throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }
\ No newline at end of file

apps/updatenotification/templates/admin.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
-	script('updatenotification', 'admin');
+    script('updatenotification', 'admin');
 
-	/** @var array $_ */
-	/** @var bool $isNewVersionAvailable */
-	$isNewVersionAvailable = $_['isNewVersionAvailable'];
-	/** @var string $newVersionString */
-	$newVersionString = $_['newVersionString'];
-	/** @var string $lastCheckedDate */
-	$lastCheckedDate = $_['lastChecked'];
-	/** @var array $channels */
-	$channels = $_['channels'];
-	/** @var string $currentChannel */
-	$currentChannel = $_['currentChannel'];
+    /** @var array $_ */
+    /** @var bool $isNewVersionAvailable */
+    $isNewVersionAvailable = $_['isNewVersionAvailable'];
+    /** @var string $newVersionString */
+    $newVersionString = $_['newVersionString'];
+    /** @var string $lastCheckedDate */
+    $lastCheckedDate = $_['lastChecked'];
+    /** @var array $channels */
+    $channels = $_['channels'];
+    /** @var string $currentChannel */
+    $currentChannel = $_['currentChannel'];
 ?>
 <form id="oca_updatenotification_section" class="followupsection">
 	<?php if($isNewVersionAvailable === true) { ?>

apps/updatenotification/lib/Notification/Notifier.php

Indentation +123 added lines, -123 removed lines

@@ -35,127 +35,127 @@
 
 class Notifier implements INotifier {
 
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @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 IManager $notificationManager
-	 * @param IFactory $l10NFactory
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IURLGenerator $url, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
-		$this->url = $url;
-		$this->notificationManager = $notificationManager;
-		$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) {
-		if ($notification->getApp() !== 'updatenotification') {
-			throw new \InvalidArgumentException();
-		}
-
-		$l = $this->l10NFactory->get('updatenotification', $languageCode);
-		if ($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') . '#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();
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isAdmin() {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions() {
-		return implode('.', \OCP\Util::getVersion());
-	}
-
-	protected function getAppVersions() {
-		return \OC_App::getAppVersions();
-	}
-
-	protected function getAppInfo($appId) {
-		return \OC_App::getAppInfo($appId);
-	}
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @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 IManager $notificationManager
+     * @param IFactory $l10NFactory
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IURLGenerator $url, IManager $notificationManager, IFactory $l10NFactory, IUserSession $userSession, IGroupManager $groupManager) {
+        $this->url = $url;
+        $this->notificationManager = $notificationManager;
+        $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) {
+        if ($notification->getApp() !== 'updatenotification') {
+            throw new \InvalidArgumentException();
+        }
+
+        $l = $this->l10NFactory->get('updatenotification', $languageCode);
+        if ($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') . '#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();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAdmin() {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions() {
+        return implode('.', \OCP\Util::getVersion());
+    }
+
+    protected function getAppVersions() {
+        return \OC_App::getAppVersions();
+    }
+
+    protected function getAppInfo($appId) {
+        return \OC_App::getAppInfo($appId);
+    }
 }

apps/updatenotification/lib/Notification/BackgroundJob.php

Indentation +171 added lines, -171 removed lines

@@ -34,175 +34,175 @@
 
 class BackgroundJob extends TimedJob {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IManager */
-	protected $notificationManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/** @var IClientService */
-	protected $client;
-
-	/** @var string[] */
-	protected $users;
-
-	/**
-	 * NotificationBackgroundJob constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IManager $notificationManager
-	 * @param IGroupManager $groupManager
-	 * @param IAppManager $appManager
-	 * @param IClientService $client
-	 */
-	public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client) {
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-
-		$this->config = $config;
-		$this->notificationManager = $notificationManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->client = $client;
-	}
-
-	protected function run($argument) {
-		$this->checkCoreUpdate();
-		$this->checkAppUpdates();
-	}
-
-	/**
-	 * Check for ownCloud update
-	 */
-	protected function checkCoreUpdate() {
-		if (in_array($this->getChannel(), ['daily', 'git'])) {
-			// "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
-			return;
-		}
-
-		$updater = $this->createVersionCheck();
-
-		$status = $updater->check();
-		if (isset($status['version'])) {
-			$this->createNotifications('core', $status['version'], $status['versionstring']);
-		}
-	}
-
-	/**
-	 * 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;
-		} else if ($lastNotification !== false) {
-			// Delete old updates
-			$this->deleteOutdatedNotifications($app, $lastNotification);
-		}
-
-
-		$notification = $this->notificationManager->createNotification();
-		$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);
-		}
-
-		$this->config->setAppValue('updatenotification', $app, $version);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getUsersToNotify() {
-		if ($this->users !== null) {
-			return $this->users;
-		}
-
-		$notifyGroups = 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();
-		$notification->setApp('updatenotification')
-			->setObject($app, $version);
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * @return VersionCheck
-	 */
-	protected function createVersionCheck() {
-		return new VersionCheck(
-			$this->client,
-			$this->config
-		);
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getChannel() {
-		return \OC_Util::getChannel();
-	}
-
-	/**
-	 * @param string $app
-	 * @return string|false
-	 */
-	protected function isUpdateAvailable($app) {
-		return Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher());
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IManager */
+    protected $notificationManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /** @var IClientService */
+    protected $client;
+
+    /** @var string[] */
+    protected $users;
+
+    /**
+     * NotificationBackgroundJob constructor.
+     *
+     * @param IConfig $config
+     * @param IManager $notificationManager
+     * @param IGroupManager $groupManager
+     * @param IAppManager $appManager
+     * @param IClientService $client
+     */
+    public function __construct(IConfig $config, IManager $notificationManager, IGroupManager $groupManager, IAppManager $appManager, IClientService $client) {
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+
+        $this->config = $config;
+        $this->notificationManager = $notificationManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->client = $client;
+    }
+
+    protected function run($argument) {
+        $this->checkCoreUpdate();
+        $this->checkAppUpdates();
+    }
+
+    /**
+     * Check for ownCloud update
+     */
+    protected function checkCoreUpdate() {
+        if (in_array($this->getChannel(), ['daily', 'git'])) {
+            // "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
+            return;
+        }
+
+        $updater = $this->createVersionCheck();
+
+        $status = $updater->check();
+        if (isset($status['version'])) {
+            $this->createNotifications('core', $status['version'], $status['versionstring']);
+        }
+    }
+
+    /**
+     * 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;
+        } else if ($lastNotification !== false) {
+            // Delete old updates
+            $this->deleteOutdatedNotifications($app, $lastNotification);
+        }
+
+
+        $notification = $this->notificationManager->createNotification();
+        $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);
+        }
+
+        $this->config->setAppValue('updatenotification', $app, $version);
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getUsersToNotify() {
+        if ($this->users !== null) {
+            return $this->users;
+        }
+
+        $notifyGroups = 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();
+        $notification->setApp('updatenotification')
+            ->setObject($app, $version);
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * @return VersionCheck
+     */
+    protected function createVersionCheck() {
+        return new VersionCheck(
+            $this->client,
+            $this->config
+        );
+    }
+
+    /**
+     * @return string
+     */
+    protected function getChannel() {
+        return \OC_Util::getChannel();
+    }
+
+    /**
+     * @param string $app
+     * @return string|false
+     */
+    protected function isUpdateAvailable($app) {
+        return Installer::isUpdateAvailable($app, \OC::$server->getAppFetcher());
+    }
 }

apps/updatenotification/lib/Controller/AdminController.php

Indentation +135 added lines, -135 removed lines

@@ -37,139 +37,139 @@
 use OCP\Settings\ISettings;
 
 class AdminController extends Controller implements ISettings {
-	/** @var IJobList */
-	private $jobList;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IJobList $jobList
-	 * @param ISecureRandom $secureRandom
-	 * @param IConfig $config
-	 * @param ITimeFactory $timeFactory
-	 * @param IL10N $l10n
-	 * @param UpdateChecker $updateChecker
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IJobList $jobList,
-								ISecureRandom $secureRandom,
-								IConfig $config,
-								ITimeFactory $timeFactory,
-								IL10N $l10n,
-								UpdateChecker $updateChecker,
-								IDateTimeFormatter $dateTimeFormatter) {
-		parent::__construct($appName, $request);
-		$this->jobList = $jobList;
-		$this->secureRandom = $secureRandom;
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->l10n = $l10n;
-		$this->updateChecker = $updateChecker;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function displayPanel() {
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime(
-			$this->config->getAppValue('core', 'lastupdatedat')
-		);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = \OCP\Util::getChannel();
-
-		// Remove the currently used channel from the channels list
-		if(($key = array_search($currentChannel, $channels)) !== false) {
-			unset($channels[$key]);
-		}
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'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'],
-
-			'notify_groups' => implode('|', $notifyGroups),
-		];
-
-		return new TemplateResponse($this->appName, 'admin', $params, '');
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel($channel) {
-		\OCP\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() {
-		// Create a new job and store the creation date
-		$this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
-		$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));
-
-		return new DataResponse($newToken);
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 */
-	public function getForm() {
-		return $this->displayPanel();
-	}
-
-	/**
-	 * @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 1;
-	}
+    /** @var IJobList */
+    private $jobList;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IJobList $jobList
+     * @param ISecureRandom $secureRandom
+     * @param IConfig $config
+     * @param ITimeFactory $timeFactory
+     * @param IL10N $l10n
+     * @param UpdateChecker $updateChecker
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IJobList $jobList,
+                                ISecureRandom $secureRandom,
+                                IConfig $config,
+                                ITimeFactory $timeFactory,
+                                IL10N $l10n,
+                                UpdateChecker $updateChecker,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        parent::__construct($appName, $request);
+        $this->jobList = $jobList;
+        $this->secureRandom = $secureRandom;
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        $this->l10n = $l10n;
+        $this->updateChecker = $updateChecker;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function displayPanel() {
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime(
+            $this->config->getAppValue('core', 'lastupdatedat')
+        );
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = \OCP\Util::getChannel();
+
+        // Remove the currently used channel from the channels list
+        if(($key = array_search($currentChannel, $channels)) !== false) {
+            unset($channels[$key]);
+        }
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            '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'],
+
+            'notify_groups' => implode('|', $notifyGroups),
+        ];
+
+        return new TemplateResponse($this->appName, 'admin', $params, '');
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel($channel) {
+        \OCP\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() {
+        // Create a new job and store the creation date
+        $this->jobList->add('OCA\UpdateNotification\ResetTokenBackgroundJob');
+        $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));
+
+        return new DataResponse($newToken);
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     */
+    public function getForm() {
+        return $this->displayPanel();
+    }
+
+    /**
+     * @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 1;
+    }
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +38 added lines, -38 removed lines

@@ -26,48 +26,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() {
-		$data = $this->updater->check();
-		$result = [];
+    /**
+     * @return array
+     */
+    public function getUpdateState() {
+        $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(substr($data['web'], 0, 8) === 'https://') {
-				$result['updateLink'] = $data['web'];
-			}
-			if(substr($data['url'], 0, 8) === 'https://') {
-				$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(substr($data['web'], 0, 8) === 'https://') {
+                $result['updateLink'] = $data['web'];
+            }
+            if(substr($data['url'], 0, 8) === 'https://') {
+                $result['downloadLink'] = $data['url'];
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * @param array $data
-	 */
-	public function getJavaScript(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
-			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersion'],
-			'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function getJavaScript(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
+            'updateLink' => isset($this->getUpdateState()['updateLink']) ? $this->getUpdateState()['updateLink'] : '',
+        ]);
+    }
 }