nextcloud / server

apps/systemtags/lib/Activity/Provider.php

Indentation +335 added lines, -335 removed lines

@@ -34,339 +34,339 @@
 
 class Provider implements IProvider {
 
-	const CREATE_TAG = 'create_tag';
-	const UPDATE_TAG = 'update_tag';
-	const DELETE_TAG = 'delete_tag';
-
-	const ASSIGN_TAG = 'assign_tag';
-	const UNASSIGN_TAG = 'unassign_tag';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[] */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'systemtags') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('systemtags', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Added system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Added system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				$event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('Removed system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
-						'actor' => $parsedParameters['actor'],
-						'systemtag' => $parsedParameters['systemtag'],
-					]);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParameters($event);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
-		}
-
-		if ($event->getSubject() === self::CREATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You created system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::DELETE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::UPDATE_TAG) {
-			if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$this->generatePlainSystemTag($parsedParameters['newsystemtag']),
-					$this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::ASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
-			}
-		} else if ($event->getSubject() === self::UNASSIGN_TAG) {
-			if ($parsedParameters['actor']['id'] === '') {
-				unset($parsedParameters['actor']);
-				$event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
-			} else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
-				$event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
-			} else {
-				$event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
-					$parsedParameters['actor']['name'],
-					$parsedParameters['file']['path'],
-					$this->generatePlainSystemTag($parsedParameters['systemtag']),
-				]))
-					->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::CREATE_TAG:
-			case self::DELETE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'systemtag' => $this->getSystemTagParameter($parameters[1]),
-				];
-			case self::UPDATE_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
-					'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-			case self::ASSIGN_TAG:
-			case self::UNASSIGN_TAG:
-				return [
-					'actor' => $this->getUserParameter((string) $parameters[0]),
-					'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
-					'systemtag' => $this->getSystemTagParameter($parameters[2]),
-				];
-		}
-		return [];
-	}
-
-	protected function getFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-		];
-	}
-
-	protected function getSystemTagParameter($parameter) {
-		$tagData = json_decode($parameter, true);
-		if ($tagData === null) {
-			list($name, $status) = explode('|||', substr($parameter, 3, -3));
-			$tagData = [
-				'id' => 0,// No way to recover the ID
-				'name' => $name,
-				'assignable' => $status === 'assignable',
-				'visible' => $status !== 'invisible',
-			];
-		}
-
-		return [
-			'type' => 'systemtag',
-			'id' => (int) $tagData['id'],
-			'name' => $tagData['name'],
-			'assignable' => $tagData['assignable'] ? '1' : '0',
-			'visibility' => $tagData['visible'] ? '1' : '0',
-		];
-	}
-
-	protected function getUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	protected function generatePlainSystemTag(array $parameter) {
-		if ($parameter['assignable'] === '1') {
-			return $parameter['name'];
-		} else if ($parameter['visibility'] === '1') {
-			return $this->l->t('%s (restricted)', $parameter['name']);
-		} else {
-			return $this->l->t('%s (invisible)', $parameter['name']);
-		}
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    const CREATE_TAG = 'create_tag';
+    const UPDATE_TAG = 'update_tag';
+    const DELETE_TAG = 'delete_tag';
+
+    const ASSIGN_TAG = 'assign_tag';
+    const UNASSIGN_TAG = 'unassign_tag';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[] */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'systemtags') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('systemtags', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s added by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Added system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Added system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                $event->setParsedSubject($this->l->t('System tag %1$s removed by the system', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('Removed system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [
+                        'actor' => $parsedParameters['actor'],
+                        'systemtag' => $parsedParameters['systemtag'],
+                    ]);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParameters($event);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg')));
+        }
+
+        if ($event->getSubject() === self::CREATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You created system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::DELETE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::UPDATE_TAG) {
+            if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $this->generatePlainSystemTag($parsedParameters['newsystemtag']),
+                    $this->generatePlainSystemTag($parsedParameters['oldsystemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::ASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was added to %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was added to {file} by the system'), $parsedParameters);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters);
+            }
+        } else if ($event->getSubject() === self::UNASSIGN_TAG) {
+            if ($parsedParameters['actor']['id'] === '') {
+                unset($parsedParameters['actor']);
+                $event->setParsedSubject($this->l->t('System tag %2$s was removed from %1$s by the system', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('System tag {systemtag} was removed from {file} by the system'), $parsedParameters);
+            } else if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) {
+                $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters);
+            } else {
+                $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [
+                    $parsedParameters['actor']['name'],
+                    $parsedParameters['file']['path'],
+                    $this->generatePlainSystemTag($parsedParameters['systemtag']),
+                ]))
+                    ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters);
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::CREATE_TAG:
+            case self::DELETE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[1]),
+                ];
+            case self::UPDATE_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'newsystemtag' => $this->getSystemTagParameter($parameters[1]),
+                    'oldsystemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+            case self::ASSIGN_TAG:
+            case self::UNASSIGN_TAG:
+                return [
+                    'actor' => $this->getUserParameter((string) $parameters[0]),
+                    'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]),
+                    'systemtag' => $this->getSystemTagParameter($parameters[2]),
+                ];
+        }
+        return [];
+    }
+
+    protected function getFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+        ];
+    }
+
+    protected function getSystemTagParameter($parameter) {
+        $tagData = json_decode($parameter, true);
+        if ($tagData === null) {
+            list($name, $status) = explode('|||', substr($parameter, 3, -3));
+            $tagData = [
+                'id' => 0,// No way to recover the ID
+                'name' => $name,
+                'assignable' => $status === 'assignable',
+                'visible' => $status !== 'invisible',
+            ];
+        }
+
+        return [
+            'type' => 'systemtag',
+            'id' => (int) $tagData['id'],
+            'name' => $tagData['name'],
+            'assignable' => $tagData['assignable'] ? '1' : '0',
+            'visibility' => $tagData['visible'] ? '1' : '0',
+        ];
+    }
+
+    protected function getUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    protected function generatePlainSystemTag(array $parameter) {
+        if ($parameter['assignable'] === '1') {
+            return $parameter['name'];
+        } else if ($parameter['visibility'] === '1') {
+            return $this->l->t('%s (restricted)', $parameter['name']);
+        } else {
+            return $this->l->t('%s (invisible)', $parameter['name']);
+        }
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/encryption/lib/Users/Setup.php

Indentation +50 added lines, -50 removed lines

@@ -32,58 +32,58 @@
 use OCP\IUserSession;
 
 class Setup {
-	/**
-	 * @var Crypt
-	 */
-	private $crypt;
-	/**
-	 * @var KeyManager
-	 */
-	private $keyManager;
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
-	/**
-	 * @var bool|string
-	 */
-	private $user;
+    /**
+     * @var Crypt
+     */
+    private $crypt;
+    /**
+     * @var KeyManager
+     */
+    private $keyManager;
+    /**
+     * @var ILogger
+     */
+    private $logger;
+    /**
+     * @var bool|string
+     */
+    private $user;
 
 
-	/**
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param Crypt $crypt
-	 * @param KeyManager $keyManager
-	 */
-	public function __construct(ILogger $logger,
-								IUserSession $userSession,
-								Crypt $crypt,
-								KeyManager $keyManager) {
-		$this->logger = $logger;
-		$this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
-		$this->crypt = $crypt;
-		$this->keyManager = $keyManager;
-	}
+    /**
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param Crypt $crypt
+     * @param KeyManager $keyManager
+     */
+    public function __construct(ILogger $logger,
+                                IUserSession $userSession,
+                                Crypt $crypt,
+                                KeyManager $keyManager) {
+        $this->logger = $logger;
+        $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
+        $this->crypt = $crypt;
+        $this->keyManager = $keyManager;
+    }
 
-	/**
-	 * @param string $uid user id
-	 * @param string $password user password
-	 * @return bool
-	 */
-	public function setupUser($uid, $password) {
-		if (!$this->keyManager->userHasKeys($uid)) {
-			return $this->keyManager->storeKeyPair($uid, $password,
-				$this->crypt->createKeyPair());
-		}
-		return true;
-	}
+    /**
+     * @param string $uid user id
+     * @param string $password user password
+     * @return bool
+     */
+    public function setupUser($uid, $password) {
+        if (!$this->keyManager->userHasKeys($uid)) {
+            return $this->keyManager->storeKeyPair($uid, $password,
+                $this->crypt->createKeyPair());
+        }
+        return true;
+    }
 
-	/**
-	 * make sure that all system keys exists
-	 */
-	public function setupSystem() {
-		$this->keyManager->validateShareKey();
-		$this->keyManager->validateMasterKey();
-	}
+    /**
+     * make sure that all system keys exists
+     */
+    public function setupSystem() {
+        $this->keyManager->validateShareKey();
+        $this->keyManager->validateMasterKey();
+    }
 }

apps/settings/lib/Activity/SecurityProvider.php

Indentation +66 added lines, -66 removed lines

@@ -37,77 +37,77 @@
 
 class SecurityProvider 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;
 
-	public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->activityManager = $activityManager;
-	}
+    public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, IManager $activityManager) {
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->activityManager = $activityManager;
+    }
 
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getType() !== 'security') {
-			throw new InvalidArgumentException();
-		}
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getType() !== 'security') {
+            throw new InvalidArgumentException();
+        }
 
