Completed
Pull Request — master (#5231)
by Morris
16:38
created
apps/files_sharing/ajax/shareinfo.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -30,28 +30,28 @@  discard block
 block discarded – undo
30 30
 OCP\JSON::checkAppEnabled('files_sharing');
31 31
 
32 32
 if (!isset($_GET['t'])) {
33
-	\OC_Response::setStatus(400); //400 Bad Request
34
-	exit;
33
+    \OC_Response::setStatus(400); //400 Bad Request
34
+    exit;
35 35
 }
36 36
 
37 37
 $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
38 38
 $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
39 39
 
40 40
 if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false) {
41
-	\OC_Response::setStatus(404); // 404 not found
42
-	exit;
41
+    \OC_Response::setStatus(404); // 404 not found
42
+    exit;
43 43
 }
44 44
 
45 45
 $token = $_GET['t'];
46 46
 
47 47
 $password = null;
48 48
 if (isset($_POST['password'])) {
49
-	$password = $_POST['password'];
49
+    $password = $_POST['password'];
50 50
 }
51 51
 
52 52
 $relativePath = null;
53 53
 if (isset($_GET['dir'])) {
54
-	$relativePath = $_GET['dir'];
54
+    $relativePath = $_GET['dir'];
55 55
 }
56 56
 
57 57
 $data = \OCA\Files_Sharing\Helper::setupFromToken($token, $relativePath, $password);
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 
64 64
 $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
65 65
 if (!$isWritable) {
66
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
67
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
68
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
69
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
70
-	});
71
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
66
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
67
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
68
+    \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
69
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
70
+    });
71
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
72 72
 }
73 73
 
74 74
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
75 75
 $rootView = new \OC\Files\View('');
76 76
 
77 77
 if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
78
-	OCP\JSON::error(array('data' => 'Share is not readable.'));
79
-	exit();
78
+    OCP\JSON::error(array('data' => 'Share is not readable.'));
79
+    exit();
80 80
 }
81 81
 
82 82
 /**
@@ -85,18 +85,18 @@  discard block
 block discarded – undo
85 85
  * @return array
86 86
  */
87 87
 function getChildInfo($dir, $view, $sharePermissions) {
88
-	$children = $view->getDirectoryContent($dir->getPath());
89
-	$result = array();
90
-	foreach ($children as $child) {
91
-		$formatted = \OCA\Files\Helper::formatFileInfo($child);
92
-		if ($child->getType() === 'dir') {
93
-			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
94
-		}
95
-		$formatted['mtime'] = $formatted['mtime'] / 1000;
96
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
97
-		$result[] = $formatted;
98
-	}
99
-	return $result;
88
+    $children = $view->getDirectoryContent($dir->getPath());
89
+    $result = array();
90
+    foreach ($children as $child) {
91
+        $formatted = \OCA\Files\Helper::formatFileInfo($child);
92
+        if ($child->getType() === 'dir') {
93
+            $formatted['children'] = getChildInfo($child, $view, $sharePermissions);
94
+        }
95
+        $formatted['mtime'] = $formatted['mtime'] / 1000;
96
+        $formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
97
+        $result[] = $formatted;
98
+    }
99
+    return $result;
100 100
 }
101 101
 
102 102
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 
107 107
 if ($rootInfo->getType() === 'dir') {
108
-	$result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
108
+    $result['children'] = getChildInfo($rootInfo, $rootView, $share->getPermissions());
109 109
 }
110 110
 
111 111
 OCP\JSON::success(array('data' => $result));
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 if (!$isWritable) {
66 66
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
67 67
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
68
-	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
68
+	\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
69 69
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
70 70
 	});
71 71
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 $rootInfo = \OC\Files\Filesystem::getFileInfo($path);
75 75
 $rootView = new \OC\Files\View('');
76 76
 
77
-if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
77
+if ($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
78 78
 	OCP\JSON::error(array('data' => 'Share is not readable.'));
79 79
 	exit();
80 80
 }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			$formatted['children'] = getChildInfo($child, $view, $sharePermissions);
94 94
 		}
95 95
 		$formatted['mtime'] = $formatted['mtime'] / 1000;
96
-		$formatted['permissions'] = $sharePermissions & (int)$formatted['permissions'];
96
+		$formatted['permissions'] = $sharePermissions & (int) $formatted['permissions'];
97 97
 		$result[] = $formatted;
98 98
 	}
99 99
 	return $result;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
 $result = \OCA\Files\Helper::formatFileInfo($rootInfo);
103 103
 $result['mtime'] = $result['mtime'] / 1000;
104
-$result['permissions'] = (int)$result['permissions'] & $share->getPermissions();
104
+$result['permissions'] = (int) $result['permissions'] & $share->getPermissions();
105 105
 
106 106
 
