nextcloud / server

apps/dav/lib/Upload/AssemblyStream.php

Spacing +4 added lines, -4 removed lines

@@ -73,11 +73,11 @@ 
 		$this->loadContext('assembly');
 
 		$nodes = $this->nodes;
-		usort($nodes, function (IFile $a, IFile $b) {
+		usort($nodes, function(IFile $a, IFile $b) {
 			return strnatcmp($a->getName(), $b->getName());
 		});
 		$this->nodes = array_values($nodes);
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+		$this->size = array_reduce($this->nodes, function($size, IFile $file) {
 			return $size + $file->getSize();
 		}, 0);
 
@@ -156,7 +156,7 @@ 
 				fclose($this->currentStream);
 				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
 				if ($this->currentNodeRead < $currentNodeSize) {
-					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+					throw new \Exception('Stream from assembly node shorter than expected, got '.$this->currentNodeRead.' bytes, expected '.$currentNodeSize);
 				}
 				$this->currentNode++;
 				$this->currentNodeRead = 0;
@@ -253,7 +253,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['nodes']) and is_array($context['nodes'])) {
 			$this->nodes = $context['nodes'];

Indentation +266 added lines, -266 removed lines

@@ -20,270 +20,270 @@
  */
 class AssemblyStream implements \Icewind\Streams\File {
 
-	/** @var resource */
-	private $context;
-
-	/** @var IFile[] */
-	private $nodes;
-
-	/** @var int */
-	private $pos = 0;
-
-	/** @var int */
-	private $size = 0;
-
-	/** @var resource */
-	private $currentStream = null;
-
-	/** @var int */
-	private $currentNode = 0;
-
-	/** @var int */
-	private $currentNodeRead = 0;
-
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @param int $options
-	 * @param string &$opened_path
-	 * @return bool
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$this->loadContext('assembly');
-
-		$nodes = $this->nodes;
-		usort($nodes, function (IFile $a, IFile $b) {
-			return strnatcmp($a->getName(), $b->getName());
-		});
-		$this->nodes = array_values($nodes);
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
-			return $size + $file->getSize();
-		}, 0);
-
-		return true;
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $whence
-	 * @return bool
-	 */
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		if ($whence === SEEK_CUR) {
-			$offset = $this->stream_tell() + $offset;
-		} elseif ($whence === SEEK_END) {
-			$offset = $this->size + $offset;
-		}
-
-		if ($offset === $this->pos) {
-			return true;
-		}
-
-		if ($offset > $this->size) {
-			return false;
-		}
-
-		$nodeIndex = 0;
-		$nodeStart = 0;
-		while (true) {
-			if (!isset($this->nodes[$nodeIndex + 1])) {
-				break;
-			}
-			$node = $this->nodes[$nodeIndex];
-			if ($nodeStart + $node->getSize() > $offset) {
-				break;
-			}
-			$nodeIndex++;
-			$nodeStart += $node->getSize();
-		}
-
-		$stream = $this->getStream($this->nodes[$nodeIndex]);
-		$nodeOffset = $offset - $nodeStart;
-		if ($nodeOffset > 0 && fseek($stream, $nodeOffset) === -1) {
-			return false;
-		}
-		$this->currentNode = $nodeIndex;
-		$this->currentNodeRead = $nodeOffset;
-		$this->currentStream = $stream;
-		$this->pos = $offset;
-
-		return true;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function stream_tell() {
-		return $this->pos;
-	}
-
-	/**
-	 * @param int $count
-	 * @return string
-	 */
-	public function stream_read($count) {
-		if (is_null($this->currentStream)) {
-			if ($this->currentNode < count($this->nodes)) {
-				$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
-			} else {
-				return '';
-			}
-		}
-
-		$collectedData = '';
-		// read data until we either got all the data requested or there is no more stream left
-		while ($count > 0 && !is_null($this->currentStream)) {
-			$data = fread($this->currentStream, $count);
-			$read = strlen($data);
-
-			$count -= $read;
-			$collectedData .= $data;
-			$this->currentNodeRead += $read;
-
-			if (feof($this->currentStream)) {
-				fclose($this->currentStream);
-				$currentNodeSize = $this->nodes[$this->currentNode]->getSize();
-				if ($this->currentNodeRead < $currentNodeSize) {
-					throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
-				}
-				$this->currentNode++;
-				$this->currentNodeRead = 0;
-				if ($this->currentNode < count($this->nodes)) {
-					$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
-				} else {
-					$this->currentStream = null;
-				}
-			}
-		}
-
-		// update position
-		$this->pos += strlen($collectedData);
-		return $collectedData;
-	}
-
-	/**
-	 * @param string $data
-	 * @return int
-	 */
-	public function stream_write($data) {
-		return false;
-	}
-
-	/**
-	 * @param int $option
-	 * @param int $arg1
-	 * @param int $arg2
-	 * @return bool
-	 */
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	/**
-	 * @param int $size
-	 * @return bool
-	 */
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stream_stat() {
-		return [
-			'size' => $this->size,
-		];
-	}
-
-	/**
-	 * @param int $operation
-	 * @return bool
-	 */
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_flush() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_eof() {
-		return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_close() {
-		return true;
-	}
-
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['nodes']) and is_array($context['nodes'])) {
-			$this->nodes = $context['nodes'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, nodes not set');
-		}
-		return $context;
-	}
-
-	/**
-	 * @param IFile[] $nodes
-	 * @return resource
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public static function wrap(array $nodes) {
-		$context = stream_context_create([
-			'assembly' => [
-				'nodes' => $nodes
-			]
-		]);
-		stream_wrapper_register('assembly', self::class);
-		try {
-			$wrapped = fopen('assembly://', 'r', false, $context);
-		} catch (\BadMethodCallException $e) {
-			stream_wrapper_unregister('assembly');
-			throw $e;
-		}
-		stream_wrapper_unregister('assembly');
-		return $wrapped;
-	}
-
-	/**
-	 * @param IFile $node
-	 * @return resource
-	 */
-	private function getStream(IFile $node) {
-		$data = $node->get();
-		if (is_resource($data)) {
-			return $data;
-		} else {
-			$tmp = fopen('php://temp', 'w+');
-			fwrite($tmp, $data);
-			rewind($tmp);
-			return $tmp;
-		}
-	}
+    /** @var resource */
+    private $context;
+
+    /** @var IFile[] */
+    private $nodes;
+
+    /** @var int */
+    private $pos = 0;
+
+    /** @var int */
+    private $size = 0;
+
+    /** @var resource */
+    private $currentStream = null;
+
+    /** @var int */
+    private $currentNode = 0;
+
+    /** @var int */
+    private $currentNodeRead = 0;
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->loadContext('assembly');
+
+        $nodes = $this->nodes;
+        usort($nodes, function (IFile $a, IFile $b) {
+            return strnatcmp($a->getName(), $b->getName());
+        });
+        $this->nodes = array_values($nodes);
+        $this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+            return $size + $file->getSize();
+        }, 0);
+
+        return true;
+    }
+
+    /**
+     * @param int $offset
+     * @param int $whence
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        if ($whence === SEEK_CUR) {
+            $offset = $this->stream_tell() + $offset;
+        } elseif ($whence === SEEK_END) {
+            $offset = $this->size + $offset;
+        }
+
+        if ($offset === $this->pos) {
+            return true;
+        }
+
+        if ($offset > $this->size) {
+            return false;
+        }
+
+        $nodeIndex = 0;
+        $nodeStart = 0;
+        while (true) {
+            if (!isset($this->nodes[$nodeIndex + 1])) {
+                break;
+            }
+            $node = $this->nodes[$nodeIndex];
+            if ($nodeStart + $node->getSize() > $offset) {
+                break;
+            }
+            $nodeIndex++;
+            $nodeStart += $node->getSize();
+        }
+
+        $stream = $this->getStream($this->nodes[$nodeIndex]);
+        $nodeOffset = $offset - $nodeStart;
+        if ($nodeOffset > 0 && fseek($stream, $nodeOffset) === -1) {
+            return false;
+        }
+        $this->currentNode = $nodeIndex;
+        $this->currentNodeRead = $nodeOffset;
+        $this->currentStream = $stream;
+        $this->pos = $offset;
+
+        return true;
+    }
+
+    /**
+     * @return int
+     */
+    public function stream_tell() {
+        return $this->pos;
+    }
+
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count) {
+        if (is_null($this->currentStream)) {
+            if ($this->currentNode < count($this->nodes)) {
+                $this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+            } else {
+                return '';
+            }
+        }
+
+        $collectedData = '';
+        // read data until we either got all the data requested or there is no more stream left
+        while ($count > 0 && !is_null($this->currentStream)) {
+            $data = fread($this->currentStream, $count);
+            $read = strlen($data);
+
+            $count -= $read;
+            $collectedData .= $data;
+            $this->currentNodeRead += $read;
+
+            if (feof($this->currentStream)) {
+                fclose($this->currentStream);
+                $currentNodeSize = $this->nodes[$this->currentNode]->getSize();
+                if ($this->currentNodeRead < $currentNodeSize) {
+                    throw new \Exception('Stream from assembly node shorter than expected, got ' . $this->currentNodeRead . ' bytes, expected ' . $currentNodeSize);
+                }
+                $this->currentNode++;
+                $this->currentNodeRead = 0;
+                if ($this->currentNode < count($this->nodes)) {
+                    $this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+                } else {
+                    $this->currentStream = null;
+                }
+            }
+        }
+
+        // update position
+        $this->pos += strlen($collectedData);
+        return $collectedData;
+    }
+
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data) {
+        return false;
+    }
+
+    /**
+     * @param int $option
+     * @param int $arg1
+     * @param int $arg2
+     * @return bool
+     */
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    /**
+     * @param int $size
+     * @return bool
+     */
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat() {
+        return [
+            'size' => $this->size,
+        ];
+    }
+
+    /**
+     * @param int $operation
+     * @return bool
+     */
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_flush() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof() {
+        return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_close() {
+        return true;
+    }
+
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @return array
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['nodes']) and is_array($context['nodes'])) {
+            $this->nodes = $context['nodes'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, nodes not set');
+        }
+        return $context;
+    }
+
+    /**
+     * @param IFile[] $nodes
+     * @return resource
+     *
+     * @throws \BadMethodCallException
+     */
+    public static function wrap(array $nodes) {
+        $context = stream_context_create([
+            'assembly' => [
+                'nodes' => $nodes
+            ]
+        ]);
+        stream_wrapper_register('assembly', self::class);
+        try {
+            $wrapped = fopen('assembly://', 'r', false, $context);
+        } catch (\BadMethodCallException $e) {
+            stream_wrapper_unregister('assembly');
+            throw $e;
+        }
+        stream_wrapper_unregister('assembly');
+        return $wrapped;
+    }
+
+    /**
+     * @param IFile $node
+     * @return resource
+     */
+    private function getStream(IFile $node) {
+        $data = $node->get();
+        if (is_resource($data)) {
+            return $data;
+        } else {
+            $tmp = fopen('php://temp', 'w+');
+            fwrite($tmp, $data);
+            rewind($tmp);
+            return $tmp;
+        }
+    }
 }

