nextcloud / server

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/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'] : '',
+        ]);
+    }
 }

apps/updatenotification/lib/AppInfo/Application.php

Indentation +21 added lines, -21 removed lines

@@ -30,27 +30,27 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
-		parent::__construct('updatenotification', $urlParams);
-		$container = $this->getContainer();
+    public function __construct (array $urlParams = array()) {
+        parent::__construct('updatenotification', $urlParams);
+        $container = $this->getContainer();
 
-		$container->registerService('AdminController', function(IAppContainer $c) {
-			$updater = new \OC\Updater\VersionCheck(
-				\OC::$server->getHTTPClientService(),
-				\OC::$server->getConfig()
-			);
-			return new AdminController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->getServer()->getJobList(),
-				$c->getServer()->getSecureRandom(),
-				$c->getServer()->getConfig(),
-				new TimeFactory(),
-				$c->getServer()->getL10N($c->query('AppName')),
-				new UpdateChecker($updater),
-				$c->getServer()->getDateTimeFormatter()
-			);
-		});
-	}
+        $container->registerService('AdminController', function(IAppContainer $c) {
+            $updater = new \OC\Updater\VersionCheck(
+                \OC::$server->getHTTPClientService(),
+                \OC::$server->getConfig()
+            );
+            return new AdminController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->getServer()->getJobList(),
+                $c->getServer()->getSecureRandom(),
+                $c->getServer()->getConfig(),
+                new TimeFactory(),
+                $c->getServer()->getL10N($c->query('AppName')),
+                new UpdateChecker($updater),
+                $c->getServer()->getDateTimeFormatter()
+            );
+        });
+    }
 
 }

apps/updatenotification/lib/ResetTokenBackgroundJob.php

Indentation +35 added lines, -35 removed lines

@@ -34,44 +34,44 @@
  * @package OCA\UpdateNotification
  */
 class ResetTokenBackgroundJob extends TimedJob {
-	/** @var IConfig */
-	private $config;
-	/** @var ITimeFactory */
-	private $timeFactory;
+    /** @var IConfig */
+    private $config;
+    /** @var ITimeFactory */
+    private $timeFactory;
 
-	/**
-	 * @param IConfig|null $config
-	 * @param ITimeFactory|null $timeFactory
-	 */
-	public function __construct(IConfig $config = null,
-								ITimeFactory $timeFactory = null) {
-		// Run all 10 minutes
-		$this->setInterval(60 * 10);
+    /**
+     * @param IConfig|null $config
+     * @param ITimeFactory|null $timeFactory
+     */
+    public function __construct(IConfig $config = null,
+                                ITimeFactory $timeFactory = null) {
+        // Run all 10 minutes
+        $this->setInterval(60 * 10);
 
-		if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
-			$this->config = $config;
-			$this->timeFactory = $timeFactory;
-		} else {
-			$this->fixDIForJobs();
-		}
-	}
+        if ($config instanceof IConfig && $timeFactory instanceof ITimeFactory) {
+            $this->config = $config;
+            $this->timeFactory = $timeFactory;
+        } else {
+            $this->fixDIForJobs();
+        }
+    }
 
-	/**
-	 * DI for jobs
-	 */
-	private function fixDIForJobs() {
-		$this->config = \OC::$server->getConfig();
-		$this->timeFactory = new TimeFactory();
-	}
+    /**
+     * DI for jobs
+     */
+    private function fixDIForJobs() {
+        $this->config = \OC::$server->getConfig();
+        $this->timeFactory = new TimeFactory();
+    }
 
-	/**
-	 * @param $argument
-	 */
-	protected function run($argument) {
-		// Delete old tokens after 2 days
-		if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
-			$this->config->deleteSystemValue('updater.secret');
-		}
-	}
+    /**
+     * @param $argument
+     */
+    protected function run($argument) {
+        // Delete old tokens after 2 days
+        if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
+            $this->config->deleteSystemValue('updater.secret');
+        }
+    }
 
 }

apps/updatenotification/appinfo/routes.php

Indentation +2 added lines, -2 removed lines

