nextcloud / server

apps/encryption/lib/Command/DisableMasterKey.php

Indentation +52 added lines, -52 removed lines

@@ -33,57 +33,57 @@
 
 class DisableMasterKey extends Command {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								QuestionHelper $questionHelper) {
-
-		$this->util = $util;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('encryption:disable-master-key')
-			->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
-
-		if(!$isMasterKeyEnabled) {
-			$output->writeln('Master key already disabled');
-		} else {
-			$question = new ConfirmationQuestion(
-				'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
-				. 'There is no way to enable the master key again. '
-				. 'We strongly recommend to keep the master key, it provides significant performance improvements '
-				. 'and is easier to handle for both, users and administrators. '
-				. 'Do you really want to switch to per-user keys? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->config->setAppValue('encryption', 'useMasterKey', '0');
-				$output->writeln('Master key successfully disabled.');
-			} else {
-				$output->writeln('aborted.');
-			}
-		}
-
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                QuestionHelper $questionHelper) {
+
+        $this->util = $util;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('encryption:disable-master-key')
+            ->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+
+        if(!$isMasterKeyEnabled) {
+            $output->writeln('Master key already disabled');
+        } else {
+            $question = new ConfirmationQuestion(
+                'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
+                . 'There is no way to enable the master key again. '
+                . 'We strongly recommend to keep the master key, it provides significant performance improvements '
+                . 'and is easier to handle for both, users and administrators. '
+                . 'Do you really want to switch to per-user keys? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->config->setAppValue('encryption', 'useMasterKey', '0');
+                $output->writeln('Master key successfully disabled.');
+            } else {
+                $output->writeln('aborted.');
+            }
+        }
+
+    }
 
 }

apps/files_external/lib/Settings/Personal.php

Indentation +57 added lines, -57 removed lines

