nextcloud / server

apps/systemtags/lib/Settings/Admin.php

Indentation +22 added lines, -22 removed lines

@@ -28,29 +28,29 @@
 
 class Admin implements ISettings {
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		return new TemplateResponse('systemtags', 'admin', [], '');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        return new TemplateResponse('systemtags', 'admin', [], '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'workflow';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'workflow';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 70;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 70;
+    }
 
 }

apps/systemtags/appinfo/routes.php

Indentation +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
+    ]
 ];

apps/files_sharing/templates/public.php

Indentation +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div id="header-right">
 			<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
-				if ($_['server2serversharing']) {
-					?>
+                if ($_['server2serversharing']) {
+                    ?>
 					<span id="save" data-protected="<?php p($_['protected']) ?>"
 						  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
 					<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>

apps/files_sharing/templates/authenticate.php

Indentation +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@
 <?php
-	/** @var $_ array */
-	/** @var $l \OCP\IL10N */
-	style('files_sharing', 'authenticate');
-	script('files_sharing', 'authenticate'); 
+    /** @var $_ array */
+    /** @var $l \OCP\IL10N */
+    style('files_sharing', 'authenticate');
+    script('files_sharing', 'authenticate'); 
 ?>
 <form method="post">
 	<fieldset>

apps/files_sharing/ajax/shareinfo.php

Indentation +27 added lines, -27 removed lines

@@ -30,28 +30,28 @@ 
 OCP\JSON::checkAppEnabled('files_sharing');
 
 if (!isset($_GET['t'])) {
-	\OC_Response::setStatus(400); //400 Bad Request
-	exit;
+    \OC_Response::setStatus(400); //400 Bad Request
+    exit;
 }
 
 $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
 $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
 
 if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) {
-	\OC_Response::setStatus(404); // 404 not found
-	exit;
+    \OC_Response::setStatus(404); // 404 not found
+    exit;
 }
 
 $token = $_GET['t'];
 
 $password = null;
 if (isset($_POST['password'])) {
-	$password = $_POST['password'];
+    $password = $_POST['password'];
 }
 
 $relativePath = null;
 if (isset($_GET['dir'])) {
-	$relativePath = $_GET['dir'];
+    $relativePath = $_GET['dir'];
 }
 
 $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
@@ -63,20 +63,20 @@ 
 
 $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-	});
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+    \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+    });
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
 }
 
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
 $rootView = new \OC\Files\View('');
 
 if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-	OCP\JSON::error(array('data' => 'Share is not readable.'));
-	exit();
+    OCP\JSON::error(array('data' => 'Share is not readable.'));
+    exit();
 }
 
 /**
@@ -85,18 +85,18 @@ 
  * @return array
  */
 function getChildInfo($dir, $view, $sharePermissions) {
-	$children = $view->getDirectoryContent($dir->getPath());
-	$result = array();
-	foreach ($children as $child) {
-		$formatted = \OCA\Files\Helper::formatFileInfo($child);
-		if ($child->getType() === 'dir') {
-			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
-		}
-		$formatted['mtime'] = $formatted['mtime'] / 1000;
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
-		$result[] = $formatted;
-	}
-	return $result;
+    $children = $view->getDirectoryContent($dir->getPath());
+    $result = array();
+    foreach ($children as $child) {
+        $formatted = \OCA\Files\Helper::formatFileInfo($child);
+        if ($child->getType() === 'dir') {
+            $formatted['children'] = getChildInfo($child, $view, $sharePermissions);
+        }
+        $formatted['mtime'] = $formatted['mtime'] / 1000;
+        $formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
+        $result[] = $formatted;
+    }
+    return $result;
 }
 
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
@@ -105,7 +105,7 @@ 
 
 
 if ($rootInfo->getType() === 'dir') {
-	$result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
+    $result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
 }
 
 OCP\JSON::success(array('data' => $result));

apps/files_sharing/lib/Scanner.php

Indentation +43 added lines, -43 removed lines