apps/dav/lib/Settings/CalDAVSettings.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
 	public function getAuthorizedAppConfig(): array {
 		return [
-			'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
+			'dav' => ['/('.implode('|', array_keys(self::defaults)).')/']
 		];
 	}
 }

Indentation +48 added lines, -48 removed lines

@@ -15,59 +15,59 @@
 
 class CalDAVSettings implements IDelegatedSettings {
 
-	private const defaults = [
-		'sendInvitations' => 'yes',
-		'generateBirthdayCalendar' => 'yes',
-		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedUsers' => 'yes',
-		'sendEventRemindersPush' => 'yes',
-	];
+    private const defaults = [
+        'sendInvitations' => 'yes',
+        'generateBirthdayCalendar' => 'yes',
+        'sendEventReminders' => 'yes',
+        'sendEventRemindersToSharedUsers' => 'yes',
+        'sendEventRemindersPush' => 'yes',
+    ];
 
-	/**
-	 * CalDAVSettings constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IInitialState $initialState
-	 */
-	public function __construct(
-		private IConfig $config,
-		private IInitialState $initialState,
-		private IURLGenerator $urlGenerator,
-		private IAppManager $appManager,
-	) {
-	}
+    /**
+     * CalDAVSettings constructor.
+     *
+     * @param IConfig $config
+     * @param IInitialState $initialState
+     */
+    public function __construct(
+        private IConfig $config,
+        private IInitialState $initialState,
+        private IURLGenerator $urlGenerator,
+        private IAppManager $appManager,
+    ) {
+    }
 
-	public function getForm(): TemplateResponse {
-		$this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
-		foreach (self::defaults as $key => $default) {
-			$value = $this->config->getAppValue(Application::APP_ID, $key, $default);
-			$this->initialState->provideInitialState($key, $value === 'yes');
-		}
-		return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
-	}
+    public function getForm(): TemplateResponse {
+        $this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
+        foreach (self::defaults as $key => $default) {
+            $value = $this->config->getAppValue(Application::APP_ID, $key, $default);
+            $this->initialState->provideInitialState($key, $value === 'yes');
+        }
+        return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
+    }
 
-	public function getSection(): ?string {
-		if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
+            return null;
+        }
 
-		return 'groupware';
-	}
+        return 'groupware';
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	public function getName(): ?string {
-		return null; // Only setting in this section
-	}
+    public function getName(): ?string {
+        return null; // Only setting in this section
+    }
 
