nextcloud / server

apps/workflowengine/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -20,11 +20,11 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
-		['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
-		['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
-		['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
-		['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'flowOperations#getOperations', 'url' => '/operations', 'verb' => 'GET'],
+        ['name' => 'flowOperations#addOperation', 'url' => '/operations', 'verb' => 'POST'],
+        ['name' => 'flowOperations#updateOperation', 'url' => '/operations/{id}', 'verb' => 'PUT'],
+        ['name' => 'flowOperations#deleteOperation', 'url' => '/operations/{id}', 'verb' => 'DELETE'],
+        ['name' => 'requestTime#getTimezones', 'url' => '/timezones', 'verb' => 'GET'],
+    ]
 ];

apps/testing/locking/fakedblockingprovider.php

Indentation +34 added lines, -34 removed lines

@@ -27,44 +27,44 @@
 use OCP\ILogger;
 
 class FakeDBLockingProvider extends \OC\Lock\DBLockingProvider {
-	// Lock for 10 hours just to be sure
-	const TTL = 36000;
+    // Lock for 10 hours just to be sure
+    const TTL = 36000;
 
-	/**
-	 * Need a new child, because parent::connection is private instead of protected...
-	 * @var IDBConnection
-	 */
-	protected $db;
+    /**
+     * Need a new child, because parent::connection is private instead of protected...
+     * @var IDBConnection
+     */
+    protected $db;
 
-	/**
-	 * @param \OCP\IDBConnection $connection
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
-		parent::__construct($connection, $logger, $timeFactory);
-		$this->db = $connection;
-	}
+    /**
+     * @param \OCP\IDBConnection $connection
+     * @param \OCP\ILogger $logger
+     * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
+        parent::__construct($connection, $logger, $timeFactory);
+        $this->db = $connection;
+    }
 
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($path, $type) {
-		// we DONT keep shared locks till the end of the request
-		if ($type === self::LOCK_SHARED) {
-			$this->db->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
-				[$path]
-			);
-		}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($path, $type) {
+        // we DONT keep shared locks till the end of the request
+        if ($type === self::LOCK_SHARED) {
+            $this->db->executeUpdate(
+                'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = 1',
+                [$path]
+            );
+        }
 
-		parent::releaseLock($path, $type);
-	}
+        parent::releaseLock($path, $type);
+    }
 
-	public function __destruct() {
-		// Prevent cleaning up at the end of the live time.
-		// parent::__destruct();
-	}
+    public function __destruct() {
+        // Prevent cleaning up at the end of the live time.
+        // parent::__destruct();
+    }
 }

apps/testing/locking/provisioning.php

Indentation +190 added lines, -190 removed lines

@@ -35,194 +35,194 @@
 
 class Provisioning {
 
-	/** @var ILockingProvider */
-	protected $lockingProvider;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRequest */
-	protected $request;
-
-	/**
-	 * @param ILockingProvider $lockingProvider
-	 * @param IDBConnection $connection
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 */
-	public function __construct(ILockingProvider $lockingProvider, IDBConnection $connection, IConfig $config, IRequest $request) {
-		$this->lockingProvider = $lockingProvider;
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->request = $request;
-	}
-
-	/**
-	 * @return ILockingProvider
-	 */
-	protected function getLockingProvider() {
-		if ($this->lockingProvider instanceof DBLockingProvider) {
-			return \OC::$server->query('OCA\Testing\Locking\FakeDBLockingProvider');
-		} else {
-			throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return int
-	 */
-	protected function getType($parameters) {
-		return isset($parameters['type']) ? (int) $parameters['type'] : 0;
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return int
-	 */
-	protected function getPath($parameters) {
-		$node = \OC::$server->getRootFolder()
-			->getUserFolder($parameters['user'])
-			->get($this->request->getParam('path'));
-		return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
-	}
-
-	/**
-	 * @return \OC_OCS_Result
-	 */
-	public function isLockingEnabled() {
-		try {
-			$this->getLockingProvider();
-			return new \OC_OCS_Result(null, 100);
-		} catch (\RuntimeException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_IMPLEMENTED, $e->getMessage());
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function acquireLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->acquireLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function changeLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->changeLock($path, $type);
-			$this->config->setAppValue('testing', 'locking_' . $path, $type);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function releaseLock(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		try {
-			$lockingProvider->releaseLock($path, $type);
-			$this->config->deleteAppValue('testing', 'locking_' . $path);
-			return new \OC_OCS_Result(null, 100);
-		} catch (LockedException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-		}
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function isLocked(array $parameters) {
-		try {
-			$path = $this->getPath($parameters);
-		} catch (NoUserException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
-		} catch (NotFoundException $e) {
-			return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
-		}
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		if ($lockingProvider->isLocked($path, $type)) {
-			return new \OC_OCS_Result(null, 100);
-		}
-
-		return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function releaseAll(array $parameters) {
-		$type = $this->getType($parameters);
-
-		$lockingProvider = $this->getLockingProvider();
-
-		foreach ($this->config->getAppKeys('testing') as $lock) {
-			if (strpos($lock, 'locking_') === 0) {
-				$path = substr($lock, strlen('locking_'));
-
-				if ($type === ILockingProvider::LOCK_EXCLUSIVE && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_EXCLUSIVE) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else if ($type === ILockingProvider::LOCK_SHARED && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_SHARED) {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				} else {
-					$lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
-				}
-			}
-		}
-
-		return new \OC_OCS_Result(null, 100);
-	}
+    /** @var ILockingProvider */
+    protected $lockingProvider;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRequest */
+    protected $request;
+
+    /**
+     * @param ILockingProvider $lockingProvider
+     * @param IDBConnection $connection
+     * @param IConfig $config
+     * @param IRequest $request
+     */
+    public function __construct(ILockingProvider $lockingProvider, IDBConnection $connection, IConfig $config, IRequest $request) {
+        $this->lockingProvider = $lockingProvider;
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->request = $request;
+    }
+
+    /**
+     * @return ILockingProvider
+     */
+    protected function getLockingProvider() {
+        if ($this->lockingProvider instanceof DBLockingProvider) {
+            return \OC::$server->query('OCA\Testing\Locking\FakeDBLockingProvider');
+        } else {
+            throw new \RuntimeException('Lock provisioning is only possible using the DBLockingProvider');
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return int
+     */
+    protected function getType($parameters) {
+        return isset($parameters['type']) ? (int) $parameters['type'] : 0;
+    }
+
+    /**
+     * @param array $parameters
+     * @return int
+     */
+    protected function getPath($parameters) {
+        $node = \OC::$server->getRootFolder()
+            ->getUserFolder($parameters['user'])
+            ->get($this->request->getParam('path'));
+        return 'files/' . md5($node->getStorage()->getId() . '::' . trim($node->getInternalPath(), '/'));
+    }
+
+    /**
+     * @return \OC_OCS_Result
+     */
+    public function isLockingEnabled() {
+        try {
+            $this->getLockingProvider();
+            return new \OC_OCS_Result(null, 100);
+        } catch (\RuntimeException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_IMPLEMENTED, $e->getMessage());
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function acquireLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->acquireLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function changeLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->changeLock($path, $type);
+            $this->config->setAppValue('testing', 'locking_' . $path, $type);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function releaseLock(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        try {
+            $lockingProvider->releaseLock($path, $type);
+            $this->config->deleteAppValue('testing', 'locking_' . $path);
+            return new \OC_OCS_Result(null, 100);
+        } catch (LockedException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+        }
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function isLocked(array $parameters) {
+        try {
+            $path = $this->getPath($parameters);
+        } catch (NoUserException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'User not found');
+        } catch (NotFoundException $e) {
+            return new \OC_OCS_Result(null, Http::STATUS_NOT_FOUND, 'Path not found');
+        }
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        if ($lockingProvider->isLocked($path, $type)) {
+            return new \OC_OCS_Result(null, 100);
+        }
+
+        return new \OC_OCS_Result(null, Http::STATUS_LOCKED);
+    }
+
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function releaseAll(array $parameters) {
+        $type = $this->getType($parameters);
+
+        $lockingProvider = $this->getLockingProvider();
+
+        foreach ($this->config->getAppKeys('testing') as $lock) {
+            if (strpos($lock, 'locking_') === 0) {
+                $path = substr($lock, strlen('locking_'));
+
+                if ($type === ILockingProvider::LOCK_EXCLUSIVE && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_EXCLUSIVE) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else if ($type === ILockingProvider::LOCK_SHARED && $this->config->getAppValue('testing', $lock) == ILockingProvider::LOCK_SHARED) {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                } else {
+                    $lockingProvider->releaseLock($path, $this->config->getAppValue('testing', $lock));
+                }
+            }
+        }
+
+        return new \OC_OCS_Result(null, 100);
+    }
 }

apps/testing/lib/Config.php

Indentation +33 added lines, -33 removed lines

@@ -27,45 +27,45 @@
 
 class Config {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config, IRequest $request) {
-		$this->config = $config;
-		$this->request = $request;
-	}
+    /**
+     * @param IConfig $config
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config, IRequest $request) {
+        $this->config = $config;
+        $this->request = $request;
+    }
 
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function setAppValue($parameters) {
-		$app = $parameters['appid'];
-		$configKey = $parameters['configkey'];
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function setAppValue($parameters) {
+        $app = $parameters['appid'];
+        $configKey = $parameters['configkey'];
 
-		$value = $this->request->getParam('value');
-		$this->config->setAppValue($app, $configKey, $value);
+        $value = $this->request->getParam('value');
+        $this->config->setAppValue($app, $configKey, $value);
 
-		return new \OC_OCS_Result();
-	}
+        return new \OC_OCS_Result();
+    }
 
-	/**
-	 * @param array $parameters
-	 * @return \OC_OCS_Result
-	 */
-	public function deleteAppValue($parameters) {
-		$app = $parameters['appid'];
-		$configKey = $parameters['configkey'];
+    /**
+     * @param array $parameters
+     * @return \OC_OCS_Result
+     */
+    public function deleteAppValue($parameters) {
+        $app = $parameters['appid'];
+        $configKey = $parameters['configkey'];
 
-		$this->config->deleteAppValue($app, $configKey);
+        $this->config->deleteAppValue($app, $configKey);
 
-		return new \OC_OCS_Result();
-	}
+        return new \OC_OCS_Result();
+    }
 }

apps/testing/lib/Application.php

Indentation +12 added lines, -12 removed lines

@@ -25,18 +25,18 @@
 use OCA\Testing\AlternativeHomeUserBackend;
 
 class Application extends App {
-	public function __construct (array $urlParams = array()) {
-		$appName = 'testing';
-		parent::__construct($appName, $urlParams);
+    public function __construct (array $urlParams = array()) {
+        $appName = 'testing';
+        parent::__construct($appName, $urlParams);
 
-		$c = $this->getContainer();
-		$config = $c->getServer()->getConfig();
-		if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') {
-			$userManager = $c->getServer()->getUserManager();
+        $c = $this->getContainer();
+        $config = $c->getServer()->getConfig();
+        if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') {
+            $userManager = $c->getServer()->getUserManager();
 
-			// replace all user backends with this one
-			$userManager->clearBackends();
-			$userManager->registerBackend($c->query(AlternativeHomeUserBackend::class));
-		}
-	}
+            // replace all user backends with this one
+            $userManager->clearBackends();
+            $userManager->registerBackend($c->query(AlternativeHomeUserBackend::class));
+        }
+    }
 }

apps/testing/lib/AlternativeHomeUserBackend.php

Indentation +18 added lines, -18 removed lines

@@ -34,23 +34,23 @@
  *	]
  */
 class AlternativeHomeUserBackend extends \OC\User\Database {
-	public function __construct() {
-		parent::__construct();
-	}
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return string|false
-	 */
-	public function getHome($uid) {
-		if ($this->userExists($uid)) {
-			// workaround to avoid killing the admin
-			if ($uid !== 'admin') {
-				$uid = md5($uid);
-			}
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
+    public function __construct() {
+        parent::__construct();
+    }
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return string|false
+     */
+    public function getHome($uid) {
+        if ($this->userExists($uid)) {
+            // workaround to avoid killing the admin
+            if ($uid !== 'admin') {
+                $uid = md5($uid);
+            }
+            return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

apps/federatedfilesharing/lib/Notifier.php

Indentation +193 added lines, -193 removed lines

@@ -34,197 +34,197 @@
 use OCP\Notification\INotifier;
 
 class Notifier implements INotifier {
-	/** @var IFactory */
-	protected $factory;
-	/** @var IManager */
-	protected $contactsManager;
-	/** @var IURLGenerator */
-	protected $url;
-	/** @var array */
-	protected $federatedContacts;
-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
-
-	/**
-	 * @param IFactory $factory
-	 * @param IManager $contactsManager
-	 * @param IURLGenerator $url
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
-		$this->factory = $factory;
-		$this->contactsManager = $contactsManager;
-		$this->url = $url;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException
-	 */
-	public function prepare(INotification $notification, $languageCode) {
-		if ($notification->getApp() !== 'files_sharing') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
-
-		// Read the language from the notification
-		$l = $this->factory->get('files_sharing', $languageCode);
-
-		switch ($notification->getSubject()) {
-			// Deal with known subjects
-			case 'remote_share':
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-
-				$params = $notification->getSubjectParameters();
-				if ($params[0] !== $params[1] && $params[1] !== null) {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-							'behalf' => $this->createRemoteUser($params[1]),
-						]
-					);
-				} else {
-					$notification->setParsedSubject(
-						$l->t('You received "%3$s" as a remote share from %1$s', $params)
-					);
-					$notification->setRichSubject(
-						$l->t('You received {share} as a remote share from {user}'),
-						[
-							'share' => [
-								'type' => 'pending-federated-share',
-								'id' => $notification->getObjectId(),
-								'name' => $params[2],
-							],
-							'user' => $this->createRemoteUser($params[0]),
-						]
-					);
-				}
-
-				// Deal with the actions for a known subject
-				foreach ($notification->getActions() as $action) {
-					switch ($action->getLabel()) {
-						case 'accept':
-							$action->setParsedLabel(
-								(string) $l->t('Accept')
-							)
-							->setPrimary(true);
-							break;
-
-						case 'decline':
-							$action->setParsedLabel(
-								(string) $l->t('Decline')
-							);
-							break;
-					}
-
-					$notification->addParsedAction($action);
-				}
-				return $notification;
-
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function createRemoteUser($cloudId) {
-		$displayName = $cloudId;
-		try {
-			$resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
-			$displayName = $this->getDisplayName($resolvedId);
-			$user = $resolvedId->getUser();
-			$server = $resolvedId->getRemote();
-		} catch (HintException $e) {
-			$user = $cloudId;
-			$server = '';
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $user,
-			'name' => $displayName,
-			'server' => $server,
-		];
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param ICloudId $cloudId
-	 * @return string
-	 */
-	protected function getDisplayName(ICloudId $cloudId) {
-		$server = $cloudId->getRemote();
-		$user = $cloudId->getUser();
-		if (strpos($server, 'http://') === 0) {
-			$server = substr($server, strlen('http://'));
-		} else if (strpos($server, 'https://') === 0) {
-			$server = substr($server, strlen('https://'));
-		}
-
-		try {
-			return $this->getDisplayNameFromContact($cloudId->getId());
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@http://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		try {
-			$this->getDisplayNameFromContact($user . '@https://' . $server);
-		} catch (\OutOfBoundsException $e) {
-		}
-
-		return $cloudId->getId();
-	}
-
-	/**
-	 * Try to find the user in the contacts
-	 *
-	 * @param string $federatedCloudId
-	 * @return string
-	 * @throws \OutOfBoundsException when there is no contact for the id
-	 */
-	protected function getDisplayNameFromContact($federatedCloudId) {
-		if (isset($this->federatedContacts[$federatedCloudId])) {
-			if ($this->federatedContacts[$federatedCloudId] !== '') {
-				return $this->federatedContacts[$federatedCloudId];
-			} else {
-				throw new \OutOfBoundsException('No contact found for federated cloud id');
-			}
-		}
-
-		$addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
-		foreach ($addressBookEntries as $entry) {
-			if (isset($entry['CLOUD'])) {
-				foreach ($entry['CLOUD'] as $cloudID) {
-					if ($cloudID === $federatedCloudId) {
-						$this->federatedContacts[$federatedCloudId] = $entry['FN'];
-						return $entry['FN'];
-					}
-				}
-			}
-		}
-
-		$this->federatedContacts[$federatedCloudId] = '';
-		throw new \OutOfBoundsException('No contact found for federated cloud id');
-	}
+    /** @var IFactory */
+    protected $factory;
+    /** @var IManager */
+    protected $contactsManager;
+    /** @var IURLGenerator */
+    protected $url;
+    /** @var array */
+    protected $federatedContacts;
+    /** @var ICloudIdManager */
+    protected $cloudIdManager;
+
+    /**
+     * @param IFactory $factory
+     * @param IManager $contactsManager
+     * @param IURLGenerator $url
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(IFactory $factory, IManager $contactsManager, IURLGenerator $url, ICloudIdManager $cloudIdManager) {
+        $this->factory = $factory;
+        $this->contactsManager = $contactsManager;
+        $this->url = $url;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException
+     */
+    public function prepare(INotification $notification, $languageCode) {
+        if ($notification->getApp() !== 'files_sharing') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
+
+        // Read the language from the notification
+        $l = $this->factory->get('files_sharing', $languageCode);
+
+        switch ($notification->getSubject()) {
+            // Deal with known subjects
+            case 'remote_share':
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+
+                $params = $notification->getSubjectParameters();
+                if ($params[0] !== $params[1] && $params[1] !== null) {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s (on behalf of %2$s)', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user} (on behalf of {behalf})'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                            'behalf' => $this->createRemoteUser($params[1]),
+                        ]
+                    );
+                } else {
+                    $notification->setParsedSubject(
+                        $l->t('You received "%3$s" as a remote share from %1$s', $params)
+                    );
+                    $notification->setRichSubject(
+                        $l->t('You received {share} as a remote share from {user}'),
+                        [
+                            'share' => [
+                                'type' => 'pending-federated-share',
+                                'id' => $notification->getObjectId(),
+                                'name' => $params[2],
+                            ],
+                            'user' => $this->createRemoteUser($params[0]),
+                        ]
+                    );
+                }
+
+                // Deal with the actions for a known subject
+                foreach ($notification->getActions() as $action) {
+                    switch ($action->getLabel()) {
+                        case 'accept':
+                            $action->setParsedLabel(
+                                (string) $l->t('Accept')
+                            )
+                            ->setPrimary(true);
+                            break;
+
+                        case 'decline':
+                            $action->setParsedLabel(
+                                (string) $l->t('Decline')
+                            );
+                            break;
+                    }
+
+                    $notification->addParsedAction($action);
+                }
+                return $notification;
+
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function createRemoteUser($cloudId) {
+        $displayName = $cloudId;
+        try {
+            $resolvedId = $this->cloudIdManager->resolveCloudId($cloudId);
+            $displayName = $this->getDisplayName($resolvedId);
+            $user = $resolvedId->getUser();
+            $server = $resolvedId->getRemote();
+        } catch (HintException $e) {
+            $user = $cloudId;
+            $server = '';
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $user,
+            'name' => $displayName,
+            'server' => $server,
+        ];
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param ICloudId $cloudId
+     * @return string
+     */
+    protected function getDisplayName(ICloudId $cloudId) {
+        $server = $cloudId->getRemote();
+        $user = $cloudId->getUser();
+        if (strpos($server, 'http://') === 0) {
+            $server = substr($server, strlen('http://'));
+        } else if (strpos($server, 'https://') === 0) {
+            $server = substr($server, strlen('https://'));
+        }
+
+        try {
+            return $this->getDisplayNameFromContact($cloudId->getId());
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@http://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        try {
+            $this->getDisplayNameFromContact($user . '@https://' . $server);
+        } catch (\OutOfBoundsException $e) {
+        }
+
+        return $cloudId->getId();
+    }
+
+    /**
+     * Try to find the user in the contacts
+     *
+     * @param string $federatedCloudId
+     * @return string
+     * @throws \OutOfBoundsException when there is no contact for the id
+     */
+    protected function getDisplayNameFromContact($federatedCloudId) {
+        if (isset($this->federatedContacts[$federatedCloudId])) {
+            if ($this->federatedContacts[$federatedCloudId] !== '') {
+                return $this->federatedContacts[$federatedCloudId];
+            } else {
+                throw new \OutOfBoundsException('No contact found for federated cloud id');
+            }
+        }
+
+        $addressBookEntries = $this->contactsManager->search($federatedCloudId, ['CLOUD']);
+        foreach ($addressBookEntries as $entry) {
+            if (isset($entry['CLOUD'])) {
+                foreach ($entry['CLOUD'] as $cloudID) {
+                    if ($cloudID === $federatedCloudId) {
+                        $this->federatedContacts[$federatedCloudId] = $entry['FN'];
+                        return $entry['FN'];
+                    }
+                }
+            }
+        }
+
+        $this->federatedContacts[$federatedCloudId] = '';
+        throw new \OutOfBoundsException('No contact found for federated cloud id');
+    }
 }

apps/federatedfilesharing/lib/TokenHandler.php

Indentation +25 added lines, -25 removed lines

@@ -33,30 +33,30 @@
  */
 class TokenHandler {
 
-	const TOKEN_LENGTH = 15;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/**
-	 * TokenHandler constructor.
-	 *
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(ISecureRandom $secureRandom) {
-		$this->secureRandom = $secureRandom;
-	}
-
-	/**
-	 * generate to token used to authenticate federated shares
-	 *
-	 * @return string
-	 */
-	public function generateToken() {
-		$token = $this->secureRandom->generate(
-			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		return $token;
-	}
+    const TOKEN_LENGTH = 15;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /**
+     * TokenHandler constructor.
+     *
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(ISecureRandom $secureRandom) {
+        $this->secureRandom = $secureRandom;
+    }
+
+    /**
+     * generate to token used to authenticate federated shares
+     *
+     * @return string
+     */
+    public function generateToken() {
+        $token = $this->secureRandom->generate(
+            self::TOKEN_LENGTH,
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        return $token;
+    }
 
 }

apps/federatedfilesharing/lib/AddressHandler.php

Indentation +118 added lines, -118 removed lines

@@ -33,122 +33,122 @@
  */
 class AddressHandler {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/**
-	 * AddressHandler constructor.
-	 *
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $il10n
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		IURLGenerator $urlGenerator,
-		IL10N $il10n,
-		ICloudIdManager $cloudIdManager
-	) {
-		$this->l = $il10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws HintException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			$hint = $this->l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
-		}
-	}
-
-	/**
-	 * generate remote URL part of federated ID
-	 *
-	 * @return string url of the current server
-	 */
-	public function generateRemoteURL() {
-		$url = $this->urlGenerator->getAbsoluteURL('/');
-		return $url;
-	}
-
-	/**
-	 * check if two federated cloud IDs refer to the same user
-	 *
-	 * @param string $user1
-	 * @param string $server1
-	 * @param string $user2
-	 * @param string $server2
-	 * @return bool true if both users and servers are the same
-	 */
-	public function compareAddresses($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower($this->removeProtocolFromUrl($server2));
-
-		if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
-			// FIXME this should be a method in the user management instead
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				array('uid' => &$user1)
-			);
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				array('uid' => &$user2)
-			);
-
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * remove protocol from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function removeProtocolFromUrl($url) {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		} else if (strpos($url, 'http://') === 0) {
-			return substr($url, strlen('http://'));
-		}
-
-		return $url;
-	}
-
-	/**
-	 * check if the url contain the protocol (http or https)
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function urlContainProtocol($url) {
-		if (strpos($url, 'https://') === 0 ||
-			strpos($url, 'http://') === 0) {
-
-			return true;
-		}
-
-		return false;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /**
+     * AddressHandler constructor.
+     *
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $il10n
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        IURLGenerator $urlGenerator,
+        IL10N $il10n,
+        ICloudIdManager $cloudIdManager
+    ) {
+        $this->l = $il10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws HintException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            $hint = $this->l->t('Invalid Federated Cloud ID');
+            throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
+        }
+    }
+
+    /**
+     * generate remote URL part of federated ID
+     *
+     * @return string url of the current server
+     */
+    public function generateRemoteURL() {
+        $url = $this->urlGenerator->getAbsoluteURL('/');
+        return $url;
+    }
+
+    /**
+     * check if two federated cloud IDs refer to the same user
+     *
+     * @param string $user1
+     * @param string $server1
+     * @param string $user2
+     * @param string $server2
+     * @return bool true if both users and servers are the same
+     */
+    public function compareAddresses($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower($this->removeProtocolFromUrl($server2));
+
+        if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
+            // FIXME this should be a method in the user management instead
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                array('uid' => &$user1)
+            );
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                array('uid' => &$user2)
+            );
+
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * remove protocol from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    public function removeProtocolFromUrl($url) {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        } else if (strpos($url, 'http://') === 0) {
+            return substr($url, strlen('http://'));
+        }
+
+        return $url;
+    }
+
+    /**
+     * check if the url contain the protocol (http or https)
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function urlContainProtocol($url) {
+        if (strpos($url, 'https://') === 0 ||
+            strpos($url, 'http://') === 0) {
+
+            return true;
+        }
+
+        return false;
+    }
 }