107 107
 if ($rootInfo->getType() === 'dir') {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Downloads.php 1 patch
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -26,89 +26,89 @@
 block discarded – undo
26 26
 class Downloads extends Base {
27 27
 
28 28
 
29
-	const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
30
-	const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
31
-
32
-	const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
33
-	const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
34
-
35
-	/**
36
-	 * @param IEvent $event
37
-	 * @return IEvent
38
-	 * @throws \InvalidArgumentException
39
-	 * @since 11.0.0
40
-	 */
41
-	public function parseShortVersion(IEvent $event) {
42
-		$parsedParameters = $this->getParsedParameters($event);
43
-
44
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
45
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
46
-			$subject = $this->l->t('Downloaded via public link');
47
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
48
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
49
-			$subject = $this->l->t('Downloaded by {email}');
50
-		} else {
51
-			throw new \InvalidArgumentException();
52
-		}
53
-
54
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
55
-		$this->setSubjects($event, $subject, $parsedParameters);
56
-
57
-		return $event;
58
-	}
59
-
60
-	/**
61
-	 * @param IEvent $event
62
-	 * @return IEvent
63
-	 * @throws \InvalidArgumentException
64
-	 * @since 11.0.0
65
-	 */
66
-	public function parseLongVersion(IEvent $event) {
67
-		$parsedParameters = $this->getParsedParameters($event);
68
-
69
-		if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
70
-			$event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
71
-			$subject = $this->l->t('{file} downloaded via public link');
72
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
73
-			$event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
74
-			$subject = $this->l->t('{email} downloaded {file}');
75
-		} else {
76
-			throw new \InvalidArgumentException();
77
-		}
78
-
79
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
80
-		$this->setSubjects($event, $subject, $parsedParameters);
81
-
82
-		return $event;
83
-	}
84
-
85
-	/**
86
-	 * @param IEvent $event
87
-	 * @return array
88
-	 * @throws \InvalidArgumentException
89
-	 */
90
-	protected function getParsedParameters(IEvent $event) {
91
-		$subject = $event->getSubject();
92
-		$parameters = $event->getSubjectParameters();
93
-
94
-		switch ($subject) {
95
-			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
96
-			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
97
-				return [
98
-					'file' => $this->getFile($parameters[0], $event),
99
-				];
100
-			case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
101
-			case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
102
-				return [
103
-					'file' => $this->getFile($parameters[0], $event),
104
-					'email' => [
105
-						'type' => 'email',
106
-						'id' => $parameters[1],
107
-						'name' => $parameters[1],
108
-					],
109
-				];
110
-		}
111
-
112
-		throw new \InvalidArgumentException();
113
-	}
29
+    const SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED = 'public_shared_file_downloaded';
30
+    const SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED = 'public_shared_folder_downloaded';
31
+
32
+    const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded';
33
+    const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded';
34
+
35
+    /**
36
+     * @param IEvent $event
37
+     * @return IEvent
38
+     * @throws \InvalidArgumentException
39
+     * @since 11.0.0
40
+     */
41
+    public function parseShortVersion(IEvent $event) {
42
+        $parsedParameters = $this->getParsedParameters($event);
43
+
44
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
45
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
46
+            $subject = $this->l->t('Downloaded via public link');
47
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
48
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
49
+            $subject = $this->l->t('Downloaded by {email}');
50
+        } else {
51
+            throw new \InvalidArgumentException();
52
+        }
53
+
54
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
55
+        $this->setSubjects($event, $subject, $parsedParameters);
56
+
57
+        return $event;
58
+    }
59
+
60
+    /**
61
+     * @param IEvent $event
62
+     * @return IEvent
63
+     * @throws \InvalidArgumentException
64
+     * @since 11.0.0
65
+     */
66
+    public function parseLongVersion(IEvent $event) {
67
+        $parsedParameters = $this->getParsedParameters($event);
68
+
69
+        if ($event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED ||
70
+            $event->getSubject() === self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED) {
71
+            $subject = $this->l->t('{file} downloaded via public link');
72
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED ||
73
+            $event->getSubject() === self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED) {
74
+            $subject = $this->l->t('{email} downloaded {file}');
75
+        } else {
76
+            throw new \InvalidArgumentException();
77
+        }
78
+
79
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/download.svg')));
80
+        $this->setSubjects($event, $subject, $parsedParameters);
81
+
82
+        return $event;
83
+    }
84
+
85
+    /**
86
+     * @param IEvent $event
87
+     * @return array
88
+     * @throws \InvalidArgumentException
89
+     */
90
+    protected function getParsedParameters(IEvent $event) {
91
+        $subject = $event->getSubject();
92
+        $parameters = $event->getSubjectParameters();
93
+
94
+        switch ($subject) {
95
+            case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
96
+            case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
97
+                return [
98
+                    'file' => $this->getFile($parameters[0], $event),
99
+                ];
100
+            case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED:
101
+            case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED:
102
+                return [
103
+                    'file' => $this->getFile($parameters[0], $event),
104
+                    'email' => [
105
+                        'type' => 'email',
106
+                        'id' => $parameters[1],
107
+                        'name' => $parameters[1],
108
+                    ],
109
+                ];
110
+        }
111
+
112
+        throw new \InvalidArgumentException();
113
+    }
114 114
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Base.php 2 patches
Indentation   +149 added lines, -149 removed lines patch added patch discarded remove patch
@@ -32,153 +32,153 @@
 block discarded – undo
32 32
 
