@@ -57,7 +57,7 @@ |
||
| 57 | 57 | public function getEncryptedValue(): string { |
| 58 | 58 | if ($this->encryptedValue === '') { |
| 59 | 59 | $sharedSecret = random_bytes(\strlen($this->value)); |
| 60 | - $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret); |
|
| 60 | + $this->encryptedValue = base64_encode($this->value ^ $sharedSecret).':'.base64_encode($sharedSecret); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $this->encryptedValue; |
@@ -17,40 +17,40 @@ |
||
| 17 | 17 | * @package OC\Security\CSRF |
| 18 | 18 | */ |
| 19 | 19 | class CsrfToken { |
| 20 | - private string $encryptedValue = ''; |
|
| 20 | + private string $encryptedValue = ''; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @param string $value Value of the token. Can be encrypted or not encrypted. |
|
| 24 | - */ |
|
| 25 | - public function __construct( |
|
| 26 | - private string $value, |
|
| 27 | - ) { |
|
| 28 | - } |
|
| 22 | + /** |
|
| 23 | + * @param string $value Value of the token. Can be encrypted or not encrypted. |
|
| 24 | + */ |
|
| 25 | + public function __construct( |
|
| 26 | + private string $value, |
|
| 27 | + ) { |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * Encrypted value of the token. This is used to mitigate BREACH alike |
|
| 32 | - * vulnerabilities. For display measures do use this functionality. |
|
| 33 | - */ |
|
| 34 | - public function getEncryptedValue(): string { |
|
| 35 | - if ($this->encryptedValue === '') { |
|
| 36 | - $sharedSecret = random_bytes(\strlen($this->value)); |
|
| 37 | - $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret); |
|
| 38 | - } |
|
| 30 | + /** |
|
| 31 | + * Encrypted value of the token. This is used to mitigate BREACH alike |
|
| 32 | + * vulnerabilities. For display measures do use this functionality. |
|
| 33 | + */ |
|
| 34 | + public function getEncryptedValue(): string { |
|
| 35 | + if ($this->encryptedValue === '') { |
|
| 36 | + $sharedSecret = random_bytes(\strlen($this->value)); |
|
| 37 | + $this->encryptedValue = base64_encode($this->value ^ $sharedSecret) . ':' . base64_encode($sharedSecret); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - return $this->encryptedValue; |
|
| 41 | - } |
|
| 40 | + return $this->encryptedValue; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * The unencrypted value of the token. Used for decrypting an already |
|
| 45 | - * encrypted token. |
|
| 46 | - */ |
|
| 47 | - public function getDecryptedValue(): string { |
|
| 48 | - $token = explode(':', $this->value); |
|
| 49 | - if (\count($token) !== 2) { |
|
| 50 | - return ''; |
|
| 51 | - } |
|
| 52 | - $obfuscatedToken = $token[0]; |
|
| 53 | - $secret = $token[1]; |
|
| 54 | - return base64_decode($obfuscatedToken) ^ base64_decode($secret); |
|
| 55 | - } |
|
| 43 | + /** |
|
| 44 | + * The unencrypted value of the token. Used for decrypting an already |
|
| 45 | + * encrypted token. |
|
| 46 | + */ |
|
| 47 | + public function getDecryptedValue(): string { |
|
| 48 | + $token = explode(':', $this->value); |
|
| 49 | + if (\count($token) !== 2) { |
|
| 50 | + return ''; |
|
| 51 | + } |
|
| 52 | + $obfuscatedToken = $token[0]; |
|
| 53 | + $secret = $token[1]; |
|
| 54 | + return base64_decode($obfuscatedToken) ^ base64_decode($secret); |
|
| 55 | + } |
|
| 56 | 56 | } |
@@ -27,48 +27,48 @@ |
||
| 27 | 27 | use OCP\Command\ICommand; |
| 28 | 28 | |
| 29 | 29 | class QueueBus implements IBus { |
| 30 | - /** |
|
| 31 | - * @var ICommand[]|callable[] |
|
| 32 | - */ |
|
| 33 | - private $queue = []; |
|
| 30 | + /** |
|
| 31 | + * @var ICommand[]|callable[] |
|
| 32 | + */ |
|
| 33 | + private $queue = []; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Schedule a command to be fired |
|
| 37 | - * |
|
| 38 | - * @param \OCP\Command\ICommand | callable $command |
|
| 39 | - */ |
|
| 40 | - public function push($command) { |
|
| 41 | - $this->queue[] = $command; |
|
| 42 | - } |
|
| 35 | + /** |
|
| 36 | + * Schedule a command to be fired |
|
| 37 | + * |
|
| 38 | + * @param \OCP\Command\ICommand | callable $command |
|
| 39 | + */ |
|
| 40 | + public function push($command) { |
|
| 41 | + $this->queue[] = $command; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Require all commands using a trait to be run synchronous |
|
| 46 | - * |
|
| 47 | - * @param string $trait |
|
| 48 | - */ |
|
| 49 | - public function requireSync($trait) { |
|
| 50 | - } |
|
| 44 | + /** |
|
| 45 | + * Require all commands using a trait to be run synchronous |
|
| 46 | + * |
|
| 47 | + * @param string $trait |
|
| 48 | + */ |
|
| 49 | + public function requireSync($trait) { |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @param \OCP\Command\ICommand | callable $command |
|
| 54 | - */ |
|
| 55 | - private function runCommand($command) { |
|
| 56 | - if ($command instanceof ICommand) { |
|
| 57 | - // ensure the command can be serialized |
|
| 58 | - $serialized = serialize($command); |
|
| 59 | - if (strlen($serialized) > 4000) { |
|
| 60 | - throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
|
| 61 | - } |
|
| 62 | - $unserialized = unserialize($serialized); |
|
| 63 | - $unserialized->handle(); |
|
| 64 | - } else { |
|
| 65 | - $command(); |
|
| 66 | - } |
|
| 67 | - } |
|
| 52 | + /** |
|
| 53 | + * @param \OCP\Command\ICommand | callable $command |
|
| 54 | + */ |
|
| 55 | + private function runCommand($command) { |
|
| 56 | + if ($command instanceof ICommand) { |
|
| 57 | + // ensure the command can be serialized |
|
| 58 | + $serialized = serialize($command); |
|
| 59 | + if (strlen($serialized) > 4000) { |
|
| 60 | + throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)'); |
|
| 61 | + } |
|
| 62 | + $unserialized = unserialize($serialized); |
|
| 63 | + $unserialized->handle(); |
|
| 64 | + } else { |
|
| 65 | + $command(); |
|
| 66 | + } |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - public function run() { |
|
| 70 | - while ($command = array_shift($this->queue)) { |
|
| 71 | - $this->runCommand($command); |
|
| 72 | - } |
|
| 73 | - } |
|
| 69 | + public function run() { |
|
| 70 | + while ($command = array_shift($this->queue)) { |
|
| 71 | + $this->runCommand($command); |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | 74 | } |
@@ -30,50 +30,50 @@ |
||
| 30 | 30 | namespace OCA\User_LDAP; |
| 31 | 31 | |
| 32 | 32 | class WizardResult { |
| 33 | - protected $changes = []; |
|
| 34 | - protected $options = []; |
|
| 35 | - protected $markedChange = false; |
|
| 33 | + protected $changes = []; |
|
| 34 | + protected $options = []; |
|
| 35 | + protected $markedChange = false; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @param string $key |
|
| 39 | - * @param mixed $value |
|
| 40 | - */ |
|
| 41 | - public function addChange($key, $value) { |
|
| 42 | - $this->changes[$key] = $value; |
|
| 43 | - } |
|
| 37 | + /** |
|
| 38 | + * @param string $key |
|
| 39 | + * @param mixed $value |
|
| 40 | + */ |
|
| 41 | + public function addChange($key, $value) { |
|
| 42 | + $this->changes[$key] = $value; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | 45 | |
| 46 | - public function markChange() { |
|
| 47 | - $this->markedChange = true; |
|
| 48 | - } |
|
| 46 | + public function markChange() { |
|
| 47 | + $this->markedChange = true; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param string $key |
|
| 52 | - * @param array|string $values |
|
| 53 | - */ |
|
| 54 | - public function addOptions($key, $values) { |
|
| 55 | - if (!is_array($values)) { |
|
| 56 | - $values = [$values]; |
|
| 57 | - } |
|
| 58 | - $this->options[$key] = $values; |
|
| 59 | - } |
|
| 50 | + /** |
|
| 51 | + * @param string $key |
|
| 52 | + * @param array|string $values |
|
| 53 | + */ |
|
| 54 | + public function addOptions($key, $values) { |
|
| 55 | + if (!is_array($values)) { |
|
| 56 | + $values = [$values]; |
|
| 57 | + } |
|
| 58 | + $this->options[$key] = $values; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * @return bool |
|
| 63 | - */ |
|
| 64 | - public function hasChanges() { |
|
| 65 | - return (count($this->changes) > 0 || $this->markedChange); |
|
| 66 | - } |
|
| 61 | + /** |
|
| 62 | + * @return bool |
|
| 63 | + */ |
|
| 64 | + public function hasChanges() { |
|
| 65 | + return (count($this->changes) > 0 || $this->markedChange); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @return array |
|
| 70 | - */ |
|
| 71 | - public function getResultArray() { |
|
| 72 | - $result = []; |
|
| 73 | - $result['changes'] = $this->changes; |
|
| 74 | - if (count($this->options) > 0) { |
|
| 75 | - $result['options'] = $this->options; |
|
| 76 | - } |
|
| 77 | - return $result; |
|
| 78 | - } |
|
| 68 | + /** |
|
| 69 | + * @return array |
|
| 70 | + */ |
|
| 71 | + public function getResultArray() { |
|
| 72 | + $result = []; |
|
| 73 | + $result['changes'] = $this->changes; |
|
| 74 | + if (count($this->options) > 0) { |
|
| 75 | + $result['options'] = $this->options; |
|
| 76 | + } |
|
| 77 | + return $result; |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | \OC_JSON::checkAppEnabled('user_ldap'); |
| 31 | 31 | \OC_JSON::callCheck(); |
| 32 | 32 | |
| 33 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
| 33 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
| 34 | 34 | |
| 35 | 35 | // Checkboxes are not submitted, when they are unchecked. Set them manually. |
| 36 | 36 | // only legacy checkboxes (Advanced and Expert tab) need to be handled here, |
@@ -18,11 +18,11 @@ |
||
| 18 | 18 | // only legacy checkboxes (Advanced and Expert tab) need to be handled here, |
| 19 | 19 | // the Wizard-like tabs handle it on their own |
| 20 | 20 | $chkboxes = ['ldap_configuration_active', 'ldap_override_main_server', |
| 21 | - 'ldap_turn_off_cert_check']; |
|
| 21 | + 'ldap_turn_off_cert_check']; |
|
| 22 | 22 | foreach ($chkboxes as $boxid) { |
| 23 | - if (!isset($_POST[$boxid])) { |
|
| 24 | - $_POST[$boxid] = 0; |
|
| 25 | - } |
|
| 23 | + if (!isset($_POST[$boxid])) { |
|
| 24 | + $_POST[$boxid] = 0; |
|
| 25 | + } |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $ldapWrapper = new LDAP(); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $readOnly = false; |
| 80 | - $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; |
|
| 80 | + $readOnlyIndex = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only'; |
|
| 81 | 81 | if (isset($calendar[$readOnlyIndex])) { |
| 82 | 82 | $readOnly = $calendar[$readOnlyIndex]; |
| 83 | 83 | } |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | $calendarTableData[] = [ |
| 86 | 86 | $calendar['uri'], |
| 87 | 87 | $calendar['{DAV:}displayname'], |
| 88 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'], |
|
| 89 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'], |
|
| 88 | + $calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal'], |
|
| 89 | + $calendar['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname'], |
|
| 90 | 90 | $readOnly ? ' x ' : ' ✓ ', |
| 91 | 91 | ]; |
| 92 | 92 | } |
@@ -15,61 +15,61 @@ |
||
| 15 | 15 | use Symfony\Component\Console\Output\OutputInterface; |
| 16 | 16 | |
| 17 | 17 | class ListCalendars extends Command { |
| 18 | - public function __construct( |
|
| 19 | - protected IUserManager $userManager, |
|
| 20 | - private CalDavBackend $caldav, |
|
| 21 | - ) { |
|
| 22 | - parent::__construct(); |
|
| 23 | - } |
|
| 18 | + public function __construct( |
|
| 19 | + protected IUserManager $userManager, |
|
| 20 | + private CalDavBackend $caldav, |
|
| 21 | + ) { |
|
| 22 | + parent::__construct(); |
|
| 23 | + } |
|
| 24 | 24 | |
| 25 | - protected function configure(): void { |
|
| 26 | - $this |
|
| 27 | - ->setName('dav:list-calendars') |
|
| 28 | - ->setDescription('List all calendars of a user') |
|
| 29 | - ->addArgument('uid', |
|
| 30 | - InputArgument::REQUIRED, |
|
| 31 | - 'User for whom all calendars will be listed'); |
|
| 32 | - } |
|
| 25 | + protected function configure(): void { |
|
| 26 | + $this |
|
| 27 | + ->setName('dav:list-calendars') |
|
| 28 | + ->setDescription('List all calendars of a user') |
|
| 29 | + ->addArgument('uid', |
|
| 30 | + InputArgument::REQUIRED, |
|
| 31 | + 'User for whom all calendars will be listed'); |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 35 | - $user = $input->getArgument('uid'); |
|
| 36 | - if (!$this->userManager->userExists($user)) { |
|
| 37 | - throw new \InvalidArgumentException("User <$user> is unknown."); |
|
| 38 | - } |
|
| 34 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 35 | + $user = $input->getArgument('uid'); |
|
| 36 | + if (!$this->userManager->userExists($user)) { |
|
| 37 | + throw new \InvalidArgumentException("User <$user> is unknown."); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - $calendars = $this->caldav->getCalendarsForUser("principals/users/$user"); |
|
| 40 | + $calendars = $this->caldav->getCalendarsForUser("principals/users/$user"); |
|
| 41 | 41 | |
| 42 | - $calendarTableData = []; |
|
| 43 | - foreach ($calendars as $calendar) { |
|
| 44 | - // skip birthday calendar |
|
| 45 | - if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) { |
|
| 46 | - continue; |
|
| 47 | - } |
|
| 42 | + $calendarTableData = []; |
|
| 43 | + foreach ($calendars as $calendar) { |
|
| 44 | + // skip birthday calendar |
|
| 45 | + if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) { |
|
| 46 | + continue; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - $readOnly = false; |
|
| 50 | - $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; |
|
| 51 | - if (isset($calendar[$readOnlyIndex])) { |
|
| 52 | - $readOnly = $calendar[$readOnlyIndex]; |
|
| 53 | - } |
|
| 49 | + $readOnly = false; |
|
| 50 | + $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'; |
|
| 51 | + if (isset($calendar[$readOnlyIndex])) { |
|
| 52 | + $readOnly = $calendar[$readOnlyIndex]; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - $calendarTableData[] = [ |
|
| 56 | - $calendar['uri'], |
|
| 57 | - $calendar['{DAV:}displayname'], |
|
| 58 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'], |
|
| 59 | - $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'], |
|
| 60 | - $readOnly ? ' x ' : ' ✓ ', |
|
| 61 | - ]; |
|
| 62 | - } |
|
| 55 | + $calendarTableData[] = [ |
|
| 56 | + $calendar['uri'], |
|
| 57 | + $calendar['{DAV:}displayname'], |
|
| 58 | + $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'], |
|
| 59 | + $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'], |
|
| 60 | + $readOnly ? ' x ' : ' ✓ ', |
|
| 61 | + ]; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - if (count($calendarTableData) > 0) { |
|
| 65 | - $table = new Table($output); |
|
| 66 | - $table->setHeaders(['URI', 'Displayname', 'Owner principal', 'Owner displayname', 'Writable']) |
|
| 67 | - ->setRows($calendarTableData); |
|
| 64 | + if (count($calendarTableData) > 0) { |
|
| 65 | + $table = new Table($output); |
|
| 66 | + $table->setHeaders(['URI', 'Displayname', 'Owner principal', 'Owner displayname', 'Writable']) |
|
| 67 | + ->setRows($calendarTableData); |
|
| 68 | 68 | |
| 69 | - $table->render(); |
|
| 70 | - } else { |
|
| 71 | - $output->writeln("<info>User <$user> has no calendars</info>"); |
|
| 72 | - } |
|
| 73 | - return self::SUCCESS; |
|
| 74 | - } |
|
| 69 | + $table->render(); |
|
| 70 | + } else { |
|
| 71 | + $output->writeln("<info>User <$user> has no calendars</info>"); |
|
| 72 | + } |
|
| 73 | + return self::SUCCESS; |
|
| 74 | + } |
|
| 75 | 75 | } |
@@ -30,67 +30,67 @@ |
||
| 30 | 30 | use OCP\WorkflowEngine\IOperation; |
| 31 | 31 | |
| 32 | 32 | class LogContext { |
| 33 | - /** @var array */ |
|
| 34 | - protected $details; |
|
| 33 | + /** @var array */ |
|
| 34 | + protected $details; |
|
| 35 | 35 | |
| 36 | - public function setDescription(string $description): LogContext { |
|
| 37 | - $this->details['message'] = $description; |
|
| 38 | - return $this; |
|
| 39 | - } |
|
| 36 | + public function setDescription(string $description): LogContext { |
|
| 37 | + $this->details['message'] = $description; |
|
| 38 | + return $this; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - public function setScopes(array $scopes): LogContext { |
|
| 42 | - $this->details['scopes'] = []; |
|
| 43 | - foreach ($scopes as $scope) { |
|
| 44 | - if ($scope instanceof ScopeContext) { |
|
| 45 | - switch ($scope->getScope()) { |
|
| 46 | - case IManager::SCOPE_ADMIN: |
|
| 47 | - $this->details['scopes'][] = ['scope' => 'admin']; |
|
| 48 | - break; |
|
| 49 | - case IManager::SCOPE_USER: |
|
| 50 | - $this->details['scopes'][] = [ |
|
| 51 | - 'scope' => 'user', |
|
| 52 | - 'uid' => $scope->getScopeId(), |
|
| 53 | - ]; |
|
| 54 | - break; |
|
| 55 | - default: |
|
| 56 | - continue 2; |
|
| 57 | - } |
|
| 58 | - } |
|
| 59 | - } |
|
| 60 | - return $this; |
|
| 61 | - } |
|
| 41 | + public function setScopes(array $scopes): LogContext { |
|
| 42 | + $this->details['scopes'] = []; |
|
| 43 | + foreach ($scopes as $scope) { |
|
| 44 | + if ($scope instanceof ScopeContext) { |
|
| 45 | + switch ($scope->getScope()) { |
|
| 46 | + case IManager::SCOPE_ADMIN: |
|
| 47 | + $this->details['scopes'][] = ['scope' => 'admin']; |
|
| 48 | + break; |
|
| 49 | + case IManager::SCOPE_USER: |
|
| 50 | + $this->details['scopes'][] = [ |
|
| 51 | + 'scope' => 'user', |
|
| 52 | + 'uid' => $scope->getScopeId(), |
|
| 53 | + ]; |
|
| 54 | + break; |
|
| 55 | + default: |
|
| 56 | + continue 2; |
|
| 57 | + } |
|
| 58 | + } |
|
| 59 | + } |
|
| 60 | + return $this; |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - public function setOperation(?IOperation $operation): LogContext { |
|
| 64 | - if ($operation instanceof IOperation) { |
|
| 65 | - $this->details['operation'] = [ |
|
| 66 | - 'class' => get_class($operation), |
|
| 67 | - 'name' => $operation->getDisplayName(), |
|
| 68 | - ]; |
|
| 69 | - } |
|
| 70 | - return $this; |
|
| 71 | - } |
|
| 63 | + public function setOperation(?IOperation $operation): LogContext { |
|
| 64 | + if ($operation instanceof IOperation) { |
|
| 65 | + $this->details['operation'] = [ |
|
| 66 | + 'class' => get_class($operation), |
|
| 67 | + 'name' => $operation->getDisplayName(), |
|
| 68 | + ]; |
|
| 69 | + } |
|
| 70 | + return $this; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - public function setEntity(?IEntity $entity): LogContext { |
|
| 74 | - if ($entity instanceof IEntity) { |
|
| 75 | - $this->details['entity'] = [ |
|
| 76 | - 'class' => get_class($entity), |
|
| 77 | - 'name' => $entity->getName(), |
|
| 78 | - ]; |
|
| 79 | - } |
|
| 80 | - return $this; |
|
| 81 | - } |
|
| 73 | + public function setEntity(?IEntity $entity): LogContext { |
|
| 74 | + if ($entity instanceof IEntity) { |
|
| 75 | + $this->details['entity'] = [ |
|
| 76 | + 'class' => get_class($entity), |
|
| 77 | + 'name' => $entity->getName(), |
|
| 78 | + ]; |
|
| 79 | + } |
|
| 80 | + return $this; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - public function setConfiguration(array $configuration): LogContext { |
|
| 84 | - $this->details['configuration'] = $configuration; |
|
| 85 | - return $this; |
|
| 86 | - } |
|
| 83 | + public function setConfiguration(array $configuration): LogContext { |
|
| 84 | + $this->details['configuration'] = $configuration; |
|
| 85 | + return $this; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - public function setEventName(string $eventName): LogContext { |
|
| 89 | - $this->details['eventName'] = $eventName; |
|
| 90 | - return $this; |
|
| 91 | - } |
|
| 88 | + public function setEventName(string $eventName): LogContext { |
|
| 89 | + $this->details['eventName'] = $eventName; |
|
| 90 | + return $this; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - public function getDetails(): array { |
|
| 94 | - return $this->details; |
|
| 95 | - } |
|
| 93 | + public function getDetails(): array { |
|
| 94 | + return $this->details; |
|
| 95 | + } |
|
| 96 | 96 | } |
@@ -30,13 +30,13 @@ |
||
| 30 | 30 | |
| 31 | 31 | class GlobalWorkflowsController extends AWorkflowController { |
| 32 | 32 | |
| 33 | - /** @var ScopeContext */ |
|
| 34 | - private $scopeContext; |
|
| 33 | + /** @var ScopeContext */ |
|
| 34 | + private $scopeContext; |
|
| 35 | 35 | |
| 36 | - protected function getScopeContext(): ScopeContext { |
|
| 37 | - if ($this->scopeContext === null) { |
|
| 38 | - $this->scopeContext = new ScopeContext(IManager::SCOPE_ADMIN); |
|
| 39 | - } |
|
| 40 | - return $this->scopeContext; |
|
| 41 | - } |
|
| 36 | + protected function getScopeContext(): ScopeContext { |
|
| 37 | + if ($this->scopeContext === null) { |
|
| 38 | + $this->scopeContext = new ScopeContext(IManager::SCOPE_ADMIN); |
|
| 39 | + } |
|
| 40 | + return $this->scopeContext; |
|
| 41 | + } |
|
| 42 | 42 | } |
@@ -32,23 +32,23 @@ |
||
| 32 | 32 | * OAuth1 authentication |
| 33 | 33 | */ |
| 34 | 34 | class OAuth1 extends AuthMechanism { |
| 35 | - public function __construct(IL10N $l) { |
|
| 36 | - $this |
|
| 37 | - ->setIdentifier('oauth1::oauth1') |
|
| 38 | - ->setScheme(self::SCHEME_OAUTH1) |
|
| 39 | - ->setText($l->t('OAuth1')) |
|
| 40 | - ->addParameters([ |
|
| 41 | - (new DefinitionParameter('configured', 'configured')) |
|
| 42 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 43 | - new DefinitionParameter('app_key', $l->t('App key')), |
|
| 44 | - (new DefinitionParameter('app_secret', $l->t('App secret'))) |
|
| 45 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
| 46 | - (new DefinitionParameter('token', 'token')) |
|
| 47 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 48 | - (new DefinitionParameter('token_secret', 'token_secret')) |
|
| 49 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 50 | - ]) |
|
| 51 | - ->addCustomJs('oauth1') |
|
| 52 | - ; |
|
| 53 | - } |
|
| 35 | + public function __construct(IL10N $l) { |
|
| 36 | + $this |
|
| 37 | + ->setIdentifier('oauth1::oauth1') |
|
| 38 | + ->setScheme(self::SCHEME_OAUTH1) |
|
| 39 | + ->setText($l->t('OAuth1')) |
|
| 40 | + ->addParameters([ |
|
| 41 | + (new DefinitionParameter('configured', 'configured')) |
|
| 42 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 43 | + new DefinitionParameter('app_key', $l->t('App key')), |
|
| 44 | + (new DefinitionParameter('app_secret', $l->t('App secret'))) |
|
| 45 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
| 46 | + (new DefinitionParameter('token', 'token')) |
|
| 47 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 48 | + (new DefinitionParameter('token_secret', 'token_secret')) |
|
| 49 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 50 | + ]) |
|
| 51 | + ->addCustomJs('oauth1') |
|
| 52 | + ; |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -32,21 +32,21 @@ |
||
| 32 | 32 | * OAuth2 authentication |
| 33 | 33 | */ |
| 34 | 34 | class OAuth2 extends AuthMechanism { |
| 35 | - public function __construct(IL10N $l) { |
|
| 36 | - $this |
|
| 37 | - ->setIdentifier('oauth2::oauth2') |
|
| 38 | - ->setScheme(self::SCHEME_OAUTH2) |
|
| 39 | - ->setText($l->t('OAuth2')) |
|
| 40 | - ->addParameters([ |
|
| 41 | - (new DefinitionParameter('configured', 'configured')) |
|
| 42 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 43 | - new DefinitionParameter('client_id', $l->t('Client ID')), |
|
| 44 | - (new DefinitionParameter('client_secret', $l->t('Client secret'))) |
|
| 45 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
| 46 | - (new DefinitionParameter('token', 'token')) |
|
| 47 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 48 | - ]) |
|
| 49 | - ->addCustomJs('oauth2') |
|
| 50 | - ; |
|
| 51 | - } |
|
| 35 | + public function __construct(IL10N $l) { |
|
| 36 | + $this |
|
| 37 | + ->setIdentifier('oauth2::oauth2') |
|
| 38 | + ->setScheme(self::SCHEME_OAUTH2) |
|
| 39 | + ->setText($l->t('OAuth2')) |
|
| 40 | + ->addParameters([ |
|
| 41 | + (new DefinitionParameter('configured', 'configured')) |
|
| 42 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 43 | + new DefinitionParameter('client_id', $l->t('Client ID')), |
|
| 44 | + (new DefinitionParameter('client_secret', $l->t('Client secret'))) |
|
| 45 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
| 46 | + (new DefinitionParameter('token', 'token')) |
|
| 47 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
| 48 | + ]) |
|
| 49 | + ->addCustomJs('oauth2') |
|
| 50 | + ; |
|
| 51 | + } |
|
| 52 | 52 | } |