@@ -31,52 +31,52 @@
  * Scanner for SharedStorage
  */
 class Scanner extends \OC\Files\Cache\Scanner {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage;
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage;
 
-	private $sourceScanner;
+    private $sourceScanner;
 
-	/**
-	 * Returns metadata from the shared storage, but
-	 * with permissions from the source storage.
-	 *
-	 * @param string $path path of the file for which to retrieve metadata
-	 *
-	 * @return array an array of metadata of the file
-	 */
-	public function getData($path) {
-		$data = parent::getData($path);
-		if ($data === null) {
-			return null;
-		}
-		$internalPath = $this->storage->getSourcePath($path);
-		$data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
-		return $data;
-	}
+    /**
+     * Returns metadata from the shared storage, but
+     * with permissions from the source storage.
+     *
+     * @param string $path path of the file for which to retrieve metadata
+     *
+     * @return array an array of metadata of the file
+     */
+    public function getData($path) {
+        $data = parent::getData($path);
+        if ($data === null) {
+            return null;
+        }
+        $internalPath = $this->storage->getSourcePath($path);
+        $data['permissions'] = $this->storage->getSourceStorage()->getPermissions($internalPath);
+        return $data;
+    }
 
-	private function getSourceScanner() {
-		if ($this->sourceScanner) {
-			return $this->sourceScanner;
-		}
-		if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-			/** @var \OC\Files\Storage\Storage $storage */
-			list($storage) = $this->storage->resolvePath('');
-			$this->sourceScanner = $storage->getScanner();
-			return $this->sourceScanner;
-		} else {
-			return null;
-		}
-	}
+    private function getSourceScanner() {
+        if ($this->sourceScanner) {
+            return $this->sourceScanner;
+        }
+        if ($this->storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
+            /** @var \OC\Files\Storage\Storage $storage */
+            list($storage) = $this->storage->resolvePath('');
+            $this->sourceScanner = $storage->getScanner();
+            return $this->sourceScanner;
+        } else {
+            return null;
+        }
+    }
 
-	public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
-		$sourceScanner = $this->getSourceScanner();
-		if ($sourceScanner instanceof NoopScanner) {
-			return [];
-		} else {
-			return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
-		}
-	}
+    public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {
+        $sourceScanner = $this->getSourceScanner();
+        if ($sourceScanner instanceof NoopScanner) {
+            return [];
+        } else {
+            return parent::scanFile($file, $reuseExisting, $parentId, $cacheData, $lock);
+        }
+    }
 }
 

apps/files_sharing/lib/Activity/Providers/Downloads.php

Indentation +85 added lines, -85 removed lines