33 33
 abstract class Base implements IProvider {
34 34
 
35
-	/** @var IFactory */
36
-	protected $languageFactory;
37
-
38
-	/** @var IL10N */
39
-	protected $l;
40
-
41
-	/** @var IURLGenerator */
42
-	protected $url;
43
-
44
-	/** @var IManager */
45
-	protected $activityManager;
46
-
47
-	/** @var IUserManager */
48
-	protected $userManager;
49
-
50
-	/** @var array */
51
-	protected $displayNames = [];
52
-
53
-	/**
54
-	 * @param IFactory $languageFactory
55
-	 * @param IURLGenerator $url
56
-	 * @param IManager $activityManager
57
-	 * @param IUserManager $userManager
58
-	 */
59
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
60
-		$this->languageFactory = $languageFactory;
61
-		$this->url = $url;
62
-		$this->activityManager = $activityManager;
63
-		$this->userManager = $userManager;
64
-	}
65
-
66
-	/**
67
-	 * @param string $language
68
-	 * @param IEvent $event
69
-	 * @param IEvent|null $previousEvent
70
-	 * @return IEvent
71
-	 * @throws \InvalidArgumentException
72
-	 * @since 11.0.0
73
-	 */
74
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
75
-		if ($event->getApp() !== 'files_sharing') {
76
-			throw new \InvalidArgumentException();
77
-		}
78
-
79
-		$this->l = $this->languageFactory->get('files_sharing', $language);
80
-
81
-		if ($this->activityManager->isFormattingFilteredObject()) {
82
-			try {
83
-				return $this->parseShortVersion($event);
84
-			} catch (\InvalidArgumentException $e) {
85
-				// Ignore and simply use the long version...
86
-			}
87
-		}
88
-
89
-		return $this->parseLongVersion($event);
90
-	}
91
-
92
-	/**
93
-	 * @param IEvent $event
94
-	 * @return IEvent
95
-	 * @throws \InvalidArgumentException
96
-	 * @since 11.0.0
97
-	 */
98
-	abstract protected function parseShortVersion(IEvent $event);
99
-
100
-	/**
101
-	 * @param IEvent $event
102
-	 * @return IEvent
103
-	 * @throws \InvalidArgumentException
104
-	 * @since 11.0.0
105
-	 */
106
-	abstract protected function parseLongVersion(IEvent $event);
107
-
108
-	/**
109
-	 * @param IEvent $event
110
-	 * @param string $subject
111
-	 * @param array $parameters
112
-	 * @throws \InvalidArgumentException
113
-	 */
114
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
115
-		$placeholders = $replacements = [];
116
-		foreach ($parameters as $placeholder => $parameter) {
117
-			$placeholders[] = '{' . $placeholder . '}';
118
-			if ($parameter['type'] === 'file') {
119
-				$replacements[] = $parameter['path'];
120
-			} else {
121
-				$replacements[] = $parameter['name'];
122
-			}
123
-		}
124
-
125
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
126
-			->setRichSubject($subject, $parameters);
127
-	}
128
-
129
-	/**
130
-	 * @param array|string $parameter
131
-	 * @param IEvent|null $event
132
-	 * @return array
133
-	 * @throws \InvalidArgumentException
134
-	 */
135
-	protected function getFile($parameter, IEvent $event = null) {
136
-		if (is_array($parameter)) {
137
-			$path = reset($parameter);
138
-			$id = (string) key($parameter);
139
-		} else if ($event !== null) {
140
-			// Legacy from before ownCloud 8.2
141
-			$path = $parameter;
142
-			$id = $event->getObjectId();
143
-		} else {
144
-			throw new \InvalidArgumentException('Could not generate file parameter');
145
-		}
146
-
147
-		return [
148
-			'type' => 'file',
149
-			'id' => $id,
150
-			'name' => basename($path),
151
-			'path' => trim($path, '/'),
152
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
153
-		];
154
-	}
155
-
156
-	/**
157
-	 * @param string $uid
158
-	 * @return array
159
-	 */
160
-	protected function getUser($uid) {
161
-		if (!isset($this->displayNames[$uid])) {
162
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
163
-		}
164
-
165
-		return [
166
-			'type' => 'user',
167
-			'id' => $uid,
168
-			'name' => $this->displayNames[$uid],
169
-		];
170
-	}
171
-
172
-	/**
173
-	 * @param string $uid
174
-	 * @return string
175
-	 */
176
-	protected function getDisplayName($uid) {
177
-		$user = $this->userManager->get($uid);
178
-		if ($user instanceof IUser) {
179
-			return $user->getDisplayName();
180
-		} else {
181
-			return $uid;
182
-		}
183
-	}
35
+    /** @var IFactory */
36
+    protected $languageFactory;
37
+
38
+    /** @var IL10N */
39
+    protected $l;
40
+
41
+    /** @var IURLGenerator */
42
+    protected $url;
43
+
44
+    /** @var IManager */
45
+    protected $activityManager;
46
+
47
+    /** @var IUserManager */
48
+    protected $userManager;
49
+
50
+    /** @var array */
51
+    protected $displayNames = [];
52
+
53
+    /**
54
+     * @param IFactory $languageFactory
55
+     * @param IURLGenerator $url
56
+     * @param IManager $activityManager
57
+     * @param IUserManager $userManager
58
+     */
59
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
60
+        $this->languageFactory = $languageFactory;
61
+        $this->url = $url;
62
+        $this->activityManager = $activityManager;
63
+        $this->userManager = $userManager;
64
+    }
65
+
66
+    /**
67
+     * @param string $language
68
+     * @param IEvent $event
69
+     * @param IEvent|null $previousEvent
70
+     * @return IEvent
71
+     * @throws \InvalidArgumentException
72
+     * @since 11.0.0
73
+     */
74
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
75
+        if ($event->getApp() !== 'files_sharing') {
76
+            throw new \InvalidArgumentException();
77
+        }
78
+
79
+        $this->l = $this->languageFactory->get('files_sharing', $language);
80
+
81
+        if ($this->activityManager->isFormattingFilteredObject()) {
82
+            try {
83
+                return $this->parseShortVersion($event);
84
+            } catch (\InvalidArgumentException $e) {
85
+                // Ignore and simply use the long version...
86
+            }
87
+        }
88
+
89
+        return $this->parseLongVersion($event);
90
+    }
91
+
92
+    /**
93
+     * @param IEvent $event
94
+     * @return IEvent
95
+     * @throws \InvalidArgumentException
96
+     * @since 11.0.0
97
+     */
98
+    abstract protected function parseShortVersion(IEvent $event);
99
+
100
+    /**
101
+     * @param IEvent $event
102
+     * @return IEvent
103
+     * @throws \InvalidArgumentException
104
+     * @since 11.0.0
105
+     */
106
+    abstract protected function parseLongVersion(IEvent $event);
107
+
108
+    /**
109
+     * @param IEvent $event
110
+     * @param string $subject
111
+     * @param array $parameters
112
+     * @throws \InvalidArgumentException
113
+     */
114
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
115
+        $placeholders = $replacements = [];
116
+        foreach ($parameters as $placeholder => $parameter) {
117
+            $placeholders[] = '{' . $placeholder . '}';
118
+            if ($parameter['type'] === 'file') {
119
+                $replacements[] = $parameter['path'];
120
+            } else {
121
+                $replacements[] = $parameter['name'];
122
+            }
123
+        }
124
+
125
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
126
+            ->setRichSubject($subject, $parameters);
127
+    }
128
+
129
+    /**
130
+     * @param array|string $parameter
131
+     * @param IEvent|null $event
132
+     * @return array
133
+     * @throws \InvalidArgumentException
134
+     */
135
+    protected function getFile($parameter, IEvent $event = null) {
136
+        if (is_array($parameter)) {
137
+            $path = reset($parameter);
138
+            $id = (string) key($parameter);
139
+        } else if ($event !== null) {
140
+            // Legacy from before ownCloud 8.2
141
+            $path = $parameter;
142
+            $id = $event->getObjectId();
143
+        } else {
144
+            throw new \InvalidArgumentException('Could not generate file parameter');
145
+        }
146
+
147
+        return [
148
+            'type' => 'file',
149
+            'id' => $id,
150
+            'name' => basename($path),
151
+            'path' => trim($path, '/'),
152
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
153
+        ];
154
+    }
155
+
156
+    /**
157
+     * @param string $uid
158
+     * @return array
159
+     */
160
+    protected function getUser($uid) {
161
+        if (!isset($this->displayNames[$uid])) {
162
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
163
+        }
164
+
165
+        return [
166
+            'type' => 'user',
167
+            'id' => $uid,
168
+            'name' => $this->displayNames[$uid],
169
+        ];
170
+    }
171
+
172
+    /**
173
+     * @param string $uid
174
+     * @return string
175
+     */
176
+    protected function getDisplayName($uid) {
177
+        $user = $this->userManager->get($uid);
178
+        if ($user instanceof IUser) {
179
+            return $user->getDisplayName();
180
+        } else {
181
+            return $uid;
182
+        }
183
+    }
184 184
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
198 198
 		$placeholders = $replacements = [];