-	public function getAuthorizedAppConfig(): array {
-		return [
-			'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
-		];
-	}
+    public function getAuthorizedAppConfig(): array {
+        return [
+            'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
+        ];
+    }
 }

apps/user_ldap/lib/PagedResults/TLinkId.php

Indentation +14 added lines, -14 removed lines

@@ -27,18 +27,18 @@
 namespace OCA\User_LDAP\PagedResults;
 
 trait TLinkId {
-	public function getLinkId($link) {
-		if (is_object($link)) {
-			return spl_object_id($link);
-		} elseif (is_resource($link)) {
-			return (int)$link;
-		} elseif (is_array($link) && isset($link[0])) {
-			if (is_object($link[0])) {
-				return spl_object_id($link[0]);
-			} elseif (is_resource($link[0])) {
-				return (int)$link[0];
-			}
-		}
-		throw new \RuntimeException('No resource provided');
-	}
+    public function getLinkId($link) {
+        if (is_object($link)) {
+            return spl_object_id($link);
+        } elseif (is_resource($link)) {
+            return (int)$link;
+        } elseif (is_array($link) && isset($link[0])) {
+            if (is_object($link[0])) {
+                return spl_object_id($link[0]);
+            } elseif (is_resource($link[0])) {
+                return (int)$link[0];
+            }
+        }
+        throw new \RuntimeException('No resource provided');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -31,12 +31,12 @@
 		if (is_object($link)) {
 			return spl_object_id($link);
 		} elseif (is_resource($link)) {
-			return (int)$link;
+			return (int) $link;
 		} elseif (is_array($link) && isset($link[0])) {
 			if (is_object($link[0])) {
 				return spl_object_id($link[0]);
 			} elseif (is_resource($link[0])) {
-				return (int)$link[0];
+				return (int) $link[0];
 			}
 		}
 		throw new \RuntimeException('No resource provided');

apps/workflowengine/lib/Controller/AWorkflowController.php

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when updating flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', $e->getCode(), $e);
 		}
 	}