@@ -26,89 +26,89 @@
 class Downloads extends Base {
 
 
-	const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
-	const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
-
-	const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
-	const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('Downloaded by {email}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
-			$subject = $this->l->t('{file} downloaded via public link');
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
-			$subject = $this->l->t('{email} downloaded {file}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
-			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
-			case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'email' => [
-						'type' => 'email',
-						'id' => $parameters[1],
-						'name' => $parameters[1],
-					],
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
+    const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
+
+    const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
+    const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('Downloaded by {email}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
+            $subject = $this->l->t('{file} downloaded via public link');
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
+            $subject = $this->l->t('{email} downloaded {file}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
+            case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
+            case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'email' => [
+                        'type' => 'email',
+                        'id' => $parameters[1],
+                        'name' => $parameters[1],
+                    ],
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

apps/files_sharing/lib/Activity/Providers/Base.php

Indentation +149 added lines, -149 removed lines

@@ -32,153 +32,153 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var array */
-	protected $displayNames = [];
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'files_sharing') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('files_sharing', $language);
-
-		if ($this->activityManager->isFormattingFilteredObject()) {
-			try {
-				return $this->parseShortVersion($event);
-			} catch (\InvalidArgumentException $e) {
-				// Ignore and simply use the long version...
-			}
-		}
-
-		return $this->parseLongVersion($event);
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseShortVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	abstract protected function parseLongVersion(IEvent $event);
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 * @throws \InvalidArgumentException
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = $parameter['path'];
-			} else {
-				$replacements[] = $parameter['name'];
-			}
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array|string $parameter
-	 * @param IEvent|null $event
-	 * @return array
-	 * @throws \InvalidArgumentException
-	 */
-	protected function getFile($parameter, IEvent $event = null) {
-		if (is_array($parameter)) {
-			$path = reset($parameter);
-			$id = (string) key($parameter);
-		} else if ($event !== null) {
-			// Legacy from before ownCloud 8.2
-			$path = $parameter;
-			$id = $event->getObjectId();
-		} else {
-			throw new \InvalidArgumentException('Could not generate file parameter');
-		}
-
-		return [
-			'type' => 'file',
-			'id' => $id,
-			'name' => basename($path),
-			'path' => trim($path, '/'),
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function getUser($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var array */
+    protected $displayNames = [];
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'files_sharing') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('files_sharing', $language);
+
+        if ($this->activityManager->isFormattingFilteredObject()) {
+            try {
+                return $this->parseShortVersion($event);
+            } catch (\InvalidArgumentException $e) {
+                // Ignore and simply use the long version...
+            }
+        }
+
+        return $this->parseLongVersion($event);
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseShortVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    abstract protected function parseLongVersion(IEvent $event);
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     * @throws \InvalidArgumentException
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = $parameter['path'];
+            } else {
+                $replacements[] = $parameter['name'];
+            }
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array|string $parameter
+     * @param IEvent|null $event
+     * @return array
+     * @throws \InvalidArgumentException
+     */
+    protected function getFile($parameter, IEvent $event = null) {
+        if (is_array($parameter)) {
+            $path = reset($parameter);
+            $id = (string) key($parameter);
+        } else if ($event !== null) {
+            // Legacy from before ownCloud 8.2
+            $path = $parameter;
+            $id = $event->getObjectId();
+        } else {
+            throw new \InvalidArgumentException('Could not generate file parameter');
+        }
+
+        return [
+            'type' => 'file',
+            'id' => $id,
+            'name' => basename($path),
+            'path' => trim($path, '/'),
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function getUser($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/files_sharing/lib/Activity/Providers/PublicLinks.php

Indentation +92 added lines, -92 removed lines

@@ -25,97 +25,97 @@
 
 class PublicLinks extends Base {
 
-	const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
-	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
-	const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
-	const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
-	const SUBJECT_LINK_EXPIRED = 'link_expired';
-	const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseShortVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('Shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('Removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parseLongVersion(IEvent $event) {
-		$parsedParameters = $this->getParsedParameters($event);
-
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
-			$subject = $this->l->t('You shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
-			$subject = $this->l->t('You removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
-			$subject = $this->l->t('Public link expired for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} shared {file} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
-			$subject = $this->l->t('{actor} removed public link for {file}');
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
-			$subject = $this->l->t('Public link of {actor} for {file} expired');
-
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		return $event;
-	}
-
-	protected function getParsedParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_SHARED_LINK_SELF:
-			case self::SUBJECT_UNSHARED_LINK_SELF:
-			case self::SUBJECT_LINK_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-				];
-			case self::SUBJECT_RESHARED_LINK_BY:
-			case self::SUBJECT_UNSHARED_LINK_BY:
-			case self::SUBJECT_LINK_BY_EXPIRED:
-				return [
-					'file' => $this->getFile($parameters[0], $event),
-					'actor' => $this->getUser($parameters[1]),
-				];
-		}
-		return [];
-	}
+    const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
+    const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
+    const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
+    const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
+    const SUBJECT_LINK_EXPIRED = 'link_expired';
+    const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseShortVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('Shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('Removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parseLongVersion(IEvent $event) {
+        $parsedParameters = $this->getParsedParameters($event);
+
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
+            $subject = $this->l->t('You shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
+            $subject = $this->l->t('You removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
+            $subject = $this->l->t('Public link expired for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} shared {file} as public link');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
+            $subject = $this->l->t('{actor} removed public link for {file}');
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
+            $subject = $this->l->t('Public link of {actor} for {file} expired');
+
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        return $event;
+    }
+
+    protected function getParsedParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_SHARED_LINK_SELF:
+            case self::SUBJECT_UNSHARED_LINK_SELF:
+            case self::SUBJECT_LINK_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                ];
+            case self::SUBJECT_RESHARED_LINK_BY:
+            case self::SUBJECT_UNSHARED_LINK_BY:
+            case self::SUBJECT_LINK_BY_EXPIRED:
+                return [
+                    'file' => $this->getFile($parameters[0], $event),
+                    'actor' => $this->getUser($parameters[1]),
+                ];
+        }
+        return [];
+    }
 
 }