199 199
 		foreach ($parameters as $placeholder => $parameter) {
200
-			$placeholders[] = '{' . $placeholder . '}';
200
+			$placeholders[] = '{'.$placeholder.'}';
201 201
 			if ($parameter['type'] === 'file') {
202 202
 				$replacements[] = $parameter['path'];
203 203
 			} else {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/PublicLinks.php 1 patch
Indentation   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -25,97 +25,97 @@
 block discarded – undo
25 25
 
26 26
 class PublicLinks extends Base {
27 27
 
28
-	const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
29
-	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
30
-	const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
31
-	const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
32
-	const SUBJECT_LINK_EXPIRED = 'link_expired';
33
-	const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
34
-
35
-	/**
36
-	 * @param IEvent $event
37
-	 * @return IEvent
38
-	 * @throws \InvalidArgumentException
39
-	 * @since 11.0.0
40
-	 */
41
-	public function parseShortVersion(IEvent $event) {
42
-		$parsedParameters = $this->getParsedParameters($event);
43
-
44
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
45
-			$subject = $this->l->t('Shared as public link');
46
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
47
-			$subject = $this->l->t('Removed public link');
48
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
49
-			$subject = $this->l->t('Public link expired');
50
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
51
-			$subject = $this->l->t('{actor} shared as public link');
52
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
53
-			$subject = $this->l->t('{actor} removed public link');
54
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
55
-			$subject = $this->l->t('Public link of {actor} expired');
56
-
57
-		} else {
58
-			throw new \InvalidArgumentException();
59
-		}
60
-
61
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
62
-		$this->setSubjects($event, $subject, $parsedParameters);
63
-
64
-		return $event;
65
-	}
66
-
67
-	/**
68
-	 * @param IEvent $event
69
-	 * @return IEvent
70
-	 * @throws \InvalidArgumentException
71
-	 * @since 11.0.0
72
-	 */
73
-	public function parseLongVersion(IEvent $event) {
74
-		$parsedParameters = $this->getParsedParameters($event);
75
-
76
-		if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
77
-			$subject = $this->l->t('You shared {file} as public link');
78
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
79
-			$subject = $this->l->t('You removed public link for {file}');
80
-		} else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
81
-			$subject = $this->l->t('Public link expired for {file}');
82
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
83
-			$subject = $this->l->t('{actor} shared {file} as public link');
84
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
85
-			$subject = $this->l->t('{actor} removed public link for {file}');
86
-		} else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
87
-			$subject = $this->l->t('Public link of {actor} for {file} expired');
88
-
89
-		} else {
90
-			throw new \InvalidArgumentException();
91
-		}
92
-
93
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
94
-		$this->setSubjects($event, $subject, $parsedParameters);
95
-
96
-		return $event;
97
-	}
98
-
99
-	protected function getParsedParameters(IEvent $event) {
100
-		$subject = $event->getSubject();
101
-		$parameters = $event->getSubjectParameters();
102
-
103
-		switch ($subject) {
104
-			case self::SUBJECT_SHARED_LINK_SELF:
105
-			case self::SUBJECT_UNSHARED_LINK_SELF:
106
-			case self::SUBJECT_LINK_EXPIRED:
107
-				return [
108
-					'file' => $this->getFile($parameters[0], $event),
109
-				];
110
-			case self::SUBJECT_RESHARED_LINK_BY:
111
-			case self::SUBJECT_UNSHARED_LINK_BY:
112
-			case self::SUBJECT_LINK_BY_EXPIRED:
113
-				return [
114
-					'file' => $this->getFile($parameters[0], $event),
115
-					'actor' => $this->getUser($parameters[1]),
116
-				];
117
-		}
118
-		return [];
119
-	}
28
+    const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
29
+    const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
30
+    const SUBJECT_UNSHARED_LINK_SELF = 'unshared_link_self';
31
+    const SUBJECT_UNSHARED_LINK_BY = 'unshared_link_by';
32
+    const SUBJECT_LINK_EXPIRED = 'link_expired';
33
+    const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired';
34
+
35
+    /**
36
+     * @param IEvent $event
37
+     * @return IEvent
38
+     * @throws \InvalidArgumentException
39
+     * @since 11.0.0
40
+     */
41
+    public function parseShortVersion(IEvent $event) {
42
+        $parsedParameters = $this->getParsedParameters($event);
43
+
44
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
45
+            $subject = $this->l->t('Shared as public link');
46
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
47
+            $subject = $this->l->t('Removed public link');
48
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
49
+            $subject = $this->l->t('Public link expired');
50
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
51
+            $subject = $this->l->t('{actor} shared as public link');
52
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
53
+            $subject = $this->l->t('{actor} removed public link');
54
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
55
+            $subject = $this->l->t('Public link of {actor} expired');
56
+
57
+        } else {
58
+            throw new \InvalidArgumentException();
59
+        }
60
+
61
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
62
+        $this->setSubjects($event, $subject, $parsedParameters);
63
+
64
+        return $event;
65
+    }
66
+
67
+    /**
68
+     * @param IEvent $event
69
+     * @return IEvent
70
+     * @throws \InvalidArgumentException
71
+     * @since 11.0.0
72
+     */
73
+    public function parseLongVersion(IEvent $event) {
74
+        $parsedParameters = $this->getParsedParameters($event);
75
+
76
+        if ($event->getSubject() === self::SUBJECT_SHARED_LINK_SELF) {
77
+            $subject = $this->l->t('You shared {file} as public link');
78
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_SELF) {
79
+            $subject = $this->l->t('You removed public link for {file}');
80
+        } else if ($event->getSubject() === self::SUBJECT_LINK_EXPIRED) {
81
+            $subject = $this->l->t('Public link expired for {file}');
82
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_LINK_BY) {
83
+            $subject = $this->l->t('{actor} shared {file} as public link');
84
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_LINK_BY) {
85
+            $subject = $this->l->t('{actor} removed public link for {file}');
86
+        } else if ($event->getSubject() === self::SUBJECT_LINK_BY_EXPIRED) {
87
+            $subject = $this->l->t('Public link of {actor} for {file} expired');
88
+
89
+        } else {
90
+            throw new \InvalidArgumentException();
91
+        }
92
+
93
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
94
+        $this->setSubjects($event, $subject, $parsedParameters);
95
+
96
+        return $event;
97
+    }
98
+
99
+    protected function getParsedParameters(IEvent $event) {
100
+        $subject = $event->getSubject();
101
+        $parameters = $event->getSubjectParameters();
102
+
103
+        switch ($subject) {
104
+            case self::SUBJECT_SHARED_LINK_SELF:
105
+            case self::SUBJECT_UNSHARED_LINK_SELF:
106
+            case self::SUBJECT_LINK_EXPIRED:
107
+                return [
108
+                    'file' => $this->getFile($parameters[0], $event),
109
+                ];
110
+            case self::SUBJECT_RESHARED_LINK_BY:
111
+            case self::SUBJECT_UNSHARED_LINK_BY:
112
+            case self::SUBJECT_LINK_BY_EXPIRED:
113
+                return [
114
+                    'file' => $this->getFile($parameters[0], $event),
115
+                    'actor' => $this->getUser($parameters[1]),
116
+                ];
117
+        }
118
+        return [];
119
+    }
120 120
 