@@ -25,6 +25,6 @@
 
 $application = new Application();
 $application->registerRoutes($this, ['routes' => [
-	['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
-	['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
+    ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+    ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
 ]]);

apps/updatenotification/appinfo/app.php

Indentation +27 added lines, -27 removed lines

@@ -23,33 +23,33 @@
  */
 
 if(\OC::$server->getConfig()->getSystemValue('updatechecker', true) === true) {
-	$updater = new \OC\Updater\VersionCheck(
-		\OC::$server->getHTTPClientService(),
-		\OC::$server->getConfig()
-	);
-	$updateChecker = new \OCA\UpdateNotification\UpdateChecker(
-		$updater
-	);
+    $updater = new \OC\Updater\VersionCheck(
+        \OC::$server->getHTTPClientService(),
+        \OC::$server->getConfig()
+    );
+    $updateChecker = new \OCA\UpdateNotification\UpdateChecker(
+        $updater
+    );
 
-	$userObject = \OC::$server->getUserSession()->getUser();
-	if($userObject !== null) {
-		if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
-			!\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
-			if($updateChecker->getUpdateState() !== []) {
-				\OCP\Util::addScript('updatenotification', 'notification');
-				OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
-			}
-		}
-	}
+    $userObject = \OC::$server->getUserSession()->getUser();
+    if($userObject !== null) {
+        if(\OC::$server->getGroupManager()->isAdmin($userObject->getUID()) &&
+            !\OC::$server->getAppManager()->isEnabledForUser('notifications')) {
+            if($updateChecker->getUpdateState() !== []) {
+                \OCP\Util::addScript('updatenotification', 'notification');
+                OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'getJavaScript');
+            }
+        }
+    }
 
-	$manager = \OC::$server->getNotificationManager();
-	$manager->registerNotifier(function() use ($manager) {
-		return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
-	}, function() {
-		$l = \OC::$server->getL10N('updatenotification');
-		return [
-			'id' => 'updatenotification',
-			'name' => $l->t('Update notifications'),
-		];
-	});
+    $manager = \OC::$server->getNotificationManager();
+    $manager->registerNotifier(function() use ($manager) {
+        return \OC::$server->query(\OCA\UpdateNotification\Notification\Notifier::class);
+    }, function() {
+        $l = \OC::$server->getL10N('updatenotification');
+        return [
+            'id' => 'updatenotification',
+            'name' => $l->t('Update notifications'),
+        ];
+    });
 }

apps/theming/templates/settings-admin.php