@@ -32,72 +32,72 @@
 
 class Personal implements ISettings {
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	/** @var GlobalAuth	 */
-	private $globalAuth;
+    /** @var GlobalAuth	 */
+    private $globalAuth;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(
-		IManager $encryptionManager,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService,
-		GlobalAuth $globalAuth,
-		IUserSession $userSession
-	) {
-		$this->encryptionManager = $encryptionManager;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-		$this->globalAuth = $globalAuth;
-		$this->userSession = $userSession;
-	}
+    public function __construct(
+        IManager $encryptionManager,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService,
+        GlobalAuth $globalAuth,
+        IUserSession $userSession
+    ) {
+        $this->encryptionManager = $encryptionManager;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+        $this->globalAuth = $globalAuth;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$uid = $this->userSession->getUser()->getUID();
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $uid = $this->userSession->getUser()->getUID();
 
-		$parameters = [
-			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
-			'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
-			'storages'             => $this->userGlobalStoragesService->getStorages(),
-			'backends'             => $this->backendService->getAvailableBackends(),
-			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
-			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
-			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
-			'globalCredentials'    => $this->globalAuth->getAuth($uid),
-			'globalCredentialsUid' => $uid,
-		];
+        $parameters = [
+            'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
+            'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
+            'storages'             => $this->userGlobalStoragesService->getStorages(),
+            'backends'             => $this->backendService->getAvailableBackends(),
+            'authMechanisms'       => $this->backendService->getAuthMechanisms(),
+            'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
+            'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
+            'globalCredentials'    => $this->globalAuth->getAuth($uid),
+            'globalCredentialsUid' => $uid,
+        ];
 
-		return new TemplateResponse('files_external', 'settings', $parameters, '');
-	}
+        return new TemplateResponse('files_external', 'settings', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'externalstorages';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'externalstorages';
+    }
 
-	/**
-	 * @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 40;
-	}
+    /**
+     * @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 40;
+    }
 
 }

lib/private/DB/OracleConnection.php

Indentation +71 added lines, -71 removed lines

@@ -26,80 +26,80 @@
 namespace OC\DB;
 
 class OracleConnection extends Connection {
-	/**
-	 * Quote the keys of the array
-	 */
-	private function quoteKeys(array $data) {
-		$return = [];
-		$c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
-		foreach($data as $key => $value) {
-			if ($key[0] !== $c) {
-				$return[$this->quoteIdentifier($key)] = $value;
-			} else {
-				$return[$key] = $value;
-			}
-		}
-		return $return;
-	}
+    /**
+     * Quote the keys of the array
+     */
+    private function quoteKeys(array $data) {
+        $return = [];
+        $c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
+        foreach($data as $key => $value) {
+            if ($key[0] !== $c) {
+                $return[$this->quoteIdentifier($key)] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+        return $return;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function insert($tableName, array $data, array $types = array()) {
-		if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableName = $this->quoteIdentifier($tableName);
-		}
-		$data = $this->quoteKeys($data);
-		return parent::insert($tableName, $data, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function insert($tableName, array $data, array $types = array()) {
+        if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableName = $this->quoteIdentifier($tableName);
+        }
+        $data = $this->quoteKeys($data);
+        return parent::insert($tableName, $data, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function update($tableName, array $data, array $identifier, array $types = array()) {
-		if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableName = $this->quoteIdentifier($tableName);
-		}
-		$data = $this->quoteKeys($data);
-		$identifier = $this->quoteKeys($identifier);
-		return parent::update($tableName, $data, $identifier, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function update($tableName, array $data, array $identifier, array $types = array()) {
+        if ($tableName[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableName = $this->quoteIdentifier($tableName);
+        }
+        $data = $this->quoteKeys($data);
+        $identifier = $this->quoteKeys($identifier);
+        return parent::update($tableName, $data, $identifier, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function delete($tableExpression, array $identifier, array $types = array()) {
-		if ($tableExpression[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$tableExpression = $this->quoteIdentifier($tableExpression);
-		}
-		$identifier = $this->quoteKeys($identifier);
-		return parent::delete($tableExpression, $identifier);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function delete($tableExpression, array $identifier, array $types = array()) {
+        if ($tableExpression[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $tableExpression = $this->quoteIdentifier($tableExpression);
+        }
+        $identifier = $this->quoteKeys($identifier);
+        return parent::delete($tableExpression, $identifier);
+    }
 
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
-			$schema->dropTable($table);
-		}
-	}
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        if($schema->tablesExist(array($table))) {
+            $schema->dropTable($table);
+        }
+    }
 
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist(array($table));
-	}
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table){
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist(array($table));
+    }
 }

lib/private/Migration/SimpleOutput.php

Indentation +39 added lines, -39 removed lines

@@ -36,49 +36,49 @@
  */
 class SimpleOutput implements IOutput {
 
-	/** @var ILogger */
-	private $logger;
-	private $appName;
+    /** @var ILogger */
+    private $logger;
+    private $appName;
 
-	public function __construct(ILogger $logger, $appName) {
-		$this->logger = $logger;
-		$this->appName = $appName;
-	}
+    public function __construct(ILogger $logger, $appName) {
+        $this->logger = $logger;
+        $this->appName = $appName;
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function info($message) {
-		$this->logger->info($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function info($message) {
+        $this->logger->info($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param string $message
-	 * @since 9.1.0
-	 */
-	public function warning($message) {
-		$this->logger->warning($message, ['app' => $this->appName]);
-	}
+    /**
+     * @param string $message
+     * @since 9.1.0
+     */
+    public function warning($message) {
+        $this->logger->warning($message, ['app' => $this->appName]);
+    }
 
-	/**
-	 * @param int $max
-	 * @since 9.1.0
-	 */
-	public function startProgress($max = 0) {
-	}
+    /**
+     * @param int $max
+     * @since 9.1.0
+     */
+    public function startProgress($max = 0) {
+    }
 
-	/**
-	 * @param int $step
-	 * @param string $description
-	 * @since 9.1.0
-	 */
-	public function advance($step = 1, $description = '') {
-	}
+    /**
+     * @param int $step
+     * @param string $description
+     * @since 9.1.0
+     */
+    public function advance($step = 1, $description = '') {
+    }
 
-	/**
-	 * @since 9.1.0
-	 */
-	public function finishProgress() {
-	}
+    /**
+     * @since 9.1.0
+     */
+    public function finishProgress() {
+    }
 }

apps/dav/lib/Connector/Sabre/BearerAuth.php

Indentation +55 added lines, -55 removed lines

@@ -29,66 +29,66 @@
 use Sabre\HTTP\ResponseInterface;
 
 class BearerAuth extends AbstractBearer {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ISession */
-	private $session;
-	/** @var IRequest */
-	private $request;
-	/** @var string */
-	private $principalPrefix;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ISession */
+    private $session;
+    /** @var IRequest */
+    private $request;
+    /** @var string */
+    private $principalPrefix;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param ISession $session
-	 * @param string $principalPrefix
-	 * @param IRequest $request
-	 */
-	public function __construct(IUserSession $userSession,
-								ISession $session,
-								IRequest $request,
-								$principalPrefix = 'principals/users/') {
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->request = $request;
-		$this->principalPrefix = $principalPrefix;
+    /**
+     * @param IUserSession $userSession
+     * @param ISession $session
+     * @param string $principalPrefix
+     * @param IRequest $request
+     */
+    public function __construct(IUserSession $userSession,
+                                ISession $session,
+                                IRequest $request,
+                                $principalPrefix = 'principals/users/') {
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->request = $request;
+        $this->principalPrefix = $principalPrefix;
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	private function setupUserFs($userId) {
-		\OC_Util::setupFS($userId);
-		$this->session->close();
-		return $this->principalPrefix . $userId;
-	}
+    private function setupUserFs($userId) {
+        \OC_Util::setupFS($userId);
+        $this->session->close();
+        return $this->principalPrefix . $userId;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validateBearerToken($bearerToken) {
-		\OC_Util::setupFS();
+    /**
+     * {@inheritdoc}
+     */
+    public function validateBearerToken($bearerToken) {
+        \OC_Util::setupFS();
 
-		if(!$this->userSession->isLoggedIn()) {
-			$this->userSession->tryTokenLogin($this->request);
-		}
-		if($this->userSession->isLoggedIn()) {
-			return $this->setupUserFs($this->userSession->getUser()->getUID());
-		}
+        if(!$this->userSession->isLoggedIn()) {
+            $this->userSession->tryTokenLogin($this->request);
+        }
+        if($this->userSession->isLoggedIn()) {
+            return $this->setupUserFs($this->userSession->getUser()->getUID());
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
-	 * header which some DAV clients can't handle. Thus we override this function
-	 * and make it simply return a 401.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-		$response->setStatus(401);
-	}
+    /**
+     * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
+     * header which some DAV clients can't handle. Thus we override this function
+     * and make it simply return a 401.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+        $response->setStatus(401);
+    }
 }

lib/private/Comments/ManagerFactory.php

Indentation +27 added lines, -27 removed lines

@@ -30,33 +30,33 @@
 
 class ManagerFactory implements ICommentsManagerFactory {
 
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 
-	/**
-	 * Constructor for the comments manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the comments manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 
-	/**
-	 * creates and returns an instance of the ICommentsManager
-	 *
-	 * @return ICommentsManager
-	 * @since 9.0.0
-	 */
-	public function getManager() {
-		return new Manager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getLogger(),
-			$this->serverContainer->getConfig()
-		);
-	}
+    /**
+     * creates and returns an instance of the ICommentsManager
+     *
+     * @return ICommentsManager
+     * @since 9.0.0
+     */
+    public function getManager() {
+        return new Manager(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->serverContainer->getLogger(),
+            $this->serverContainer->getConfig()
+        );
+    }
 }

apps/dav/lib/Connector/Sabre/CachingTree.php

Indentation +12 added lines, -12 removed lines

@@ -24,16 +24,16 @@
 use Sabre\DAV\Tree;
 
 class CachingTree extends Tree {
-	/**
-	 * Store a node in the cache
-	 *
-	 * @param Node $node
-	 * @param null|string $path
-	 */
-	public function cacheNode(Node $node, $path = null) {
-		if (is_null($path)) {
-			$path = $node->getPath();
-		}
-		$this->cache[trim($path, '/')] = $node;
-	}
+    /**
+     * Store a node in the cache
+     *
+     * @param Node $node
+     * @param null|string $path
+     */
+    public function cacheNode(Node $node, $path = null) {
+        if (is_null($path)) {
+            $path = $node->getPath();
+        }
+        $this->cache[trim($path, '/')] = $node;
+    }
 }

apps/dav/lib/Connector/Sabre/Server.php

Indentation +9 added lines, -9 removed lines

@@ -33,14 +33,14 @@
  * @see \Sabre\DAV\Server
  */
 class Server extends \Sabre\DAV\Server {
-	/** @var CachingTree $tree */
+    /** @var CachingTree $tree */
 
-	/**
-	 * @see \Sabre\DAV\Server
-	 */
-	public function __construct($treeOrNode = null) {
-		parent::__construct($treeOrNode);
-		self::$exposeVersion = false;
-		$this->enablePropfindDepthInfinity = true;
-	}
+    /**
+     * @see \Sabre\DAV\Server
+     */
+    public function __construct($treeOrNode = null) {
+        parent::__construct($treeOrNode);
+        self::$exposeVersion = false;
+        $this->enablePropfindDepthInfinity = true;
+    }
 }

apps/twofactor_backupcodes/lib/Activity/Provider.php

Indentation +35 added lines, -35 removed lines

@@ -31,47 +31,47 @@
 
 class Provider implements IProvider {
 
-	/** @var L10nFactory */
-	private $l10n;
+    /** @var L10nFactory */
+    private $l10n;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IManager */
-	private $activityManager;
+    /** @var IManager */
+    private $activityManager;
 
-	/**
-	 * @param L10nFactory $l10n
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $activityManager
-	 */
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->activityManager = $activityManager;
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param L10nFactory $l10n
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $activityManager
+     */
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->activityManager = $activityManager;
+        $this->l10n = $l10n;
+    }
 
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'twofactor_backupcodes') {
-			throw new InvalidArgumentException();
-		}
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'twofactor_backupcodes') {
+            throw new InvalidArgumentException();
+        }
 
-		$l = $this->l10n->get('twofactor_backupcodes', $language);
+        $l = $this->l10n->get('twofactor_backupcodes', $language);
 
-		switch ($event->getSubject()) {
-			case 'codes_generated':
-				$event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
+        switch ($event->getSubject()) {
+            case 'codes_generated':
+                $event->setParsedSubject($l->t('You created two-factor backup codes for your account'));
 
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-		return $event;
-	}
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/password.svg')));
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+        return $event;
+    }
 
 }