121 121
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/RemoteShares.php 2 patches
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -32,116 +32,116 @@
 block discarded – undo
32 32
 
33 33
 class RemoteShares extends Base {
34 34
 
35
-	protected $cloudIdManager;
36
-
37
-	const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
38
-	const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
39
-	const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
40
-	const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
41
-
42
-	/**
43
-	 * @param IFactory $languageFactory
44
-	 * @param IURLGenerator $url
45
-	 * @param IManager $activityManager
46
-	 * @param IUserManager $userManager
47
-	 * @param ICloudIdManager $cloudIdManager
48
-	 */
49
-	public function __construct(IFactory $languageFactory,
50
-								IURLGenerator $url,
51
-								IManager $activityManager,
52
-								IUserManager $userManager,
53
-								ICloudIdManager $cloudIdManager
54
-	) {
55
-		parent::__construct($languageFactory, $url, $activityManager, $userManager);
56
-		$this->cloudIdManager = $cloudIdManager;
57
-	}
58
-
59
-	/**
60
-	 * @param IEvent $event
61
-	 * @return IEvent
62
-	 * @throws \InvalidArgumentException
63
-	 * @since 11.0.0
64
-	 */
65
-	public function parseShortVersion(IEvent $event) {
66
-		$parsedParameters = $this->getParsedParameters($event);
67
-
68
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
69
-			$subject = $this->l->t('{user} accepted the remote share');
70
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
71
-			$subject = $this->l->t('{user} declined the remote share');
72
-		} else {
73
-			throw new \InvalidArgumentException();
74
-		}
75
-
76
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
77
-		$this->setSubjects($event, $subject, $parsedParameters);
78
-
79
-		return $event;
80
-	}
81
-
82
-	/**
83
-	 * @param IEvent $event
84
-	 * @return IEvent
85
-	 * @throws \InvalidArgumentException
86
-	 * @since 11.0.0
87
-	 */
88
-	public function parseLongVersion(IEvent $event) {
89
-		$parsedParameters = $this->getParsedParameters($event);
90
-
91
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
92
-			$subject = $this->l->t('You received a new remote share {file} from {user}');
93
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
94
-			$subject = $this->l->t('{user} accepted the remote share of {file}');
95
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
96
-			$subject = $this->l->t('{user} declined the remote share of {file}');
97
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
98
-			$subject = $this->l->t('{user} unshared {file} from you');
99
-		} else {
100
-			throw new \InvalidArgumentException();
101
-		}
102
-
103
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
104
-		$this->setSubjects($event, $subject, $parsedParameters);
105
-
106
-		return $event;
107
-	}
108
-
109
-	protected function getParsedParameters(IEvent $event) {
110
-		$subject = $event->getSubject();
111
-		$parameters = $event->getSubjectParameters();
112
-
113
-		switch ($subject) {
114
-			case self::SUBJECT_REMOTE_SHARE_RECEIVED:
115
-			case self::SUBJECT_REMOTE_SHARE_UNSHARED:
116
-				return [
117
-					'file' => [
118
-						'type' => 'pending-federated-share',
119
-						'id' => $parameters[1],
120
-						'name' => $parameters[1],
121
-					],
122
-					'user' => $this->getFederatedUser($parameters[0]),
123
-				];
124
-			case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
125
-			case self::SUBJECT_REMOTE_SHARE_DECLINED:
126
-				return [
127
-					'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
128
-					'user' => $this->getFederatedUser($parameters[0]),
129
-				];
130
-		}
131
-		throw new \InvalidArgumentException();
132
-	}
133
-
134
-	/**
135
-	 * @param string $cloudId
136
-	 * @return array
137
-	 */
138
-	protected function getFederatedUser($cloudId) {
139
-		$remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
140
-		return [
141
-			'type' => 'user',
142
-			'id' => $remoteUser->getUser(),
143
-			'name' => $cloudId,// Todo display name from contacts
144
-			'server' => $remoteUser->getRemote(),
145
-		];
146
-	}
35
+    protected $cloudIdManager;
36
+
37
+    const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
38
+    const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
39
+    const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
40
+    const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
41
+
42
+    /**
43
+     * @param IFactory $languageFactory
44
+     * @param IURLGenerator $url
45
+     * @param IManager $activityManager
46
+     * @param IUserManager $userManager
47
+     * @param ICloudIdManager $cloudIdManager
48
+     */
49
+    public function __construct(IFactory $languageFactory,
50
+                                IURLGenerator $url,
51
+                                IManager $activityManager,
52
+                                IUserManager $userManager,
53
+                                ICloudIdManager $cloudIdManager
54
+    ) {
55
+        parent::__construct($languageFactory, $url, $activityManager, $userManager);
56
+        $this->cloudIdManager = $cloudIdManager;
57
+    }
58
+
59
+    /**
60
+     * @param IEvent $event
61
+     * @return IEvent
62
+     * @throws \InvalidArgumentException
63
+     * @since 11.0.0
64
+     */
65
+    public function parseShortVersion(IEvent $event) {
66
+        $parsedParameters = $this->getParsedParameters($event);
67
+
68
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
69
+            $subject = $this->l->t('{user} accepted the remote share');
70
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
71
+            $subject = $this->l->t('{user} declined the remote share');
72
+        } else {
73
+            throw new \InvalidArgumentException();
74
+        }
75
+
76
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
77
+        $this->setSubjects($event, $subject, $parsedParameters);
78
+
79
+        return $event;
80
+    }
81
+
82
+    /**
83
+     * @param IEvent $event
84
+     * @return IEvent
85
+     * @throws \InvalidArgumentException
86
+     * @since 11.0.0
87
+     */
88
+    public function parseLongVersion(IEvent $event) {
89
+        $parsedParameters = $this->getParsedParameters($event);
90
+
91
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
92
+            $subject = $this->l->t('You received a new remote share {file} from {user}');
93
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
94
+            $subject = $this->l->t('{user} accepted the remote share of {file}');
95
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
96
+            $subject = $this->l->t('{user} declined the remote share of {file}');
97
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
98
+            $subject = $this->l->t('{user} unshared {file} from you');
99
+        } else {
100
+            throw new \InvalidArgumentException();
101
+        }
102
+
103
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
104
+        $this->setSubjects($event, $subject, $parsedParameters);
105
+
106
+        return $event;
107
+    }
108
+
109
+    protected function getParsedParameters(IEvent $event) {
110
+        $subject = $event->getSubject();
111
+        $parameters = $event->getSubjectParameters();
112
+
113
+        switch ($subject) {
114
+            case self::SUBJECT_REMOTE_SHARE_RECEIVED:
115
+            case self::SUBJECT_REMOTE_SHARE_UNSHARED:
116
+                return [
117
+                    'file' => [
118
+                        'type' => 'pending-federated-share',
119
+                        'id' => $parameters[1],
120
+                        'name' => $parameters[1],
121
+                    ],
122
+                    'user' => $this->getFederatedUser($parameters[0]),
123
+                ];
124
+            case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
125
+            case self::SUBJECT_REMOTE_SHARE_DECLINED:
126
+                return [
127
+                    'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
128
+                    'user' => $this->getFederatedUser($parameters[0]),
129
+                ];
130
+        }
131
+        throw new \InvalidArgumentException();
132
+    }
133
+
134
+    /**
135
+     * @param string $cloudId
136
+     * @return array
137
+     */
138
+    protected function getFederatedUser($cloudId) {
139
+        $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
140
+        return [
141
+            'type' => 'user',
142
+            'id' => $remoteUser->getUser(),
143
+            'name' => $cloudId,// Todo display name from contacts
144
+            'server' => $remoteUser->getRemote(),
145
+        ];
146
+    }
147 147
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 		return [
141 141
 			'type' => 'user',
142 142
 			'id' => $remoteUser->getUser(),
143
-			'name' => $cloudId,// Todo display name from contacts
143
+			'name' => $cloudId, // Todo display name from contacts
144 144
 			'server' => $remoteUser->getRemote(),
145 145
 		];