@@ -168,7 +168,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when deleting flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', $e->getCode(), $e);
 		}
 	}

Indentation +126 added lines, -126 removed lines

@@ -22,130 +22,130 @@
 
 abstract class AWorkflowController extends OCSController {
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		protected Manager $manager,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * @throws OCSForbiddenException
-	 */
-	abstract protected function getScopeContext(): ScopeContext;
-
-	/**
-	 * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global?format=json"
-	 *
-	 * @throws OCSForbiddenException
-	 */
-	public function index(): DataResponse {
-		$operationsByClass = $this->manager->getAllOperations($this->getScopeContext());
-
-		foreach ($operationsByClass as &$operations) {
-			foreach ($operations as &$operation) {
-				$operation = $this->manager->formatOperation($operation);
-			}
-		}
-
-		return new DataResponse($operationsByClass);
-	}
-
-	/**
-	 * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global/OCA\\Workflow_DocToPdf\\Operation?format=json"
-	 *
-	 * @throws OCSForbiddenException
-	 */
-	public function show(string $id): DataResponse {
-		$context = $this->getScopeContext();
-
-		// The ID corresponds to a class name
-		$operations = $this->manager->getOperations($id, $context);
-
-		foreach ($operations as &$operation) {
-			$operation = $this->manager->formatOperation($operation);
-		}
-
-		return new DataResponse($operations);
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function create(
-		string $class,
-		string $name,
-		array $checks,
-		string $operation,
-		string $entity,
-		array $events,
-	): DataResponse {
-		$context = $this->getScopeContext();
-		try {
-			$operation = $this->manager->addOperation($class, $name, $checks, $operation, $context, $entity, $events);
-			$operation = $this->manager->formatOperation($operation);
-			return new DataResponse($operation);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when inserting flow', ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function update(
-		int $id,
-		string $name,
-		array $checks,
-		string $operation,
-		string $entity,
-		array $events,
-	): DataResponse {
-		try {
-			$context = $this->getScopeContext();
-			$operation = $this->manager->updateOperation($id, $name, $checks, $operation, $context, $entity, $events);
-			$operation = $this->manager->formatOperation($operation);
-			return new DataResponse($operation);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function destroy(int $id): DataResponse {
-		try {
-			$deleted = $this->manager->deleteOperation($id, $this->getScopeContext());
-			return new DataResponse($deleted);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        protected Manager $manager,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * @throws OCSForbiddenException
+     */
+    abstract protected function getScopeContext(): ScopeContext;
+
+    /**
+     * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global?format=json"
+     *
+     * @throws OCSForbiddenException
+     */
+    public function index(): DataResponse {
+        $operationsByClass = $this->manager->getAllOperations($this->getScopeContext());
+
+        foreach ($operationsByClass as &$operations) {
+            foreach ($operations as &$operation) {
+                $operation = $this->manager->formatOperation($operation);
+            }
+        }
+
+        return new DataResponse($operationsByClass);
+    }
+
+    /**
+     * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global/OCA\\Workflow_DocToPdf\\Operation?format=json"
+     *
+     * @throws OCSForbiddenException
+     */
+    public function show(string $id): DataResponse {
+        $context = $this->getScopeContext();
+
+        // The ID corresponds to a class name
+        $operations = $this->manager->getOperations($id, $context);
+
+        foreach ($operations as &$operation) {
+            $operation = $this->manager->formatOperation($operation);
+        }
+
+        return new DataResponse($operations);
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function create(
+        string $class,
+        string $name,
+        array $checks,
+        string $operation,
+        string $entity,
+        array $events,
+    ): DataResponse {
+        $context = $this->getScopeContext();
+        try {
+            $operation = $this->manager->addOperation($class, $name, $checks, $operation, $context, $entity, $events);
+            $operation = $this->manager->formatOperation($operation);
+            return new DataResponse($operation);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when inserting flow', ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function update(
+        int $id,
+        string $name,
+        array $checks,
+        string $operation,
+        string $entity,
+        array $events,
+    ): DataResponse {
+        try {
+            $context = $this->getScopeContext();
+            $operation = $this->manager->updateOperation($id, $name, $checks, $operation, $context, $entity, $events);
+            $operation = $this->manager->formatOperation($operation);
+            return new DataResponse($operation);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function destroy(int $id): DataResponse {
+        try {
+            $deleted = $this->manager->deleteOperation($id, $this->getScopeContext());
+            return new DataResponse($deleted);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
 }

apps/workflowengine/lib/Migration/Version2000Date20190808074233.php

Indentation +108 added lines, -108 removed lines

@@ -39,117 +39,117 @@
 
 class Version2000Date20190808074233 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('flow_checks')) {
-			$table = $schema->createTable('flow_checks');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('operator', Types::STRING, [
-				'notnull' => true,
-				'length' => 16,
-				'default' => '',
-			]);
-			$table->addColumn('value', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hash'], 'flow_unique_hash');
-		}
+        if (!$schema->hasTable('flow_checks')) {
+            $table = $schema->createTable('flow_checks');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('operator', Types::STRING, [
+                'notnull' => true,
+                'length' => 16,
+                'default' => '',
+            ]);
+            $table->addColumn('value', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hash'], 'flow_unique_hash');
+        }
 
-		if (!$schema->hasTable('flow_operations')) {
-			$table = $schema->createTable('flow_operations');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('name', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('checks', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('operation', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$this->ensureEntityColumns($table);
-			$table->setPrimaryKey(['id']);
-		} else {
-			$table = $schema->getTable('flow_operations');
-			$this->ensureEntityColumns($table);
-		}
+        if (!$schema->hasTable('flow_operations')) {
+            $table = $schema->createTable('flow_operations');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('name', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('checks', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('operation', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $this->ensureEntityColumns($table);
+            $table->setPrimaryKey(['id']);
+        } else {
+            $table = $schema->getTable('flow_operations');
+            $this->ensureEntityColumns($table);
+        }
 
-		if (!$schema->hasTable('flow_operations_scope')) {
-			$table = $schema->createTable('flow_operations_scope');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('operation_id', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('type', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('value', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
-		}
+        if (!$schema->hasTable('flow_operations_scope')) {
+            $table = $schema->createTable('flow_operations_scope');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('operation_id', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('type', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('value', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	protected function ensureEntityColumns(Table $table) {
-		if (!$table->hasColumn('entity')) {
-			$table->addColumn('entity', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => File::class,
-			]);
-		}
-		if (!$table->hasColumn('events')) {
-			$table->addColumn('events', Types::TEXT, [
-				'notnull' => true,
-				'default' => '[]',
-			]);
-		}
-	}
+    protected function ensureEntityColumns(Table $table) {
+        if (!$table->hasColumn('entity')) {
+            $table->addColumn('entity', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => File::class,
+            ]);
+        }
+        if (!$table->hasColumn('events')) {
+            $table->addColumn('events', Types::TEXT, [
+                'notnull' => true,
+                'default' => '[]',
+            ]);
+        }
+    }
 }

apps/workflowengine/lib/Migration/Version2200Date20210805101925.php

Indentation +17 added lines, -17 removed lines

@@ -32,23 +32,23 @@
 
 class Version2200Date20210805101925 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('flow_operations')) {
-			$table = $schema->getTable('flow_operations');
-			$table->changeColumn('name', [
-				'notnull' => false,
-			]);
-		}
+        if ($schema->hasTable('flow_operations')) {
+            $table = $schema->getTable('flow_operations');
+            $table->changeColumn('name', [
+                'notnull' => false,
+            ]);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/files_external/lib/Migration/Version1015Date20211104103506.php

Spacing +5 added lines, -5 removed lines

@@ -59,19 +59,19 @@
 		}
 
 		while ($mount = $mounts->fetch()) {
-			$config = $this->getStorageConfig((int)$mount['mount_id']);
+			$config = $this->getStorageConfig((int) $mount['mount_id']);
 			$hostname = $config['hostname'];
 			$bucket = $config['bucket'];
 			$key = $config['key'];
-			$oldId = Storage::adjustStorageId('amazon::' . $bucket);
-			$newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
+			$oldId = Storage::adjustStorageId('amazon::'.$bucket);
+			$newId = Storage::adjustStorageId('amazon::external::'.md5($hostname.':'.$bucket.':'.$key));
 			try {
 				$qb->setParameter('oldId', $oldId);
 				$qb->setParameter('newId', $newId);
 				$qb->execute();
-				$this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
+				$this->logger->info('Migrated s3 storage id for mount with id '.$mount['mount_id'].' to '.$newId);
 			} catch (Exception $e) {
-				$this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
+				$this->logger->error('Failed to migrate external s3 storage id for mount with id '.$mount['mount_id'], [
 					'exception' => $e
 				]);
 			}

Indentation +62 added lines, -62 removed lines

@@ -20,71 +20,71 @@
 
 class Version1015Date20211104103506 extends SimpleMigrationStep {
 
-	public function __construct(
-		private IDBConnection $connection,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('storages')
-			->set('id', $qb->createParameter('newId'))
-			->where($qb->expr()->eq('id', $qb->createParameter('oldId')));
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('storages')
+            ->set('id', $qb->createParameter('newId'))
+            ->where($qb->expr()->eq('id', $qb->createParameter('oldId')));
 
-		$mounts = $this->getS3Mounts();
-		if (!$mounts instanceof IResult) {
-			throw new \Exception('Could not fetch existing mounts for migration');
-		}
+        $mounts = $this->getS3Mounts();
+        if (!$mounts instanceof IResult) {
+            throw new \Exception('Could not fetch existing mounts for migration');
+        }
 
-		while ($mount = $mounts->fetch()) {
-			$config = $this->getStorageConfig((int)$mount['mount_id']);
-			$hostname = $config['hostname'];
-			$bucket = $config['bucket'];
-			$key = $config['key'];
-			$oldId = Storage::adjustStorageId('amazon::' . $bucket);
-			$newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
-			try {
-				$qb->setParameter('oldId', $oldId);
-				$qb->setParameter('newId', $newId);
-				$qb->execute();
-				$this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
-			} catch (Exception $e) {
-				$this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
-					'exception' => $e
-				]);
-			}
-		}
-		return null;
-	}
+        while ($mount = $mounts->fetch()) {
+            $config = $this->getStorageConfig((int)$mount['mount_id']);
+            $hostname = $config['hostname'];
+            $bucket = $config['bucket'];
+            $key = $config['key'];
+            $oldId = Storage::adjustStorageId('amazon::' . $bucket);
+            $newId = Storage::adjustStorageId('amazon::external::' . md5($hostname . ':' . $bucket . ':' . $key));
+            try {
+                $qb->setParameter('oldId', $oldId);
+                $qb->setParameter('newId', $newId);
+                $qb->execute();
+                $this->logger->info('Migrated s3 storage id for mount with id ' . $mount['mount_id'] . ' to ' . $newId);
+            } catch (Exception $e) {
+                $this->logger->error('Failed to migrate external s3 storage id for mount with id ' . $mount['mount_id'], [
+                    'exception' => $e
+                ]);
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * @throws Exception
-	 * @return IResult|int
-	 */
-	private function getS3Mounts() {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('m.mount_id')
-			->selectAlias('c.value', 'bucket')
-			->from('external_mounts', 'm')
-			->innerJoin('m', 'external_config', 'c', 'c.mount_id = m.mount_id')
-			->where($qb->expr()->eq('m.storage_backend', $qb->createPositionalParameter('amazons3')))
-			->andWhere($qb->expr()->eq('c.key', $qb->createPositionalParameter('bucket')));
-		return $qb->execute();
-	}
+    /**
+     * @throws Exception
+     * @return IResult|int
+     */
+    private function getS3Mounts() {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('m.mount_id')
+            ->selectAlias('c.value', 'bucket')
+            ->from('external_mounts', 'm')
+            ->innerJoin('m', 'external_config', 'c', 'c.mount_id = m.mount_id')
+            ->where($qb->expr()->eq('m.storage_backend', $qb->createPositionalParameter('amazons3')))
+            ->andWhere($qb->expr()->eq('c.key', $qb->createPositionalParameter('bucket')));
+        return $qb->execute();
+    }
 
-	/**
-	 * @throws Exception
-	 */
-	private function getStorageConfig(int $mountId): array {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('key', 'value')
-			->from('external_config')
-			->where($qb->expr()->eq('mount_id', $qb->createPositionalParameter($mountId)));
-		$config = [];
-		foreach ($qb->execute()->fetchAll() as $row) {
-			$config[$row['key']] = $row['value'];
-		}
-		return $config;
-	}
+    /**
+     * @throws Exception
+     */
+    private function getStorageConfig(int $mountId): array {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('key', 'value')
+            ->from('external_config')
+            ->where($qb->expr()->eq('mount_id', $qb->createPositionalParameter($mountId)));
+        $config = [];
+        foreach ($qb->execute()->fetchAll() as $row) {
+            $config[$row['key']] = $row['value'];
+        }
+        return $config;
+    }
 }

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

Indentation +14 added lines, -14 removed lines

@@ -23,20 +23,20 @@
 namespace OCA\DAV\Connector\Sabre;
 
 class MtimeSanitizer {
-	public static function sanitizeMtime(string $mtimeFromRequest): int {
-		// In PHP 5.X "is_numeric" returns true for strings in hexadecimal
-		// notation. This is no longer the case in PHP 7.X, so this check
-		// ensures that strings with hexadecimal notations fail too in PHP 5.X.
-		$isHexadecimal = preg_match('/^\s*0[xX]/', $mtimeFromRequest);
-		if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
-			throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
-		}
+    public static function sanitizeMtime(string $mtimeFromRequest): int {
+        // In PHP 5.X "is_numeric" returns true for strings in hexadecimal
+        // notation. This is no longer the case in PHP 7.X, so this check
+        // ensures that strings with hexadecimal notations fail too in PHP 5.X.
+        $isHexadecimal = preg_match('/^\s*0[xX]/', $mtimeFromRequest);
+        if ($isHexadecimal || !is_numeric($mtimeFromRequest)) {
+            throw new \InvalidArgumentException('X-OC-MTime header must be an integer (unix timestamp).');
+        }
 
-		// Prevent writing invalid mtime (timezone-proof)
-		if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
-			throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
-		}
+        // Prevent writing invalid mtime (timezone-proof)
+        if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
+            throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
+        }
 
-		return (int)$mtimeFromRequest;
-	}
+        return (int)$mtimeFromRequest;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
 		}
 
 		// Prevent writing invalid mtime (timezone-proof)
-		if ((int)$mtimeFromRequest <= 24 * 60 * 60) {
+		if ((int) $mtimeFromRequest <= 24 * 60 * 60) {
 			throw new \InvalidArgumentException('X-OC-MTime header must be a valid positive integer');
 		}
 
-		return (int)$mtimeFromRequest;
+		return (int) $mtimeFromRequest;
 	}
 }

lib/private/Security/TrustedDomainHelper.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		}
 
 		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+			return $this->isTrustedDomain($parsedUrl['host'].':'.$parsedUrl['port']);
 		}
 
 		return $this->isTrustedDomain($parsedUrl['host']);
@@ -106,9 +106,9 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+			$regex = '/^'.implode('[-\.a-zA-Z0-9]*', array_map(function($v) {
 				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
+			}, explode('*', $trusted))).'$/i';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
 				return true;
 			}

Indentation +67 added lines, -67 removed lines

@@ -13,79 +13,79 @@
 use OCP\Security\ITrustedDomainHelper;
 
 class TrustedDomainHelper implements ITrustedDomainHelper {
-	public function __construct(
-		private IConfig $config,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+    ) {
+    }
 
-	/**
-	 * Strips a potential port from a domain (in format domain:port)
-	 * @return string $host without appended port
-	 */
-	private function getDomainWithoutPort(string $host): string {
-		$pos = strrpos($host, ':');
-		if ($pos !== false) {
-			$port = substr($host, $pos + 1);
-			if (is_numeric($port)) {
-				$host = substr($host, 0, $pos);
-			}
-		}
-		return $host;
-	}
+    /**
+     * Strips a potential port from a domain (in format domain:port)
+     * @return string $host without appended port
+     */
+    private function getDomainWithoutPort(string $host): string {
+        $pos = strrpos($host, ':');
+        if ($pos !== false) {
+            $port = substr($host, $pos + 1);
+            if (is_numeric($port)) {
+                $host = substr($host, 0, $pos);
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedUrl(string $url): bool {
-		$parsedUrl = parse_url($url);
-		if (empty($parsedUrl['host'])) {
-			return false;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedUrl(string $url): bool {
+        $parsedUrl = parse_url($url);
+        if (empty($parsedUrl['host'])) {
+            return false;
+        }
 
-		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
-		}
+        if (isset($parsedUrl['port']) && $parsedUrl['port']) {
+            return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+        }
 
-		return $this->isTrustedDomain($parsedUrl['host']);
-	}
+        return $this->isTrustedDomain($parsedUrl['host']);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedDomain(string $domainWithPort): bool {
-		// overwritehost is always trusted
-		if ($this->config->getSystemValue('overwritehost') !== '') {
-			return true;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedDomain(string $domainWithPort): bool {
+        // overwritehost is always trusted
+        if ($this->config->getSystemValue('overwritehost') !== '') {
+            return true;
+        }
 
-		$domain = $this->getDomainWithoutPort($domainWithPort);
+        $domain = $this->getDomainWithoutPort($domainWithPort);
 
-		// Read trusted domains from config
-		$trustedList = $this->config->getSystemValue('trusted_domains', []);
-		if (!is_array($trustedList)) {
-			return false;
-		}
+        // Read trusted domains from config
+        $trustedList = $this->config->getSystemValue('trusted_domains', []);
+        if (!is_array($trustedList)) {
+            return false;
+        }
 
-		// Always allow access from localhost
-		if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
-			return true;
-		}
-		// Reject malformed domains in any case
-		if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
-			return false;
-		}
-		// Match, allowing for * wildcards
-		foreach ($trustedList as $trusted) {
-			if (gettype($trusted) !== 'string') {
-				break;
-			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
-				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
-			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // Always allow access from localhost
+        if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
+            return true;
+        }
+        // Reject malformed domains in any case
+        if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
+            return false;
+        }
+        // Match, allowing for * wildcards
+        foreach ($trustedList as $trusted) {
+            if (gettype($trusted) !== 'string') {
+                break;
+            }
+            $regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+                return preg_quote($v, '/');
+            }, explode('*', $trusted))) . '$/i';
+            if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }