nextcloud / server

apps/files/lib/Migration/Version11301Date20191205150729.php

Indentation +40 added lines, -40 removed lines

@@ -31,47 +31,47 @@
 
 class Version11301Date20191205150729 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();
 
-		$table = $schema->createTable('user_transfer_owner');
-		$table->addColumn('id', 'bigint', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('source_user', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('target_user', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('file_id', 'bigint', [
-			'notnull' => true,
-			'length' => 20,
-		]);
-		$table->addColumn('node_name', 'string', [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->setPrimaryKey(['id']);
+        $table = $schema->createTable('user_transfer_owner');
+        $table->addColumn('id', 'bigint', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('source_user', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('target_user', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('file_id', 'bigint', [
+            'notnull' => true,
+            'length' => 20,
+        ]);
+        $table->addColumn('node_name', 'string', [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->setPrimaryKey(['id']);
 
-		// Quite radical, we just assume no one updates cross beta with a pending request.
-		// Do not try this at home
-		if ($schema->hasTable('user_transfer_ownership')) {
-			$schema->dropTable('user_transfer_ownership');
-		}
+        // Quite radical, we just assume no one updates cross beta with a pending request.
+        // Do not try this at home
+        if ($schema->hasTable('user_transfer_ownership')) {
+            $schema->dropTable('user_transfer_ownership');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Hooks/BasicEmitter.php

Indentation +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
  * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
  */
 abstract class BasicEmitter implements Emitter {
-	use EmitterTrait;
+    use EmitterTrait;
 }

lib/public/WorkflowEngine/IFileCheck.php

Indentation +7 added lines, -7 removed lines

@@ -36,12 +36,12 @@
  * @since 18.0.0
  */
 interface IFileCheck extends IEntityCheck {
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 * @since 18.0.0
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     * @since 18.0.0
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
 
 }

apps/workflowengine/lib/Check/TFileCheck.php

Indentation +32 added lines, -32 removed lines

@@ -31,40 +31,40 @@
 use OCP\WorkflowEngine\IEntity;
 
 trait TFileCheck {
-	/** @var IStorage */
-	protected $storage;
+    /** @var IStorage */
+    protected $storage;
 
-	/** @var string */
-	protected $path;
+    /** @var string */
+    protected $path;
 
-	/** @var bool */
-	protected $isDir;
+    /** @var bool */
+    protected $isDir;
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 * @since 18.0.0
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
-		$this->storage = $storage;
-		$this->path = $path;
-		$this->isDir = $isDir;
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     * @since 18.0.0
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
+        $this->storage = $storage;
+        $this->path = $path;
+        $this->isDir = $isDir;
+    }
 
-	/**
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function setEntitySubject(IEntity $entity, $subject): void {
-		if ($entity instanceof File) {
-			if (!$subject instanceof Node) {
-				throw new \UnexpectedValueException(
-					'Expected Node subject for File entity, got {class}',
-					['app' => Application::APP_ID, 'class' => get_class($subject)]
-				);
-			}
-			$this->storage = $subject->getStorage();
-			$this->path = $subject->getPath();
-		}
-	}
+    /**
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function setEntitySubject(IEntity $entity, $subject): void {
+        if ($entity instanceof File) {
+            if (!$subject instanceof Node) {
+                throw new \UnexpectedValueException(
+                    'Expected Node subject for File entity, got {class}',
+                    ['app' => Application::APP_ID, 'class' => get_class($subject)]
+                );
+            }
+            $this->storage = $subject->getStorage();
+            $this->path = $subject->getPath();
+        }
+    }
 }

apps/comments/lib/Search/Result.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$suffix = '…';
 		}
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+		return $prefix.mb_substr($message, $start, $end - $start).$suffix;
 	}
 
 }

Indentation +87 added lines, -87 removed lines

@@ -32,101 +32,101 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
 
-	/**
-	 * @param string $search
-	 * @param IComment $comment
-	 * @param string $authorName
-	 * @param string $path
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(string $search,
-								IComment $comment,
-								string $authorName,
-								string $path) {
-		parent::__construct(
-			(int) $comment->getId(),
-			$comment->getMessage()
-		/* @todo , [link to file] */
-		);
+    /**
+     * @param string $search
+     * @param IComment $comment
+     * @param string $authorName
+     * @param string $path
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(string $search,
+                                IComment $comment,
+                                string $authorName,
+                                string $path) {
+        parent::__construct(
+            (int) $comment->getId(),
+            $comment->getMessage()
+        /* @todo , [link to file] */
+        );
 
-		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
-		$this->authorId = $comment->getActorId();
-		$this->authorName = $authorName;
-		$this->fileName = basename($path);
-		$this->path = $this->getVisiblePath($path);
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->authorName = $authorName;
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @param string $path
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getVisiblePath(string $path): string {
+        $segments = explode('/', trim($path, '/'), 3);
 
-		if (!isset($segments[2])) {
-			throw new NotFoundException('Path not inside visible section');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        return $segments[2];
+    }
 
-	/**
-	 * @param string $message
-	 * @param string $search
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getRelevantMessagePart(string $message, string $search): string {
-		$start = mb_stripos($message, $search);
-		if ($start === false) {
-			throw new NotFoundException('Comment section not found');
-		}
+    /**
+     * @param string $message
+     * @param string $search
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getRelevantMessagePart(string $message, string $search): string {
+        $start = mb_stripos($message, $search);
+        if ($start === false) {
+            throw new NotFoundException('Comment section not found');
+        }
 
-		$end = $start + mb_strlen($search);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        if ($start <= 25) {
+            $start = 0;
+            $prefix = '';
+        } else {
+            $start -= 25;
+            $prefix = '…';
+        }
 
-		if ((mb_strlen($message) - $end) <= 25) {
-			$end = mb_strlen($message);
-			$suffix = '';
-		} else {
-			$end += 25;
-			$suffix = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/files_sharing/lib/Controller/AcceptController.php

Indentation +34 added lines, -34 removed lines

@@ -37,47 +37,47 @@
 
 class AcceptController extends Controller {
 
-	/** @var ShareManager */
-	private $shareManager;
+    /** @var ShareManager */
+    private $shareManager;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IRequest $request, ShareManager $shareManager, IUserSession $userSession, IURLGenerator $urlGenerator) {
-		parent::__construct(Application::APP_ID, $request);
+    public function __construct(IRequest $request, ShareManager $shareManager, IUserSession $userSession, IURLGenerator $urlGenerator) {
+        parent::__construct(Application::APP_ID, $request);
 
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-	}
+        $this->shareManager = $shareManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function accept(string $shareId): Response {
-		try {
-			$share = $this->shareManager->getShareById($shareId);
-		} catch (ShareNotFound $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function accept(string $shareId): Response {
+        try {
+            $share = $this->shareManager->getShareById($shareId);
+        } catch (ShareNotFound $e) {
+            return new NotFoundResponse();
+        }
 
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return new NotFoundResponse();
-		}
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return new NotFoundResponse();
+        }
 
-		try {
-			$share = $this->shareManager->acceptShare($share, $user->getUID());
-		} catch (\Exception $e) {
-			// Just ignore
-		}
+        try {
+            $share = $this->shareManager->acceptShare($share, $user->getUID());
+        } catch (\Exception $e) {
+            // Just ignore
+        }
 
-		$url = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+        $url = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
 
-		return new RedirectResponse($url);
-	}
+        return new RedirectResponse($url);
+    }
 }

lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php

Spacing +10 added lines, -10 removed lines

@@ -66,16 +66,16 @@
 	 * @since 14.0.0
 	 */
 	public function render(): string {
-		return '<li>' .
-			'    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
-			'</li>' .
-			'<li id="external-share-menu-item" class="hidden">' .
-			'    <span class="menuitem">' .
-			'        <form class="save-form" action="#">' .
-			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
-			'        </form>' .
-			'    </span>' .
+		return '<li>'.
+			'    <button id="save-external-share" class="icon '.Util::sanitizeHTML($this->getIcon()).'" data-protected="false" data-owner-display-name="'.Util::sanitizeHTML($this->displayname).'" data-owner="'.Util::sanitizeHTML($this->owner).'" data-name="'.Util::sanitizeHTML($this->shareName).'">'.Util::sanitizeHTML($this->getLabel()).'</button>'.
+			'</li>'.
+			'<li id="external-share-menu-item" class="hidden">'.
+			'    <span class="menuitem">'.
+			'        <form class="save-form" action="#">'.
+			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">'.
+			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>'.
+			'        </form>'.
+			'    </span>'.
 			'</li>';
 	}
 }

Indentation +38 added lines, -38 removed lines

@@ -33,46 +33,46 @@
  * @since 14.0.0
  */
 class ExternalShareMenuAction extends SimpleMenuAction {
-	/** @var string */
-	private $owner;
+    /** @var string */
+    private $owner;
 
-	/** @var string */
-	private $displayname;
+    /** @var string */
+    private $displayname;
 
-	/** @var string */
-	private $shareName;
+    /** @var string */
+    private $shareName;
 
-	/**
-	 * ExternalShareMenuAction constructor.
-	 *
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $owner
-	 * @param string $displayname
-	 * @param string $shareName
-	 * @since 14.0.0
-	 */
-	public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
-		parent::__construct('save', $label, $icon);
-		$this->owner = $owner;
-		$this->displayname = $displayname;
-		$this->shareName = $shareName;
-	}
+    /**
+     * ExternalShareMenuAction constructor.
+     *
+     * @param string $label
+     * @param string $icon
+     * @param string $owner
+     * @param string $displayname
+     * @param string $shareName
+     * @since 14.0.0
+     */
+    public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
+        parent::__construct('save', $label, $icon);
+        $this->owner = $owner;
+        $this->displayname = $displayname;
+        $this->shareName = $shareName;
+    }
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function render(): string {
-		return '<li>' .
-			'    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
-			'</li>' .
-			'<li id="external-share-menu-item" class="hidden">' .
-			'    <span class="menuitem">' .
-			'        <form class="save-form" action="#">' .
-			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
-			'        </form>' .
-			'    </span>' .
-			'</li>';
-	}
+    /**
+     * @since 14.0.0
+     */
+    public function render(): string {
+        return '<li>' .
+            '    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
+            '</li>' .
+            '<li id="external-share-menu-item" class="hidden">' .
+            '    <span class="menuitem">' .
+            '        <form class="save-form" action="#">' .
+            '            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
+            '            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
+            '        </form>' .
+            '    </span>' .
+            '</li>';
+    }
 }

apps/workflowengine/lib/Check/FileMimeType.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	}
 
 	public function supportedEntities(): array {
-		return [ File::class ];
+		return [File::class];
 	}
 
 	public function isAvailableForScope(int $scope): bool {

Indentation +147 added lines, -147 removed lines

@@ -35,151 +35,151 @@
 use OCP\WorkflowEngine\IFileCheck;
 
 class FileMimeType extends AbstractStringCheck implements IFileCheck {
-	use TFileCheck {
-		setFileInfo as _setFileInfo;
-	}
-
-	/** @var array */
-	protected $mimeType;
-
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IMimeTypeDetector */
-	protected $mimeTypeDetector;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 */
-	public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
-		parent::__construct($l);
-		$this->request = $request;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
-		$this->_setFileInfo($storage, $path, $isDir);
-		if (!isset($this->mimeType[$this->storage->getId()][$this->path])
-			|| $this->mimeType[$this->storage->getId()][$this->path] === '') {
-			if ($isDir) {
-				$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
-			} else {
-				$this->mimeType[$this->storage->getId()][$this->path] = null;
-			}
-		}
-	}
-
-	/**
-	 * The mimetype is only cached if the file has a valid mimetype. Otherwise files access
-	 * control will cache "application/octet-stream" for all the target node on:
-	 * rename, move, copy and all other methods which create a new item
-	 *
-	 * To check this:
-	 * 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
-	 * 2. Add an access control rule which checks for any mimetype
-	 * 3. Create a folder and rename it, the folder should not be tagged, but it is
-	 *
-	 * @param string $storageId
-	 * @param string|null $path
-	 * @param string $mimeType
-	 * @return string
-	 */
-	protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
-		if ($path !== null && $mimeType !== 'application/octet-stream') {
-			$this->mimeType[$storageId][$path] = $mimeType;
-		}
-
-		return $mimeType;
-	}
-
-	/**
-	 * Make sure that even though the content based check returns an application/octet-stream can still be checked based on mimetypemappings of their extension
-	 *
-	 * @param string $operator
-	 * @param string $value
-	 * @return bool
-	 */
-	public function executeCheck($operator, $value) {
-		$actualValue = $this->getActualValue();
-		$plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
-		if ($actualValue === 'httpd/unix-directory') {
-			return $plainMimetypeResult;
-		}
-		$detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
-		return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
-			return $this->mimeType[$this->storage->getId()][$this->path];
-		}
-		$cacheEntry = $this->storage->getCache()->get($this->path);
-		if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
-			return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
-		}
-
-		if ($this->storage->file_exists($this->path) &&
-			$this->storage->filesize($this->path) &&
-			$this->storage->instanceOfStorage(Local::class)
-		) {
-			$path = $this->storage->getLocalFile($this->path);
-			$mimeType = $this->mimeTypeDetector->detectContent($path);
-			return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
-		}
-
-		if ($this->isWebDAVRequest() || $this->isPublicWebDAVRequest()) {
-			// Creating a folder
-			if ($this->request->getMethod() === 'MKCOL') {
-				return 'httpd/unix-directory';
-			}
-		}
-
-		// We do not cache this, as the file did not exist yet.
-		// In case it does in the future, we will check with detectContent()
-		// again to get the real mimetype of the content, rather than
-		// guessing it from the path.
-		return $this->mimeTypeDetector->detectPath($this->path);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
-			$this->request->getPathInfo() === '/dav/uploads' ||
-			strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isPublicWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0
-		);
-	}
-
-	public function supportedEntities(): array {
-		return [ File::class ];
-	}
-
-	public function isAvailableForScope(int $scope): bool {
-		return true;
-	}
+    use TFileCheck {
+        setFileInfo as _setFileInfo;
+    }
+
+    /** @var array */
+    protected $mimeType;
+
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IMimeTypeDetector */
+    protected $mimeTypeDetector;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     * @param IMimeTypeDetector $mimeTypeDetector
+     */
+    public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
+        parent::__construct($l);
+        $this->request = $request;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
+        $this->_setFileInfo($storage, $path, $isDir);
+        if (!isset($this->mimeType[$this->storage->getId()][$this->path])
+            || $this->mimeType[$this->storage->getId()][$this->path] === '') {
+            if ($isDir) {
+                $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+            } else {
+                $this->mimeType[$this->storage->getId()][$this->path] = null;
+            }
+        }
+    }
+
+    /**
+     * The mimetype is only cached if the file has a valid mimetype. Otherwise files access
+     * control will cache "application/octet-stream" for all the target node on:
+     * rename, move, copy and all other methods which create a new item
+     *
+     * To check this:
+     * 1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
+     * 2. Add an access control rule which checks for any mimetype
+     * 3. Create a folder and rename it, the folder should not be tagged, but it is
+     *
+     * @param string $storageId
+     * @param string|null $path
+     * @param string $mimeType
+     * @return string
+     */
+    protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
+        if ($path !== null && $mimeType !== 'application/octet-stream') {
+            $this->mimeType[$storageId][$path] = $mimeType;
+        }
+
+        return $mimeType;
+    }
+
+    /**
+     * Make sure that even though the content based check returns an application/octet-stream can still be checked based on mimetypemappings of their extension
+     *
+     * @param string $operator
+     * @param string $value
+     * @return bool
+     */
+    public function executeCheck($operator, $value) {
+        $actualValue = $this->getActualValue();
+        $plainMimetypeResult = $this->executeStringCheck($operator, $value, $actualValue);
+        if ($actualValue === 'httpd/unix-directory') {
+            return $plainMimetypeResult;
+        }
+        $detectMimetypeBasedOnFilenameResult = $this->executeStringCheck($operator, $value, $this->mimeTypeDetector->detectPath($this->path));
+        return $plainMimetypeResult || $detectMimetypeBasedOnFilenameResult;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
+            return $this->mimeType[$this->storage->getId()][$this->path];
+        }
+        $cacheEntry = $this->storage->getCache()->get($this->path);
+        if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
+            return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
+        }
+
+        if ($this->storage->file_exists($this->path) &&
+            $this->storage->filesize($this->path) &&
+            $this->storage->instanceOfStorage(Local::class)
+        ) {
+            $path = $this->storage->getLocalFile($this->path);
+            $mimeType = $this->mimeTypeDetector->detectContent($path);
+            return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
+        }
+
+        if ($this->isWebDAVRequest() || $this->isPublicWebDAVRequest()) {
+            // Creating a folder
+            if ($this->request->getMethod() === 'MKCOL') {
+                return 'httpd/unix-directory';
+            }
+        }
+
+        // We do not cache this, as the file did not exist yet.
+        // In case it does in the future, we will check with detectContent()
+        // again to get the real mimetype of the content, rather than
+        // guessing it from the path.
+        return $this->mimeTypeDetector->detectPath($this->path);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0 ||
+            $this->request->getPathInfo() === '/dav/uploads' ||
+            strpos($this->request->getPathInfo(), '/dav/uploads/') === 0
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isPublicWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0
+        );
+    }
+
+    public function supportedEntities(): array {
+        return [ File::class ];
+    }
+
+    public function isAvailableForScope(int $scope): bool {
+        return true;
+    }
 }

apps/settings/lib/Sections/Admin/Groupware.php

Indentation +20 added lines, -20 removed lines

@@ -30,30 +30,30 @@
 
 class Groupware implements IIconSection {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IL10N $l, IURLGenerator $urlGenerator) {
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function getIcon(): string {
-		return $this->urlGenerator->imagePath('core', 'places/contacts.svg');
-	}
+    public function getIcon(): string {
+        return $this->urlGenerator->imagePath('core', 'places/contacts.svg');
+    }
 
-	public function getID(): string {
-		return 'groupware';
-	}
+    public function getID(): string {
+        return 'groupware';
+    }
 
-	public function getName(): string {
-		return $this->l->t('Groupware');
-	}
+    public function getName(): string {
+        return $this->l->t('Groupware');
+    }
 
-	public function getPriority(): int {
-		return 50;
-	}
+    public function getPriority(): int {
+        return 50;
+    }
 }