Indentation -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 /**
-
  *
  * @author Bjoern Schiessle <bjoern@schiessle.org>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>

apps/theming/lib/Util.php

Indentation +159 added lines, -159 removed lines

@@ -30,164 +30,164 @@
 
 class Util {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * Util constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IConfig $config, IRootFolder $rootFolder, IAppManager $appManager) {
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param string $color rgb color value
-	 * @return bool
-	 */
-	public function invertTextColor($color) {
-		$l = $this->calculateLuminance($color);
-		if($l>0.5) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get color for on-page elements:
-	 * theme color by default, grey if theme color is to bright
-	 * @param $color
-	 * @return string
-	 */
-	public function elementColor($color) {
-		$l = $this->calculateLuminance($color);
-		if($l>0.8) {
-			return '#555555';
-		} else {
-			return $color;
-		}
-	}
-
-	/**
-	 * @param string $color rgb color value
-	 * @return float
-	 */
-	public function calculateLuminance($color) {
-		$hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
-		if (strlen($hex) === 3) {
-			$hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
-		}
-		if (strlen($hex) !== 6) {
-			return 0;
-		}
-		$r = hexdec(substr($hex, 0, 2));
-		$g = hexdec(substr($hex, 2, 2));
-		$b = hexdec(substr($hex, 4, 2));
-		return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
-	}
-
-	/**
-	 * @param $color
-	 * @return string base64 encoded radio button svg
-	 */
-	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
-			'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
-		return base64_encode($radioButtonIcon);
-	}
-
-
-	/**
-	 * @param $app string app name
-	 * @return string path to app icon / logo
-	 */
-	public function getAppIcon($app) {
-		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-			$icon = $appPath . '/img/app.svg';
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		} catch (AppPathNotFoundException $e) {}
-
-		if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
-		}
-		return \OC::$SERVERROOT . '/core/img/logo.svg';
-	}
-
-	/**
-	 * @param $app string app name
-	 * @param $image string relative path to image in app folder
-	 * @return string|false absolute path to image
-	 */
-	public function getAppImage($app, $image) {
-		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
-		$image = str_replace(array('\0', '\\', '..'), '', $image);
-		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
-			if (file_exists($icon)) {
-				return $icon;
-			}
-		}
-
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-
-		$icon = $appPath . '/img/' . $image;
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.svg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.png';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.gif';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
-		if (file_exists($icon)) {
-			return $icon;
-		}
-
-		return false;
-	}
-
-	/**
-	 * replace default color with a custom one
-	 *
-	 * @param $svg string content of a svg file
-	 * @param $color string color to match
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color) {
-		$svg = preg_replace('/#0082c9/i', $color, $svg);
-		return $svg;
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * Util constructor.
+     *
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     * @param IAppManager $appManager
+     */
+    public function __construct(IConfig $config, IRootFolder $rootFolder, IAppManager $appManager) {
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param string $color rgb color value
+     * @return bool
+     */
+    public function invertTextColor($color) {
+        $l = $this->calculateLuminance($color);
+        if($l>0.5) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get color for on-page elements:
+     * theme color by default, grey if theme color is to bright
+     * @param $color
+     * @return string
+     */
+    public function elementColor($color) {
+        $l = $this->calculateLuminance($color);
+        if($l>0.8) {
+            return '#555555';
+        } else {
+            return $color;
+        }
+    }
+
+    /**
+     * @param string $color rgb color value
+     * @return float
+     */
+    public function calculateLuminance($color) {
+        $hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
+        if (strlen($hex) === 3) {
+            $hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
+        }
+        if (strlen($hex) !== 6) {
+            return 0;
+        }
+        $r = hexdec(substr($hex, 0, 2));
+        $g = hexdec(substr($hex, 2, 2));
+        $b = hexdec(substr($hex, 4, 2));
+        return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
+    }
+
+    /**
+     * @param $color
+     * @return string base64 encoded radio button svg
+     */
+    public function generateRadioButton($color) {
+        $radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+            '<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
+        return base64_encode($radioButtonIcon);
+    }
+
+
+    /**
+     * @param $app string app name
+     * @return string path to app icon / logo
+     */
+    public function getAppIcon($app) {
+        $app = str_replace(array('\0', '/', '\\', '..'), '', $app);
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+            $icon = $appPath . '/img/' . $app . '.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+            $icon = $appPath . '/img/app.svg';
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        } catch (AppPathNotFoundException $e) {}
+
+        if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
+            return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
+        }
+        return \OC::$SERVERROOT . '/core/img/logo.svg';
+    }
+
+    /**
+     * @param $app string app name
+     * @param $image string relative path to image in app folder
+     * @return string|false absolute path to image
+     */
+    public function getAppImage($app, $image) {
+        $app = str_replace(array('\0', '/', '\\', '..'), '', $app);
+        $image = str_replace(array('\0', '\\', '..'), '', $image);
+        if ($app === "core") {
+            $icon = \OC::$SERVERROOT . '/core/img/' . $image;
+            if (file_exists($icon)) {
+                return $icon;
+            }
+        }
+
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+
+        $icon = $appPath . '/img/' . $image;
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.svg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.png';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.gif';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+        $icon = $appPath . '/img/' . $image . '.jpg';
+        if (file_exists($icon)) {
+            return $icon;
+        }
+
+        return false;
+    }
+
+    /**
+     * replace default color with a custom one
+     *
+     * @param $svg string content of a svg file
+     * @param $color string color to match
+     * @return string
+     */
+    public function colorizeSvg($svg, $color) {
+        $svg = preg_replace('/#0082c9/i', $color, $svg);
+        return $svg;
+    }
 
 }