146 146
 	}
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Groups.php 1 patch
Indentation   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -25,92 +25,92 @@
 block discarded – undo
25 25
 
26 26
 class Groups extends Base {
27 27
 
28
-	const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
29
-	const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
30
-	const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
31
-	const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
28
+    const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
29
+    const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
30
+    const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
31
+    const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
32 32
 
33
-	/**
34
-	 * @param IEvent $event
35
-	 * @return IEvent
36
-	 * @throws \InvalidArgumentException
37
-	 * @since 11.0.0
38
-	 */
39
-	public function parseShortVersion(IEvent $event) {
40
-		$parsedParameters = $this->getParsedParameters($event);
33
+    /**
34
+     * @param IEvent $event
35
+     * @return IEvent
36
+     * @throws \InvalidArgumentException
37
+     * @since 11.0.0
38
+     */
39
+    public function parseShortVersion(IEvent $event) {
40
+        $parsedParameters = $this->getParsedParameters($event);
41 41
 
42
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
43
-			$subject = $this->l->t('Shared with group {group}');
44
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
45
-			$subject = $this->l->t('Removed share for group {group}');
46
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
47
-			$subject = $this->l->t('{actor} shared with group {group}');
48
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
49
-			$subject = $this->l->t('{actor} removed share for group {group}');
50
-		} else {
51
-			throw new \InvalidArgumentException();
52
-		}
42
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
43
+            $subject = $this->l->t('Shared with group {group}');
44
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
45
+            $subject = $this->l->t('Removed share for group {group}');
46
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
47
+            $subject = $this->l->t('{actor} shared with group {group}');
48
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
49
+            $subject = $this->l->t('{actor} removed share for group {group}');
50
+        } else {
51
+            throw new \InvalidArgumentException();
52
+        }
53 53
 
54
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
55
-		$this->setSubjects($event, $subject, $parsedParameters);
54
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
55
+        $this->setSubjects($event, $subject, $parsedParameters);
56 56
 
57
-		return $event;
58
-	}
57
+        return $event;
58
+    }
59 59
 
60
-	/**
61
-	 * @param IEvent $event
62
-	 * @return IEvent
63
-	 * @throws \InvalidArgumentException
64
-	 * @since 11.0.0
65
-	 */
66
-	public function parseLongVersion(IEvent $event) {
67
-		$parsedParameters = $this->getParsedParameters($event);
60
+    /**
61
+     * @param IEvent $event
62
+     * @return IEvent
63
+     * @throws \InvalidArgumentException
64
+     * @since 11.0.0
65
+     */
66
+    public function parseLongVersion(IEvent $event) {
67
+        $parsedParameters = $this->getParsedParameters($event);
68 68
 
69
-		if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
70
-			$subject = $this->l->t('You shared {file} with group {group}');
71
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
72
-			$subject = $this->l->t('You removed group {group} from {file}');
73
-		} else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
74
-			$subject = $this->l->t('{actor} shared {file} with group {group}');
75
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
76
-			$subject = $this->l->t('{actor} removed group {group} from {file}');
77
-		} else {
78
-			throw new \InvalidArgumentException();
79
-		}
69
+        if ($event->getSubject() === self::SUBJECT_SHARED_GROUP_SELF) {
70
+            $subject = $this->l->t('You shared {file} with group {group}');
71
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_SELF) {
72
+            $subject = $this->l->t('You removed group {group} from {file}');
73
+        } else if ($event->getSubject() === self::SUBJECT_RESHARED_GROUP_BY) {
74
+            $subject = $this->l->t('{actor} shared {file} with group {group}');
75
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
76
+            $subject = $this->l->t('{actor} removed group {group} from {file}');
77
+        } else {
78
+            throw new \InvalidArgumentException();
79
+        }
80 80
 
81
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
82
-		$this->setSubjects($event, $subject, $parsedParameters);
81
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
82
+        $this->setSubjects($event, $subject, $parsedParameters);
83 83
 
84
-		return $event;
85
-	}
84
+        return $event;
85
+    }
86 86
 