-		$l = $this->l10n->get('settings', $language);
+        $l = $this->l10n->get('settings', $language);
 
-		switch ($event->getSubject()) {
-			case 'twofactor_success':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
-					$params['provider'],
-				]));
-				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;
-			case 'twofactor_failed':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
-					$params['provider'],
-				]));
-				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;
-			case 'remote_wipe_start':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('Remote wipe was started on %1$s', [
-					$params['name'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
-				}
-				break;
-			case 'remote_wipe_finish':
-				$params = $event->getSubjectParameters();
-				$event->setParsedSubject($l->t('Remote wipe has finished on %1$s', [
-					$params['name'],
-				]));
-				if ($this->activityManager->getRequirePNG()) {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
-				} else {
-					$event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
-				}
-				break;
-			default:
-				throw new InvalidArgumentException();
-		}
-		return $event;
-	}
+        switch ($event->getSubject()) {
+            case 'twofactor_success':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('You successfully logged in using two-factor authentication (%1$s)', [
+                    $params['provider'],
+                ]));
+                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;
+            case 'twofactor_failed':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('A login attempt using two-factor authentication failed (%1$s)', [
+                    $params['provider'],
+                ]));
+                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;
+            case 'remote_wipe_start':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('Remote wipe was started on %1$s', [
+                    $params['name'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
+                }
+                break;
+            case 'remote_wipe_finish':
+                $params = $event->getSubjectParameters();
+                $event->setParsedSubject($l->t('Remote wipe has finished on %1$s', [
+                    $params['name'],
+                ]));
+                if ($this->activityManager->getRequirePNG()) {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.png')));
+                } else {
+                    $event->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/delete.svg')));
+                }
+                break;
+            default:
+                throw new InvalidArgumentException();
+        }
+        return $event;
+    }
 
 }

apps/sharebymail/lib/Activity.php

Indentation +353 added lines, -353 removed lines

@@ -37,357 +37,357 @@
 
 class Activity implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IContactsManager */
-	protected $contactsManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	/** @var array */
-	protected $contactNames = [];
-
-	const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
-	const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
-	const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
-	const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
-	const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
-	const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IContactsManager $contactsManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'sharebymail') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('sharebymail', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s', [
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email}'), [
-					'email' => $parsedParameters['email'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
-					'email' => $parsedParameters['email'],
-					'actor' => $parsedParameters['actor'],
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
-					'email' => $parsedParameters['email']
-				]);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject($this->l->t('Password for mail share sent to you'))
-				->setRichSubject($this->l->t('Password for mail share sent to you'));
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
-			$event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-			]))
-				->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
-			$event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name'],
-				$parsedParameters['actor']['name'],
-			]))
-				->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
-			$event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
-				$parsedParameters['file']['path'],
-				$parsedParameters['email']['name']
-			]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
-			$event->setParsedSubject(
-				$this->l->t('Password to access %1$s was sent to you',
-					[$parsedParameters['file']['path']]))
-				->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
-			if ($this->activityManager->getRequirePNG()) {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
-			} else {
-				$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-			}
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_EMAIL_SELF:
-			case self::SUBJECT_UNSHARED_EMAIL_SELF:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_BY:
-			case self::SUBJECT_UNSHARED_EMAIL_BY:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-					'email' => $this->generateEmailParameter($parameters[1]),
-				];
-			case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
-				return [
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
-				];
-		}
-		throw new \InvalidArgumentException();
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $path
-	 * @return array
-	 */
-	protected function generateFileParameter($id, $path) {
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return array
-	 */
-	protected function generateEmailParameter($email) {
-		if (!isset($this->contactNames[$email])) {
-			$this->contactNames[$email] = $this->getContactName($email);
-		}
-
-		return [
-			'type' => 'email',
-			'id' => $email,
-			'name' => $this->contactNames[$email],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $email
-	 * @return string
-	 */
-	protected function getContactName($email) {
-		$addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
-
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-
-			if (in_array($email, $contact['EMAIL'])) {
-				return $contact['FN'];
-			}
-		}
-
-		return $email;
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IContactsManager */
+    protected $contactsManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    /** @var array */
+    protected $contactNames = [];
+
+    const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
+    const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
+    const SUBJECT_SHARED_EMAIL_PASSWORD_SEND = 'shared_with_email_password_send';
+    const SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF = 'shared_with_email_password_send_self';
+    const SUBJECT_UNSHARED_EMAIL_SELF = 'unshared_with_email_self';
+    const SUBJECT_UNSHARED_EMAIL_BY = 'unshared_with_email_by';
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IContactsManager $contactsManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'sharebymail') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('sharebymail', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s', [
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email}'), [
+                    'email' => $parsedParameters['email'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('Unshared from %1$s by %2$s', [
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('Unshared from {email} by {actor}'), [
+                    'email' => $parsedParameters['email'],
+                    'actor' => $parsedParameters['actor'],
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to %1$s', [
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password for mail share sent to {email}'), [
+                    'email' => $parsedParameters['email']
+                ]);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject($this->l->t('Password for mail share sent to you'))
+                ->setRichSubject($this->l->t('Password for mail share sent to you'));
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_SELF) {
+            $event->setParsedSubject($this->l->t('You unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+            ]))
+                ->setRichSubject($this->l->t('You unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_EMAIL_BY) {
+            $event->setParsedSubject($this->l->t('%3$s unshared %1$s from %2$s by mail', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name'],
+                $parsedParameters['actor']['name'],
+            ]))
+                ->setRichSubject($this->l->t('{actor} unshared {file} from {email} by mail'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND) {
+            $event->setParsedSubject($this->l->t('Password to access %1$s was sent to %2s', [
+                $parsedParameters['file']['path'],
+                $parsedParameters['email']['name']
+            ]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to {email}'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF) {
+            $event->setParsedSubject(
+                $this->l->t('Password to access %1$s was sent to you',
+                    [$parsedParameters['file']['path']]))
+                ->setRichSubject($this->l->t('Password to access {file} was sent to you'), $parsedParameters);
+            if ($this->activityManager->getRequirePNG()) {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
+            } else {
+                $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+            }
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_EMAIL_SELF:
+            case self::SUBJECT_UNSHARED_EMAIL_SELF:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_BY:
+            case self::SUBJECT_UNSHARED_EMAIL_BY:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                    'email' => $this->generateEmailParameter($parameters[1]),
+                ];
+            case self::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF:
+                return [
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
+                ];
+        }
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @param int $id
+     * @param string $path
+     * @return array
+     */
+    protected function generateFileParameter($id, $path) {
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return array
+     */
+    protected function generateEmailParameter($email) {
+        if (!isset($this->contactNames[$email])) {
+            $this->contactNames[$email] = $this->getContactName($email);
+        }
+
+        return [
+            'type' => 'email',
+            'id' => $email,
+            'name' => $this->contactNames[$email],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $email
+     * @return string
+     */
+    protected function getContactName($email) {
+        $addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
+
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+
+            if (in_array($email, $contact['EMAIL'])) {
+                return $contact['FN'];
+            }
+        }
+
+        return $email;
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +922 added lines, -922 removed lines

@@ -62,926 +62,926 @@
 
 class UsersController extends AUserData {
 
-	/** @var IAppManager */
-	private $appManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
-	/** @var FederatedFileSharingFactory */
-	private $federatedFileSharingFactory;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var RemoteWipe */
-	private $remoteWipe;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param AccountManager $accountManager
-	 * @param ILogger $logger
-	 * @param IFactory $l10nFactory
-	 * @param NewUserMailHelper $newUserMailHelper
-	 * @param FederatedFileSharingFactory $federatedFileSharingFactory
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IAppManager $appManager,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $accountManager,
-								ILogger $logger,
-								IFactory $l10nFactory,
-								NewUserMailHelper $newUserMailHelper,
-								FederatedFileSharingFactory $federatedFileSharingFactory,
-								ISecureRandom $secureRandom,
-								RemoteWipe $remoteWipe) {
-		parent::__construct($appName,
-							$request,
-							$userManager,
-							$config,
-							$groupManager,
-							$userSession,
-							$accountManager);
-
-		$this->appManager = $appManager;
-		$this->logger = $logger;
-		$this->l10nFactory = $l10nFactory;
-		$this->newUserMailHelper = $newUserMailHelper;
-		$this->federatedFileSharingFactory = $federatedFileSharingFactory;
-		$this->secureRandom = $secureRandom;
-		$this->remoteWipe = $remoteWipe;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getUsers(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
-			$users = $this->userManager->search($search, $limit, $offset);
-		} else if ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-		}
-
-		$users = array_keys($users);
-
-		return new DataResponse([
-			'users' => $users
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users and their data
-	 */
-	public function getUsersDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
-		$currentUser = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $currentUser->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if ($this->groupManager->isAdmin($uid)){
-			$users = $this->userManager->search($search, $limit, $offset);
-			$users = array_keys($users);
-		} else if ($subAdminManager->isSubAdmin($currentUser)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-			$users = array_merge(...$users);
-		}
-
-		$usersDetails = [];
-		foreach ($users as $userId) {
-			$userId = (string) $userId;
-			$userData = $this->getUserData($userId);
-			// Do not insert empty entry
-			if (!empty($userData)) {
-				$usersDetails[$userId] = $userData;
-			} else {
-				// Logged user does not have permissions to see this user
-				// only showing its id
-				$usersDetails[$userId] = ['id' => $userId];
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	private function createNewUserId(): string {
-		$attempts = 0;
-		do {
-			$uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
-			if (!$this->userManager->userExists($uidCandidate)) {
-				return $uidCandidate;
-			}
-			$attempts++;
-		} while ($attempts < 10);
-		throw new OCSException('Could not create non-existing user id', 111);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userid
-	 * @param string $password
-	 * @param string $displayName
-	 * @param string $email
-	 * @param array $groups
-	 * @param array $subadmin
-	 * @param string $quota
-	 * @param string $language
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addUser(string $userid,
-							string $password = '',
-							string $displayName = '',
-							string $email = '',
-							array $groups = [],
-							array $subadmin = [],
-							string $quota = '',
-							string $language = ''): DataResponse {
-		$user = $this->userSession->getUser();
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		if(empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
-			$userid = $this->createNewUserId();
-		}
-
-		if ($this->userManager->userExists($userid)) {
-			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException('User already exists', 102);
-		}
-
-		if ($groups !== []) {
-			foreach ($groups as $group) {
-				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group '.$group.' does not exist', 104);
-				}
-				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
-				}
-			}
-		} else {
-			if (!$isAdmin) {
-				throw new OCSException('no group specified (required for subadmins)', 106);
-			}
-		}
-
-		$subadminGroups = [];
-		if ($subadmin !== []) {
-			foreach ($subadmin as $groupid) {
-				$group = $this->groupManager->get($groupid);
-				// Check if group exists
-				if ($group === null) {
-					throw new OCSException('Subadmin group does not exist',  102);
-				}
-				// Check if trying to make subadmin of admin group
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot create subadmins for admin group', 103);
-				}
-				// Check if has permission to promote subadmins
-				if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
-					throw new OCSForbiddenException('No permissions to promote subadmins');
-				}
-				$subadminGroups[] = $group;
-			}
-		}
-
-		$generatePasswordResetToken = false;
-		if ($password === '') {
-			if ($email === '') {
-				throw new OCSException('To send a password link to the user an email address is required.', 108);
-			}
-
-			$password = $this->secureRandom->generate(10);
-			// Make sure we pass the password_policy
-			$password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
-			$generatePasswordResetToken = true;
-		}
-
-		if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
-			throw new OCSException('Required email address was not provided', 110);
-		}
-
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
-
-			foreach ($groups as $group) {
-				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
-			}
-			foreach ($subadminGroups as $group) {
-				$subAdminManager->createSubAdmin($newUser, $group);
-			}
-
-			if ($displayName !== '') {
-				$this->editUser($userid, 'display', $displayName);
-			}
-
-			if ($quota !== '') {
-				$this->editUser($userid, 'quota', $quota);
-			}
-
-			if ($language !== '') {
-				$this->editUser($userid, 'language', $language);
-			}
-
-			// Send new user mail only if a mail is set
-			if ($email !== '' && $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
-				$newUser->setEMailAddress($email);
-				try {
-					$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
-					$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
-				} catch (\Exception $e) {
-					// Mail could be failing hard or just be plain not configured
-					// Logging error as it is the hardest of the two
-					$this->logger->logException($e, [
-						'message' => "Unable to send the invitation mail to $email",
-						'level' => ILogger::ERROR,
-						'app' => 'ocs_api',
-					]);
-				}
-			}
-
-			return new DataResponse(['id' => $userid]);
-
-		} catch (HintException $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed addUser attempt with hint exception.',
-				'level' => ILogger::WARN,
-				'app' => 'ocs_api',
-			]);
-			throw new OCSException($e->getHint(), 107);
-		} catch (OCSException $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed addUser attempt with ocs exeption.',
-				'level' => ILogger::ERROR,
-				'app' => 'ocs_api',
-			]);
-			throw $e;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed addUser attempt with exception.',
-				'level' => ILogger::ERROR,
-				'app' => 'ocs_api',
-			]);
-			throw new OCSException('Bad request', 101);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUser(string $userId): DataResponse {
-		$data = $this->getUserData($userId);
-		// getUserData returns empty array if not enough permissions
-		if (empty($data)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-		return new DataResponse($data);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info from the currently logged in user
-	 *
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getCurrentUser(): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user) {
-			$data =  $this->getUserData($user->getUID());
-			// rename "displayname" to "display-name" only for this call to keep
-			// the API stable.
-			$data['display-name'] = $data['displayname'];
-			unset($data['displayname']);
-			return new DataResponse($data);
-
-		}
-
-		throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 */
-	public function getEditableFields(): DataResponse {
-		$permittedFields = [];
-
-		// Editing self (display, email)
-		if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-			$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-			$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-		}
-
-		if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
-			$federatedFileSharing = $this->federatedFileSharingFactory->get();
-			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-			if ($shareProvider->isLookupServerUploadEnabled()) {
-				$permittedFields[] = AccountManager::PROPERTY_PHONE;
-				$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-			}
-		}
-
-		return new DataResponse($permittedFields);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * edit users
-	 *
-	 * @param string $userId
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function editUser(string $userId, string $key, string $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
-				$permittedFields[] = 'display';
-				$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-			}
-
-			$permittedFields[] = 'password';
-			if ($this->config->getSystemValue('force_language', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'language';
-			}
-
-			if ($this->config->getSystemValue('force_locale', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'locale';
-			}
-
-			if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
-				$federatedFileSharing = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
-				$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-				if ($shareProvider->isLookupServerUploadEnabled()) {
-					$permittedFields[] = AccountManager::PROPERTY_PHONE;
-					$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-					$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-					$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-				}
-			}
-
-			// If admin they can edit their own quota
-			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'quota';
-			}
-		} else {
-			// Check if admin / subadmin
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			|| $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				// They have permissions over the user
-				$permittedFields[] = 'display';
-				$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = 'password';
-				$permittedFields[] = 'language';
-				$permittedFields[] = 'locale';
-				$permittedFields[] = AccountManager::PROPERTY_PHONE;
-				$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = 'quota';
-			} else {
-				// No rights
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-		// Check if permitted to edit this field
-		if (!in_array($key, $permittedFields)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-		// Process the edit
-		switch($key) {
-			case 'display':
-			case AccountManager::PROPERTY_DISPLAYNAME:
-				$targetUser->setDisplayName($value);
-				break;
-			case 'quota':
-				$quota = $value;
-				if ($quota !== 'none' && $quota !== 'default') {
-					if (is_numeric($quota)) {
-						$quota = (float) $quota;
-					} else {
-						$quota = \OCP\Util::computerFileSize($quota);
-					}
-					if ($quota === false) {
-						throw new OCSException('Invalid quota value '.$value, 103);
-					}
-					if ($quota === -1) {
-						$quota = 'none';
-					} else {
-						$quota = \OCP\Util::humanFileSize($quota);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case 'password':
-				try {
-					if (!$targetUser->canChangePassword()) {
-						throw new OCSException('Setting the password is not supported by the users backend', 103);
-					}
-					$targetUser->setPassword($value);
-				} catch (HintException $e) { // password policy error
-					throw new OCSException($e->getMessage(), 103);
-				}
-				break;
-			case 'language':
-				$languagesCodes = $this->l10nFactory->findAvailableLanguages();
-				if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
-					throw new OCSException('Invalid language', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
-				break;
-			case 'locale':
-				if (!$this->l10nFactory->localeExists($value)) {
-					throw new OCSException('Invalid locale', 102);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
-				break;
-			case AccountManager::PROPERTY_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case AccountManager::PROPERTY_PHONE:
-			case AccountManager::PROPERTY_ADDRESS:
-			case AccountManager::PROPERTY_WEBSITE:
-			case AccountManager::PROPERTY_TWITTER:
-				$userAccount = $this->accountManager->getUser($targetUser);
-				if ($userAccount[$key]['value'] !== $value) {
-					$userAccount[$key]['value'] = $value;
-					$this->accountManager->updateUser($targetUser, $userAccount);
-				}
-				break;
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 *
-	 * @return DataResponse
-	 *
-	 * @throws OCSException
-	 */
-	public function wipeUserDevices(string $userId): DataResponse {
-		/** @var IUser $currentLoggedInUser */
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$this->remoteWipe->markAllTokensForWipe($targetUser);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function deleteUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// Go ahead with the delete
-		if ($targetUser->delete()) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('', 101);
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function disableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, false);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function enableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, true);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param bool $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	private function setEnabled(string $userId, bool $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// enable/disable the user now
-		$targetUser->setEnabled($value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUsersGroups(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
-			// Self lookup or admin lookup
-			return new DataResponse([
-				'groups' => $this->groupManager->getUserGroupIds($targetUser)
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				/** @var IGroup[] $getSubAdminsGroups */
-				$getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-				foreach ($getSubAdminsGroups as $key => $group) {
-					$getSubAdminsGroups[$key] = $group->getGID();
-				}
-				$groups = array_intersect(
-					$getSubAdminsGroups,
-					$this->groupManager->getUserGroupIds($targetUser)
-				);
-				return new DataResponse(['groups' => $groups]);
-			} else {
-				// Not permitted
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addToGroup(string $userId, string $groupid = ''): DataResponse {
-		if ($groupid === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		$targetUser = $this->userManager->get($userId);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$loggedInUser = $this->userSession->getUser();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Add user to group
-		$group->addUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeFromGroup(string $userId, string $groupid): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		if ($groupid === null || trim($groupid) === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
-		if ($targetUser->getUID() === $loggedInUser->getUID()) {
-			if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot remove yourself from the admin group', 105);
-				}
-			} else {
-				// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
-				throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
-			}
-
-		} else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
-			/** @var IGroup[] $subAdminGroups */
-			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
-				return $subAdminGroup->getGID();
-			}, $subAdminGroups);
-			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
-			$userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
-
-			if (count($userSubAdminGroups) <= 1) {
-				// Subadmin must not be able to remove a user from all their subadmin groups.
-				throw new OCSException('Not viable to remove user from the last group you are SubAdmin of', 105);
-			}
-		}
-
-		// Remove user from group
-		$group->removeUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Creates a subadmin
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist',  102);
-		}
-		// Check if trying to make subadmin of admin group
-		if ($group->getGID() === 'admin') {
-			throw new OCSException('Cannot create subadmins for admin group', 103);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// We cannot be subadmin twice
-		if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
-			return new DataResponse();
-		}
-		// Go
-		$subAdminManager->createSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Removes a subadmin from a group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if the group exists
-		if ($group === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
-		// Check if they are a subadmin of this said group
-		if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
-			throw new OCSException('User is not a subadmin of this group', 102);
-		}
-
-		// Go
-		$subAdminManager->deleteSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUserSubAdminGroups(string $userId): DataResponse {
-		$groups = $this->getUserSubAdminGroupsData($userId);
-		return new DataResponse($groups);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * resend welcome message
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function resendWelcomeMessage(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		// Check if admin / subadmin
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			&& !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-			// No rights
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$email = $targetUser->getEMailAddress();
-		if ($email === '' || $email === null) {
-			throw new OCSException('Email address not available', 101);
-		}
-
-		try {
-			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
-			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch(\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => "Can't send new user mail to $email",
-				'level' => ILogger::ERROR,
-				'app' => 'settings',
-			]);
-			throw new OCSException('Sending email failed', 102);
-		}
-
-		return new DataResponse();
-	}
+    /** @var IAppManager */
+    private $appManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var NewUserMailHelper */
+    private $newUserMailHelper;
+    /** @var FederatedFileSharingFactory */
+    private $federatedFileSharingFactory;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var RemoteWipe */
+    private $remoteWipe;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     * @param AccountManager $accountManager
+     * @param ILogger $logger
+     * @param IFactory $l10nFactory
+     * @param NewUserMailHelper $newUserMailHelper
+     * @param FederatedFileSharingFactory $federatedFileSharingFactory
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IAppManager $appManager,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $accountManager,
+                                ILogger $logger,
+                                IFactory $l10nFactory,
+                                NewUserMailHelper $newUserMailHelper,
+                                FederatedFileSharingFactory $federatedFileSharingFactory,
+                                ISecureRandom $secureRandom,
+                                RemoteWipe $remoteWipe) {
+        parent::__construct($appName,
+                            $request,
+                            $userManager,
+                            $config,
+                            $groupManager,
+                            $userSession,
+                            $accountManager);
+
+        $this->appManager = $appManager;
+        $this->logger = $logger;
+        $this->l10nFactory = $l10nFactory;
+        $this->newUserMailHelper = $newUserMailHelper;
+        $this->federatedFileSharingFactory = $federatedFileSharingFactory;
+        $this->secureRandom = $secureRandom;
+        $this->remoteWipe = $remoteWipe;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getUsers(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)){
+            $users = $this->userManager->search($search, $limit, $offset);
+        } else if ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+        }
+
+        $users = array_keys($users);
+
+        return new DataResponse([
+            'users' => $users
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users and their data
+     */
+    public function getUsersDetails(string $search = '', int $limit = null, int $offset = 0): DataResponse {
+        $currentUser = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $currentUser->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if ($this->groupManager->isAdmin($uid)){
+            $users = $this->userManager->search($search, $limit, $offset);
+            $users = array_keys($users);
+        } else if ($subAdminManager->isSubAdmin($currentUser)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+            $users = array_merge(...$users);
+        }
+
+        $usersDetails = [];
+        foreach ($users as $userId) {
+            $userId = (string) $userId;
+            $userData = $this->getUserData($userId);
+            // Do not insert empty entry
+            if (!empty($userData)) {
+                $usersDetails[$userId] = $userData;
+            } else {
+                // Logged user does not have permissions to see this user
+                // only showing its id
+                $usersDetails[$userId] = ['id' => $userId];
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+    /**
+     * @throws OCSException
+     */
+    private function createNewUserId(): string {
+        $attempts = 0;
+        do {
+            $uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
+            if (!$this->userManager->userExists($uidCandidate)) {
+                return $uidCandidate;
+            }
+            $attempts++;
+        } while ($attempts < 10);
+        throw new OCSException('Could not create non-existing user id', 111);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userid
+     * @param string $password
+     * @param string $displayName
+     * @param string $email
+     * @param array $groups
+     * @param array $subadmin
+     * @param string $quota
+     * @param string $language
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addUser(string $userid,
+                            string $password = '',
+                            string $displayName = '',
+                            string $email = '',
+                            array $groups = [],
+                            array $subadmin = [],
+                            string $quota = '',
+                            string $language = ''): DataResponse {
+        $user = $this->userSession->getUser();
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        if(empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
+            $userid = $this->createNewUserId();
+        }
+
+        if ($this->userManager->userExists($userid)) {
+            $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+            throw new OCSException('User already exists', 102);
+        }
+
+        if ($groups !== []) {
+            foreach ($groups as $group) {
+                if (!$this->groupManager->groupExists($group)) {
+                    throw new OCSException('group '.$group.' does not exist', 104);
+                }
+                if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
+                    throw new OCSException('insufficient privileges for group '. $group, 105);
+                }
+            }
+        } else {
+            if (!$isAdmin) {
+                throw new OCSException('no group specified (required for subadmins)', 106);
+            }
+        }
+
+        $subadminGroups = [];
+        if ($subadmin !== []) {
+            foreach ($subadmin as $groupid) {
+                $group = $this->groupManager->get($groupid);
+                // Check if group exists
+                if ($group === null) {
+                    throw new OCSException('Subadmin group does not exist',  102);
+                }
+                // Check if trying to make subadmin of admin group
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot create subadmins for admin group', 103);
+                }
+                // Check if has permission to promote subadmins
+                if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin) {
+                    throw new OCSForbiddenException('No permissions to promote subadmins');
+                }
+                $subadminGroups[] = $group;
+            }
+        }
+
+        $generatePasswordResetToken = false;
+        if ($password === '') {
+            if ($email === '') {
+                throw new OCSException('To send a password link to the user an email address is required.', 108);
+            }
+
+            $password = $this->secureRandom->generate(10);
+            // Make sure we pass the password_policy
+            $password .= $this->secureRandom->generate(2, '$!.,;:-~+*[]{}()');
+            $generatePasswordResetToken = true;
+        }
+
+        if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
+            throw new OCSException('Required email address was not provided', 110);
+        }
+
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            $this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+
+            foreach ($groups as $group) {
+                $this->groupManager->get($group)->addUser($newUser);
+                $this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+            }
+            foreach ($subadminGroups as $group) {
+                $subAdminManager->createSubAdmin($newUser, $group);
+            }
+
+            if ($displayName !== '') {
+                $this->editUser($userid, 'display', $displayName);
+            }
+
+            if ($quota !== '') {
+                $this->editUser($userid, 'quota', $quota);
+            }
+
+            if ($language !== '') {
+                $this->editUser($userid, 'language', $language);
+            }
+
+            // Send new user mail only if a mail is set
+            if ($email !== '' && $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
+                $newUser->setEMailAddress($email);
+                try {
+                    $emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
+                    $this->newUserMailHelper->sendMail($newUser, $emailTemplate);
+                } catch (\Exception $e) {
+                    // Mail could be failing hard or just be plain not configured
+                    // Logging error as it is the hardest of the two
+                    $this->logger->logException($e, [
+                        'message' => "Unable to send the invitation mail to $email",
+                        'level' => ILogger::ERROR,
+                        'app' => 'ocs_api',
+                    ]);
+                }
+            }
+
+            return new DataResponse(['id' => $userid]);
+
+        } catch (HintException $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed addUser attempt with hint exception.',
+                'level' => ILogger::WARN,
+                'app' => 'ocs_api',
+            ]);
+            throw new OCSException($e->getHint(), 107);
+        } catch (OCSException $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed addUser attempt with ocs exeption.',
+                'level' => ILogger::ERROR,
+                'app' => 'ocs_api',
+            ]);
+            throw $e;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed addUser attempt with exception.',
+                'level' => ILogger::ERROR,
+                'app' => 'ocs_api',
+            ]);
+            throw new OCSException('Bad request', 101);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUser(string $userId): DataResponse {
+        $data = $this->getUserData($userId);
+        // getUserData returns empty array if not enough permissions
+        if (empty($data)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+        return new DataResponse($data);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info from the currently logged in user
+     *
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getCurrentUser(): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user) {
+            $data =  $this->getUserData($user->getUID());
+            // rename "displayname" to "display-name" only for this call to keep
+            // the API stable.
+            $data['display-name'] = $data['displayname'];
+            unset($data['displayname']);
+            return new DataResponse($data);
+
+        }
+
+        throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     */
+    public function getEditableFields(): DataResponse {
+        $permittedFields = [];
+
+        // Editing self (display, email)
+        if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+            $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+            $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+        }
+
+        if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
+            $federatedFileSharing = $this->federatedFileSharingFactory->get();
+            $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+            if ($shareProvider->isLookupServerUploadEnabled()) {
+                $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+            }
+        }
+
+        return new DataResponse($permittedFields);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * edit users
+     *
+     * @param string $userId
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function editUser(string $userId, string $key, string $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            if ($this->config->getSystemValue('allow_user_to_change_display_name', true) !== false) {
+                $permittedFields[] = 'display';
+                $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+            }
+
+            $permittedFields[] = 'password';
+            if ($this->config->getSystemValue('force_language', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'language';
+            }
+
+            if ($this->config->getSystemValue('force_locale', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'locale';
+            }
+
+            if ($this->appManager->isEnabledForUser('federatedfilesharing')) {
+                $federatedFileSharing = \OC::$server->query(\OCA\FederatedFileSharing\AppInfo\Application::class);
+                $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+                if ($shareProvider->isLookupServerUploadEnabled()) {
+                    $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                    $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                    $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                    $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+                }
+            }
+
+            // If admin they can edit their own quota
+            if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'quota';
+            }
+        } else {
+            // Check if admin / subadmin
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            || $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                // They have permissions over the user
+                $permittedFields[] = 'display';
+                $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = 'password';
+                $permittedFields[] = 'language';
+                $permittedFields[] = 'locale';
+                $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = 'quota';
+            } else {
+                // No rights
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+        // Check if permitted to edit this field
+        if (!in_array($key, $permittedFields)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+        // Process the edit
+        switch($key) {
+            case 'display':
+            case AccountManager::PROPERTY_DISPLAYNAME:
+                $targetUser->setDisplayName($value);
+                break;
+            case 'quota':
+                $quota = $value;
+                if ($quota !== 'none' && $quota !== 'default') {
+                    if (is_numeric($quota)) {
+                        $quota = (float) $quota;
+                    } else {
+                        $quota = \OCP\Util::computerFileSize($quota);
+                    }
+                    if ($quota === false) {
+                        throw new OCSException('Invalid quota value '.$value, 103);
+                    }
+                    if ($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $quota = \OCP\Util::humanFileSize($quota);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case 'password':
+                try {
+                    if (!$targetUser->canChangePassword()) {
+                        throw new OCSException('Setting the password is not supported by the users backend', 103);
+                    }
+                    $targetUser->setPassword($value);
+                } catch (HintException $e) { // password policy error
+                    throw new OCSException($e->getMessage(), 103);
+                }
+                break;
+            case 'language':
+                $languagesCodes = $this->l10nFactory->findAvailableLanguages();
+                if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
+                    throw new OCSException('Invalid language', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
+                break;
+            case 'locale':
+                if (!$this->l10nFactory->localeExists($value)) {
+                    throw new OCSException('Invalid locale', 102);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
+                break;
+            case AccountManager::PROPERTY_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case AccountManager::PROPERTY_PHONE:
+            case AccountManager::PROPERTY_ADDRESS:
+            case AccountManager::PROPERTY_WEBSITE:
+            case AccountManager::PROPERTY_TWITTER:
+                $userAccount = $this->accountManager->getUser($targetUser);
+                if ($userAccount[$key]['value'] !== $value) {
+                    $userAccount[$key]['value'] = $value;
+                    $this->accountManager->updateUser($targetUser, $userAccount);
+                }
+                break;
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     *
+     * @return DataResponse
+     *
+     * @throws OCSException
+     */
+    public function wipeUserDevices(string $userId): DataResponse {
+        /** @var IUser $currentLoggedInUser */
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $this->remoteWipe->markAllTokensForWipe($targetUser);
+
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function deleteUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // Go ahead with the delete
+        if ($targetUser->delete()) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('', 101);
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function disableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, false);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function enableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, true);
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $value
+     * @return DataResponse
+     * @throws OCSException
+     */
+    private function setEnabled(string $userId, bool $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // enable/disable the user now
+        $targetUser->setEnabled($value);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUsersGroups(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
+            // Self lookup or admin lookup
+            return new DataResponse([
+                'groups' => $this->groupManager->getUserGroupIds($targetUser)
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                /** @var IGroup[] $getSubAdminsGroups */
+                $getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+                foreach ($getSubAdminsGroups as $key => $group) {
+                    $getSubAdminsGroups[$key] = $group->getGID();
+                }
+                $groups = array_intersect(
+                    $getSubAdminsGroups,
+                    $this->groupManager->getUserGroupIds($targetUser)
+                );
+                return new DataResponse(['groups' => $groups]);
+            } else {
+                // Not permitted
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addToGroup(string $userId, string $groupid = ''): DataResponse {
+        if ($groupid === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        $targetUser = $this->userManager->get($userId);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $loggedInUser = $this->userSession->getUser();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Add user to group
+        $group->addUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeFromGroup(string $userId, string $groupid): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        if ($groupid === null || trim($groupid) === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Check they aren't removing themselves from 'admin' or their 'subadmin; group
+        if ($targetUser->getUID() === $loggedInUser->getUID()) {
+            if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot remove yourself from the admin group', 105);
+                }
+            } else {
+                // Not an admin, so the user must be a subadmin of this group, but that is not allowed.
+                throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
+            }
+
+        } else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
+            /** @var IGroup[] $subAdminGroups */
+            $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+            $subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+                return $subAdminGroup->getGID();
+            }, $subAdminGroups);
+            $userGroups = $this->groupManager->getUserGroupIds($targetUser);
+            $userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
+
+            if (count($userSubAdminGroups) <= 1) {
+                // Subadmin must not be able to remove a user from all their subadmin groups.
+                throw new OCSException('Not viable to remove user from the last group you are SubAdmin of', 105);
+            }
+        }
+
+        // Remove user from group
+        $group->removeUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Creates a subadmin
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist',  102);
+        }
+        // Check if trying to make subadmin of admin group
+        if ($group->getGID() === 'admin') {
+            throw new OCSException('Cannot create subadmins for admin group', 103);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // We cannot be subadmin twice
+        if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
+            return new DataResponse();
+        }
+        // Go
+        $subAdminManager->createSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Removes a subadmin from a group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if the group exists
+        if ($group === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
+        // Check if they are a subadmin of this said group
+        if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
+            throw new OCSException('User is not a subadmin of this group', 102);
+        }
+
+        // Go
+        $subAdminManager->deleteSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUserSubAdminGroups(string $userId): DataResponse {
+        $groups = $this->getUserSubAdminGroupsData($userId);
+        return new DataResponse($groups);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * resend welcome message
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function resendWelcomeMessage(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        // Check if admin / subadmin
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            && !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+            // No rights
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $email = $targetUser->getEMailAddress();
+        if ($email === '' || $email === null) {
+            throw new OCSException('Email address not available', 101);
+        }
+
+        try {
+            $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
+            $this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
+        } catch(\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => "Can't send new user mail to $email",
+                'level' => ILogger::ERROR,
+                'app' => 'settings',
+            ]);
+            throw new OCSException('Sending email failed', 102);
+        }
+
+        return new DataResponse();
+    }
 }

apps/provisioning_api/lib/Controller/AUserData.php

Indentation +167 added lines, -167 removed lines

@@ -48,172 +48,172 @@
 
 abstract class AUserData extends OCSController {
 
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IConfig */
-	protected $config;
-	/** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface
-	protected $groupManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var AccountManager */
-	protected $accountManager;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param AccountManager $accountManager
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $accountManager) {
-		parent::__construct($appName, $request);
-
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->accountManager = $accountManager;
-	}
-
-	/**
-	 * creates a array with all user data
-	 *
-	 * @param string $userId
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws OCSException
-	 * @throws OCSNotFoundException
-	 */
-	protected function getUserData(string $userId): array {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$data = [];
-
-		// Check if the target user exists
-		$targetUserObject = $this->userManager->get($userId);
-		if($targetUserObject === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
-
-		// Should be at least Admin Or SubAdmin!
-		if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
-				$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
-		} else {
-			// Check they are looking up themselves
-			if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
-				return $data;
-			}
-		}
-
-		// Get groups data
-		$userAccount = $this->accountManager->getUser($targetUserObject);
-		$groups = $this->groupManager->getUserGroups($targetUserObject);
-		$gids = [];
-		foreach ($groups as $group) {
-			$gids[] = $group->getGID();
-		}
-
-		try {
-			# might be thrown by LDAP due to handling of users disappears
-			# from the external source (reasons unknown to us)
-			# cf. https://github.com/nextcloud/server/issues/12991
-			$data['storageLocation'] = $targetUserObject->getHome();
-		} catch (NoUserException $e) {
-			throw new OCSNotFoundException($e->getMessage(), $e);
-		}
-
-		// Find the data
-		$data['id'] = $targetUserObject->getUID();
-		$data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
-		$data['backend'] = $targetUserObject->getBackendClassName();
-		$data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
-		$data['quota'] = $this->fillStorageInfo($targetUserObject->getUID());
-		$data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress();
-		$data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
-		$data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value'];
-		$data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value'];
-		$data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value'];
-		$data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value'];
-		$data['groups'] = $gids;
-		$data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang');
-		$data['locale'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
-
-		$backend = $targetUserObject->getBackend();
-		$data['backendCapabilities'] = [
-			'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
-			'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
-		];
-
-		return $data;
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return array
-	 * @throws OCSException
-	 */
-	protected function getUserSubAdminGroupsData(string $userId): array {
-		$user = $this->userManager->get($userId);
-		// Check if the user exists
-		if($user === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
-
-		// Get the subadmin groups
-		$subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
-		$groups = [];
-		foreach ($subAdminGroups as $key => $group) {
-			$groups[] = $group->getGID();
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * @param string $userId
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function fillStorageInfo(string $userId): array {
-		try {
-			\OC_Util::tearDownFS();
-			\OC_Util::setupFS($userId);
-			$storage = OC_Helper::getStorageInfo('/');
-			$data = [
-				'free' => $storage['free'],
-				'used' => $storage['used'],
-				'total' => $storage['total'],
-				'relative' => $storage['relative'],
-				'quota' => $storage['quota'],
-			];
-		} catch (NotFoundException $ex) {
-			// User fs is not setup yet
-			$user = $this->userManager->get($userId);
-			if ($user === null) {
-				throw new OCSException('User does not exist', 101);
-			}
-			$quota = $user->getQuota();
-			if ($quota !== 'none') {
-				$quota = OC_Helper::computerFileSize($quota);
-			}
-			$data = [
-				'quota' => $quota !== false ? $quota : 'none',
-				'used' => 0
-			];
-		}
-		return $data;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IConfig */
+    protected $config;
+    /** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface
+    protected $groupManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var AccountManager */
+    protected $accountManager;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     * @param AccountManager $accountManager
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $accountManager) {
+        parent::__construct($appName, $request);
+
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->accountManager = $accountManager;
+    }
+
+    /**
+     * creates a array with all user data
+     *
+     * @param string $userId
+     * @return array
+     * @throws NotFoundException
+     * @throws OCSException
+     * @throws OCSNotFoundException
+     */
+    protected function getUserData(string $userId): array {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $data = [];
+
+        // Check if the target user exists
+        $targetUserObject = $this->userManager->get($userId);
+        if($targetUserObject === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
+
+        // Should be at least Admin Or SubAdmin!
+        if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
+                $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
+        } else {
+            // Check they are looking up themselves
+            if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
+                return $data;
+            }
+        }
+
+        // Get groups data
+        $userAccount = $this->accountManager->getUser($targetUserObject);
+        $groups = $this->groupManager->getUserGroups($targetUserObject);
+        $gids = [];
+        foreach ($groups as $group) {
+            $gids[] = $group->getGID();
+        }
+
+        try {
+            # might be thrown by LDAP due to handling of users disappears
+            # from the external source (reasons unknown to us)
+            # cf. https://github.com/nextcloud/server/issues/12991
+            $data['storageLocation'] = $targetUserObject->getHome();
+        } catch (NoUserException $e) {
+            throw new OCSNotFoundException($e->getMessage(), $e);
+        }
+
+        // Find the data
+        $data['id'] = $targetUserObject->getUID();
+        $data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
+        $data['backend'] = $targetUserObject->getBackendClassName();
+        $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
+        $data['quota'] = $this->fillStorageInfo($targetUserObject->getUID());
+        $data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress();
+        $data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
+        $data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value'];
+        $data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value'];
+        $data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value'];
+        $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value'];
+        $data['groups'] = $gids;
+        $data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang');
+        $data['locale'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
+
+        $backend = $targetUserObject->getBackend();
+        $data['backendCapabilities'] = [
+            'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
+            'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return array
+     * @throws OCSException
+     */
+    protected function getUserSubAdminGroupsData(string $userId): array {
+        $user = $this->userManager->get($userId);
+        // Check if the user exists
+        if($user === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
+
+        // Get the subadmin groups
+        $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
+        $groups = [];
+        foreach ($subAdminGroups as $key => $group) {
+            $groups[] = $group->getGID();
+        }
+
+        return $groups;
+    }
+
+    /**
+     * @param string $userId
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function fillStorageInfo(string $userId): array {
+        try {
+            \OC_Util::tearDownFS();
+            \OC_Util::setupFS($userId);
+            $storage = OC_Helper::getStorageInfo('/');
+            $data = [
+                'free' => $storage['free'],
+                'used' => $storage['used'],
+                'total' => $storage['total'],
+                'relative' => $storage['relative'],
+                'quota' => $storage['quota'],
+            ];
+        } catch (NotFoundException $ex) {
+            // User fs is not setup yet
+            $user = $this->userManager->get($userId);
+            if ($user === null) {
+                throw new OCSException('User does not exist', 101);
+            }
+            $quota = $user->getQuota();
+            if ($quota !== 'none') {
+                $quota = OC_Helper::computerFileSize($quota);
+            }
+            $data = [
+                'quota' => $quota !== false ? $quota : 'none',
+                'used' => 0
+            ];
+        }
+        return $data;
+    }
 
 }

apps/accessibility/lib/AccessibilityProvider.php

Indentation +51 added lines, -51 removed lines

@@ -34,62 +34,62 @@
 
 class AccessibilityProvider {
 
-	/** @var string */
-	protected $appName;
+    /** @var string */
+    protected $appName;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l
-	 */
-	public function __construct(string $appName,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->appName      = $appName;
-		$this->urlGenerator = $urlGenerator;
-		$this->l            = $l;
-	}
+    /**
+     * Account constructor.
+     *
+     * @param string $appName
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l
+     */
+    public function __construct(string $appName,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l) {
+        $this->appName      = $appName;
+        $this->urlGenerator = $urlGenerator;
+        $this->l            = $l;
+    }
 
-	public function getThemes() {
-		return [
-			[
-				'id'    => 'dark',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
-				'title' => $this->l->t('Dark theme'),
-				'enableLabel' => $this->l->t('Enable dark theme'),
-				'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
-			]
-		];
-	}
+    public function getThemes() {
+        return [
+            [
+                'id'    => 'dark',
+                'img'   => $this->urlGenerator->imagePath($this->appName, 'theme-dark.jpg'),
+                'title' => $this->l->t('Dark theme'),
+                'enableLabel' => $this->l->t('Enable dark theme'),
+                'text'  => $this->l->t('A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find.')
+            ]
+        ];
+    }
 
-	public function getHighContrast() {
-		return [
-			'id'    => 'highcontrast',
-			'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
-			'title' => $this->l->t('High contrast mode'),
-			'enableLabel' => $this->l->t('Enable high contrast mode'),
-			'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
-		];
-	}
+    public function getHighContrast() {
+        return [
+            'id'    => 'highcontrast',
+            'img'   => $this->urlGenerator->imagePath($this->appName, 'mode-highcontrast.jpg'),
+            'title' => $this->l->t('High contrast mode'),
+            'enableLabel' => $this->l->t('Enable high contrast mode'),
+            'text'  => $this->l->t('A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased.')
+        ];
+    }
 
-	public function getFonts() {
-		return [
-			[
-				'id'    => 'fontdyslexic',
-				'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
-				'title' => $this->l->t('Dyslexia font'),
-				'enableLabel' => $this->l->t('Enable dyslexia font'),
-				'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
-			]
-		];
-	}
+    public function getFonts() {
+        return [
+            [
+                'id'    => 'fontdyslexic',
+                'img'   => $this->urlGenerator->imagePath($this->appName, 'font-opendyslexic.jpg'),
+                'title' => $this->l->t('Dyslexia font'),
+                'enableLabel' => $this->l->t('Enable dyslexia font'),
+                'text'  => $this->l->t('OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia.')
+            ]
+        ];
+    }
 
 }

apps/accessibility/appinfo/routes.php

Indentation +21 added lines, -21 removed lines

@@ -24,25 +24,25 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
-		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
-	],
-	'ocs' => [
-		[
-			'name' => 'Config#getConfig',
-			'url'  => '/api/v1/config',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Config#setConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'Config#deleteConfig',
-			'url'  => '/api/v1/config/{key}',
-			'verb' => 'DELETE',
-		],
-	]
+    'routes' => [
+        ['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
+        ['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
+    ],
+    'ocs' => [
+        [
+            'name' => 'Config#getConfig',
+            'url'  => '/api/v1/config',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Config#setConfig',
+            'url'  => '/api/v1/config/{key}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'Config#deleteConfig',
+            'url'  => '/api/v1/config/{key}',
+            'verb' => 'DELETE',
+        ],
+    ]
 ];

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Indentation +39 added lines, -39 removed lines

@@ -29,59 +29,59 @@
 
 class ShareRequest implements XmlDeserializable {
 
-	public $set = [];
+    public $set = [];
 
-	public $remove = [];
+    public $remove = [];
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $set
-	 * @param array $remove
-	 */
-	function __construct(array $set, array $remove) {
+    /**
+     * Constructor
+     *
+     * @param array $set
+     * @param array $remove
+     */
+    function __construct(array $set, array $remove) {
 
-		$this->set = $set;
-		$this->remove = $remove;
+        $this->set = $set;
+        $this->remove = $remove;
 
-	}
+    }
 
-	static function xmlDeserialize(Reader $reader) {
+    static function xmlDeserialize(Reader $reader) {
 
-		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
+        $elements = $reader->parseInnerTree([
+            '{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
 
-		$set = [];
-		$remove = [];
+        $set = [];
+        $remove = [];
 
-		foreach ($elements as $elem) {
-			switch ($elem['name']) {
+        foreach ($elements as $elem) {
+            switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set' :
-					$sharee = $elem['value'];
+                case '{' . Plugin::NS_OWNCLOUD . '}set' :
+                    $sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
+                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
 
-					$set[] = [
-						'href'       => $sharee['{DAV:}href'],
-						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-						'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
-					];
-					break;
+                    $set[] = [
+                        'href'       => $sharee['{DAV:}href'],
+                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
+                        'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
+                        'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                    ];
+                    break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove' :
-					$remove[] = $elem['value']['{DAV:}href'];
-					break;
+                case '{' . Plugin::NS_OWNCLOUD . '}remove' :
+                    $remove[] = $elem['value']['{DAV:}href'];
+                    break;
 
-			}
-		}
+            }
+        }
 
-		return new self($set, $remove);
+        return new self($set, $remove);
 
-	}
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -49,8 +49,8 @@ 
 	static function xmlDeserialize(Reader $reader) {
 
 		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
 		]);
 
 		$set = [];
@@ -59,21 +59,21 @@ 
 		foreach ($elements as $elem) {
 			switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set' :
+				case '{'.Plugin::NS_OWNCLOUD.'}set' :
 					$sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+					$sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+					$commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
 					$set[] = [
 						'href'       => $sharee['{DAV:}href'],
 						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
 						'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly'   => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+						'readOnly'   => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
 					];
 					break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove' :
+				case '{'.Plugin::NS_OWNCLOUD.'}remove' :
 					$remove[] = $elem['value']['{DAV:}href'];
 					break;