87
-	protected function getParsedParameters(IEvent $event) {
88
-		$subject = $event->getSubject();
89
-		$parameters = $event->getSubjectParameters();
87
+    protected function getParsedParameters(IEvent $event) {
88
+        $subject = $event->getSubject();
89
+        $parameters = $event->getSubjectParameters();
90 90
 
91
-		switch ($subject) {
92
-			case self::SUBJECT_RESHARED_GROUP_BY:
93
-			case self::SUBJECT_UNSHARED_GROUP_BY:
94
-				return [
95
-					'file' => $this->getFile($parameters[0], $event),
96
-					'group' => [
97
-						'type' => 'group',
98
-						'id' => $parameters[2],
99
-						'name' => $parameters[2],
100
-					],
101
-					'actor' => $this->getUser($parameters[1]),
102
-				];
103
-			case self::SUBJECT_SHARED_GROUP_SELF:
104
-			case self::SUBJECT_UNSHARED_GROUP_SELF:
105
-				return [
106
-					'file' => $this->getFile($parameters[0], $event),
107
-					'group' => [
108
-						'type' => 'group',
109
-						'id' => $parameters[1],
110
-						'name' => $parameters[1],
111
-					],
112
-				];
113
-		}
114
-		return [];
115
-	}
91
+        switch ($subject) {
92
+            case self::SUBJECT_RESHARED_GROUP_BY:
93
+            case self::SUBJECT_UNSHARED_GROUP_BY:
94
+                return [
95
+                    'file' => $this->getFile($parameters[0], $event),
96
+                    'group' => [
97
+                        'type' => 'group',
98
+                        'id' => $parameters[2],
99
+                        'name' => $parameters[2],
100
+                    ],
101
+                    'actor' => $this->getUser($parameters[1]),
102
+                ];
103
+            case self::SUBJECT_SHARED_GROUP_SELF:
104
+            case self::SUBJECT_UNSHARED_GROUP_SELF:
105
+                return [
106
+                    'file' => $this->getFile($parameters[0], $event),
107
+                    'group' => [
108
+                        'type' => 'group',
109
+                        'id' => $parameters[1],
110
+                        'name' => $parameters[1],
111
+                    ],
112
+                ];
113
+        }
114
+        return [];
115
+    }
116 116
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Settings/Shared.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 
28 28
 class Shared implements ISetting {
29 29
 
30
-	/** @var IL10N */
31
-	protected $l;
30
+    /** @var IL10N */
31
+    protected $l;
32 32
 
33
-	/**
34
-	 * @param IL10N $l
35
-	 */
36
-	public function __construct(IL10N $l) {
37
-		$this->l = $l;
38
-	}
33
+    /**
34
+     * @param IL10N $l
35
+     */
36
+    public function __construct(IL10N $l) {
37
+        $this->l = $l;
38
+    }
39 39
 
40
-	/**
41
-	 * @return string Lowercase a-z and underscore only identifier
42
-	 * @since 11.0.0
43
-	 */
44
-	public function getIdentifier() {
45
-		return 'shared';
46
-	}
40
+    /**
41
+     * @return string Lowercase a-z and underscore only identifier
42
+     * @since 11.0.0
43
+     */
44
+    public function getIdentifier() {
45
+        return 'shared';
46
+    }
47 47
 
48
-	/**
49
-	 * @return string A translated string
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getName() {
53
-		return $this->l->t('A file or folder has been <strong>shared</strong>');
54
-	}
48
+    /**
49
+     * @return string A translated string
50
+     * @since 11.0.0
51
+     */
52
+    public function getName() {
53
+        return $this->l->t('A file or folder has been <strong>shared</strong>');
54
+    }
55 55
 
56
-	/**
57
-	 * @return int whether the filter should be rather on the top or bottom of
58
-	 * the admin section. The filters are arranged in ascending order of the
59
-	 * priority values. It is required to return a value between 0 and 100.
60
-	 * @since 11.0.0
61
-	 */
62
-	public function getPriority() {
63
-		return 10;
64
-	}
56
+    /**
57
+     * @return int whether the filter should be rather on the top or bottom of
58
+     * the admin section. The filters are arranged in ascending order of the
59
+     * priority values. It is required to return a value between 0 and 100.
60
+     * @since 11.0.0
61
+     */
62
+    public function getPriority() {
63
+        return 10;
64
+    }
65 65
 
66
-	/**
67
-	 * @return bool True when the option can be changed for the stream
68
-	 * @since 11.0.0
69
-	 */
70
-	public function canChangeStream() {
71
-		return true;
72
-	}
66
+    /**
67
+     * @return bool True when the option can be changed for the stream
68
+     * @since 11.0.0
69
+     */
70
+    public function canChangeStream() {
71
+        return true;
72
+    }
73 73
 
74
-	/**
75
-	 * @return bool True when the option can be changed for the stream
76
-	 * @since 11.0.0
77
-	 */
78
-	public function isDefaultEnabledStream() {
79
-		return true;
80
-	}
74
+    /**
75
+     * @return bool True when the option can be changed for the stream
76
+     * @since 11.0.0
77
+     */
78
+    public function isDefaultEnabledStream() {
79
+        return true;
80
+    }
81 81
 
82
-	/**
83
-	 * @return bool True when the option can be changed for the mail
84
-	 * @since 11.0.0
85
-	 */
86
-	public function canChangeMail() {
87
-		return true;
88
-	}
82
+    /**
83
+     * @return bool True when the option can be changed for the mail
84
+     * @since 11.0.0
85
+     */
86
+    public function canChangeMail() {
87
+        return true;
88
+    }
89 89
 
90
-	/**
91
-	 * @return bool True when the option can be changed for the stream
92
-	 * @since 11.0.0
93
-	 */
94
-	public function isDefaultEnabledMail() {
95
-		return true;
96
-	}
90
+    /**
91
+     * @return bool True when the option can be changed for the stream
92
+     * @since 11.0.0
93
+     */
94
+    public function isDefaultEnabledMail() {
95
+        return true;
96
+    }
97 97
 }
98 98
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Settings/PublicLinks.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 
28 28
 class PublicLinks implements ISetting {
29 29
 
30
-	/** @var IL10N */
31
-	protected $l;
30
+    /** @var IL10N */
31
+    protected $l;
32 32
 
33
-	/**
34
-	 * @param IL10N $l
35
-	 */
36
-	public function __construct(IL10N $l) {
37
-		$this->l = $l;
38
-	}
33
+    /**
34
+     * @param IL10N $l
35
+     */
36
+    public function __construct(IL10N $l) {
37
+        $this->l = $l;
38
+    }
39 39
 
40
-	/**
41
-	 * @return string Lowercase a-z and underscore only identifier
42
-	 * @since 11.0.0
43
-	 */
44
-	public function getIdentifier() {
45
-		return 'public_links';
46
-	}
40
+    /**
41
+     * @return string Lowercase a-z and underscore only identifier
42
+     * @since 11.0.0
43
+     */
44
+    public function getIdentifier() {
45
+        return 'public_links';
46
+    }
47 47
 
48
-	/**
49
-	 * @return string A translated string
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getName() {
53
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
54
-	}
48
+    /**
49
+     * @return string A translated string
50
+     * @since 11.0.0
51
+     */
52
+    public function getName() {
53
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
54
+    }
55 55
 
56
-	/**
57
-	 * @return int whether the filter should be rather on the top or bottom of
58
-	 * the admin section. The filters are arranged in ascending order of the
59
-	 * priority values. It is required to return a value between 0 and 100.
60
-	 * @since 11.0.0
61
-	 */
62
-	public function getPriority() {
63
-		return 20;
64
-	}
56
+    /**
57
+     * @return int whether the filter should be rather on the top or bottom of
58
+     * the admin section. The filters are arranged in ascending order of the
59
+     * priority values. It is required to return a value between 0 and 100.
60
+     * @since 11.0.0
61
+     */
62
+    public function getPriority() {
63
+        return 20;
64
+    }
65 65
 
66
-	/**
67
-	 * @return bool True when the option can be changed for the stream
68
-	 * @since 11.0.0
69
-	 */
70
-	public function canChangeStream() {
71
-		return true;
72
-	}
66
+    /**
67
+     * @return bool True when the option can be changed for the stream
68
+     * @since 11.0.0
69
+     */
70
+    public function canChangeStream() {
71
+        return true;
72
+    }
73 73
 
74
-	/**
75
-	 * @return bool True when the option can be changed for the stream
76
-	 * @since 11.0.0
77
-	 */
78
-	public function isDefaultEnabledStream() {
79
-		return true;
80
-	}
74
+    /**
75
+     * @return bool True when the option can be changed for the stream
76
+     * @since 11.0.0
77
+     */
78
+    public function isDefaultEnabledStream() {
79
+        return true;
80
+    }
81 81
 
82
-	/**
83
-	 * @return bool True when the option can be changed for the mail
84
-	 * @since 11.0.0
85
-	 */
86
-	public function canChangeMail() {
87
-		return true;
88
-	}
82
+    /**
83
+     * @return bool True when the option can be changed for the mail
84
+     * @since 11.0.0
85
+     */
86
+    public function canChangeMail() {
87
+        return true;
88
+    }
89 89
 
90
-	/**
91
-	 * @return bool True when the option can be changed for the stream
92
-	 * @since 11.0.0
93
-	 */
94
-	public function isDefaultEnabledMail() {
95
-		return false;
96
-	}
90
+    /**
91
+     * @return bool True when the option can be changed for the stream
92
+     * @since 11.0.0
93
+     */
94
+    public function isDefaultEnabledMail() {
95
+        return false;
96
+    }
97 97
 }
98 98
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Settings/RemoteShare.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 
28 28
 class RemoteShare implements ISetting {
29 29
 
30
-	/** @var IL10N */
31
-	protected $l;
30
+    /** @var IL10N */
31
+    protected $l;
32 32
 
33
-	/**
34
-	 * @param IL10N $l
35
-	 */
36
-	public function __construct(IL10N $l) {
37
-		$this->l = $l;
38
-	}
33
+    /**
34
+     * @param IL10N $l
35
+     */
36
+    public function __construct(IL10N $l) {
37
+        $this->l = $l;
38
+    }
39 39
 
40
-	/**
41
-	 * @return string Lowercase a-z and underscore only identifier
42
-	 * @since 11.0.0
43
-	 */
44
-	public function getIdentifier() {
45
-		return 'remote_share';
46
-	}
40
+    /**
41
+     * @return string Lowercase a-z and underscore only identifier
42
+     * @since 11.0.0
43
+     */
44
+    public function getIdentifier() {
45
+        return 'remote_share';
46
+    }
47 47
 
48
-	/**
49
-	 * @return string A translated string
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getName() {
53
-		return $this->l->t('A file or folder was shared from <strong>another server</strong>');
54
-	}
48
+    /**
49
+     * @return string A translated string
50
+     * @since 11.0.0
51
+     */
52
+    public function getName() {
53
+        return $this->l->t('A file or folder was shared from <strong>another server</strong>');
54
+    }
55 55
 
56
-	/**
57
-	 * @return int whether the filter should be rather on the top or bottom of
58
-	 * the admin section. The filters are arranged in ascending order of the
59
-	 * priority values. It is required to return a value between 0 and 100.
60
-	 * @since 11.0.0
61
-	 */
62
-	public function getPriority() {
63
-		return 11;
64
-	}
56
+    /**
57
+     * @return int whether the filter should be rather on the top or bottom of
58
+     * the admin section. The filters are arranged in ascending order of the
59
+     * priority values. It is required to return a value between 0 and 100.
60
+     * @since 11.0.0
61
+     */
62
+    public function getPriority() {
63
+        return 11;
64
+    }
65 65
 
66
-	/**
67
-	 * @return bool True when the option can be changed for the stream
68
-	 * @since 11.0.0
69
-	 */
70
-	public function canChangeStream() {
71
-		return true;
72
-	}
66
+    /**
67
+     * @return bool True when the option can be changed for the stream
68
+     * @since 11.0.0
69
+     */
70
+    public function canChangeStream() {
71
+        return true;
72
+    }
73 73
 
74
-	/**
75
-	 * @return bool True when the option can be changed for the stream
76
-	 * @since 11.0.0
77
-	 */
78
-	public function isDefaultEnabledStream() {
79
-		return true;
80
-	}
74
+    /**
75
+     * @return bool True when the option can be changed for the stream
76
+     * @since 11.0.0
77
+     */
78
+    public function isDefaultEnabledStream() {
79
+        return true;
80
+    }
81 81
 
82
-	/**
83
-	 * @return bool True when the option can be changed for the mail
84
-	 * @since 11.0.0
85
-	 */
86
-	public function canChangeMail() {
87
-		return true;
88
-	}
82
+    /**
83
+     * @return bool True when the option can be changed for the mail
84
+     * @since 11.0.0
85
+     */
86
+    public function canChangeMail() {
87
+        return true;
88
+    }
89 89
 
90
-	/**
91
-	 * @return bool True when the option can be changed for the stream
92
-	 * @since 11.0.0
93
-	 */
94
-	public function isDefaultEnabledMail() {
95
-		return true;
96
-	}
90
+    /**
91
+     * @return bool True when the option can be changed for the stream
92
+     * @since 11.0.0
93
+     */
94
+    public function isDefaultEnabledMail() {
95
+        return true;
96
+    }
97 97
 }
98 98
 
Please login to merge, or discard this patch.