Completed
Push — master ( c65848...a5c801 )
by Blizzz
112:32 queued 99:32
created
apps/dav/appinfo/v1/publicwebdav.php 2 patches
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -38,20 +38,20 @@  discard block
 block discarded – undo
38 38
 
39 39
 // Backends
40 40
 $authBackend = new OCA\DAV\Connector\PublicAuth(
41
-	\OC::$server->getRequest(),
42
-	\OC::$server->getShareManager(),
43
-	\OC::$server->getSession()
41
+    \OC::$server->getRequest(),
42
+    \OC::$server->getShareManager(),
43
+    \OC::$server->getSession()
44 44
 );
45 45
 
46 46
 $serverFactory = new OCA\DAV\Connector\Sabre\ServerFactory(
47
-	\OC::$server->getConfig(),
48
-	\OC::$server->getLogger(),
49
-	\OC::$server->getDatabaseConnection(),
50
-	\OC::$server->getUserSession(),
51
-	\OC::$server->getMountManager(),
52
-	\OC::$server->getTagManager(),
53
-	\OC::$server->getRequest(),
54
-	\OC::$server->getPreviewManager()
47
+    \OC::$server->getConfig(),
48
+    \OC::$server->getLogger(),
49
+    \OC::$server->getDatabaseConnection(),
50
+    \OC::$server->getUserSession(),
51
+    \OC::$server->getMountManager(),
52
+    \OC::$server->getTagManager(),
53
+    \OC::$server->getRequest(),
54
+    \OC::$server->getPreviewManager()
55 55
 );
56 56
 
57 57
 $requestUri = \OC::$server->getRequest()->getRequestUri();
@@ -60,41 +60,41 @@  discard block
 block discarded – undo
60 60
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
61 61
 
62 62
 $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
63
-	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
64
-	$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
65
-	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
66
-	if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
67
-		// this is what is thrown when trying to access a non-existing share
68
-		throw new \Sabre\DAV\Exception\NotAuthenticated();
69
-	}
70
-
71
-	$share = $authBackend->getShare();
72
-	$owner = $share->getShareOwner();
73
-	$isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
74
-	$fileId = $share->getNodeId();
75
-
76
-	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
77
-	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
78
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
79
-		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
80
-	});
81
-	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
82
-
83
-	OC_Util::setupFS($owner);
84
-	$ownerView = \OC\Files\Filesystem::getView();
85
-	$path = $ownerView->getPath($fileId);
86
-	$fileInfo = $ownerView->getFileInfo($path);
87
-	$linkCheckPlugin->setFileInfo($fileInfo);
88
-
89
-	// If not readble (files_drop) enable the filesdrop plugin
90
-	if (!$isReadable) {
91
-		$filesDropPlugin->enable();
92
-	}
93
-
94
-	$view = new \OC\Files\View($ownerView->getAbsolutePath($path));
95
-	$filesDropPlugin->setView($view);
96
-
97
-	return $view;
63
+    $isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
64
+    $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
65
+    $federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
66
+    if ($federatedShareProvider->isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
67
+        // this is what is thrown when trying to access a non-existing share
68
+        throw new \Sabre\DAV\Exception\NotAuthenticated();
69
+    }
70
+
71
+    $share = $authBackend->getShare();
72
+    $owner = $share->getShareOwner();
73
+    $isReadable = $share->getPermissions() & \OCP\Constants::PERMISSION_READ;
74
+    $fileId = $share->getNodeId();
75
+
76
+    // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
77
+    $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
78
+    \OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
79
+        return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
80
+    });
81
+    \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
82
+
83
+    OC_Util::setupFS($owner);
84
+    $ownerView = \OC\Files\Filesystem::getView();
85
+    $path = $ownerView->getPath($fileId);
86
+    $fileInfo = $ownerView->getFileInfo($path);
87
+    $linkCheckPlugin->setFileInfo($fileInfo);
88
+
89
+    // If not readble (files_drop) enable the filesdrop plugin
90
+    if (!$isReadable) {
91
+        $filesDropPlugin->enable();
92
+    }
93
+
94
+    $view = new \OC\Files\View($ownerView->getAbsolutePath($path));
95
+    $filesDropPlugin->setView($view);
96
+
97
+    return $view;
98 98
 });
99 99
 
100 100
 $server->addPlugin($linkCheckPlugin);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 $linkCheckPlugin = new \OCA\DAV\Files\Sharing\PublicLinkCheckPlugin();
60 60
 $filesDropPlugin = new \OCA\DAV\Files\Sharing\FilesDropPlugin();
61 61
 
62
-$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
62
+$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function(\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin, $filesDropPlugin) {
63 63
 	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
64 64
 	$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
65 65
 	$federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
 	// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
77 77
 	$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
78
-	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
78
+	\OC\Files\Filesystem::addStorageWrapper('sharePermissions', function($mountPoint, $storage) use ($share) {
79 79
 		return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE));
80 80
 	});
81 81
 	\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
Please login to merge, or discard this patch.
apps/dav/appinfo/app.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -30,27 +30,27 @@
 block discarded – undo
30 30
 $app->registerHooks();
31 31
 
32 32
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
33
-	return $app->getSyncService();
33
+    return $app->getSyncService();
34 34
 });
35 35
 
36 36
 $eventDispatcher = \OC::$server->getEventDispatcher();
37 37
 
38 38
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
39
-	function(GenericEvent $event) use ($app) {
40
-		/** @var CardDavBackend $cardDavBackend */
41
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
42
-		$addressBookUri = $event->getSubject();
43
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
44
-		if (!is_null($addressBook)) {
45
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
46
-		}
47
-	}
39
+    function(GenericEvent $event) use ($app) {
40
+        /** @var CardDavBackend $cardDavBackend */
41
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
42
+        $addressBookUri = $event->getSubject();
43
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
44
+        if (!is_null($addressBook)) {
45
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
46
+        }
47
+    }
48 48
 );
49 49
 
50 50
 $cm = \OC::$server->getContactsManager();
51 51
 $cm->register(function() use ($cm, $app) {
52
-	$user = \OC::$server->getUserSession()->getUser();
53
-	if (!is_null($user)) {
54
-		$app->setupContactsProvider($cm, $user->getUID());
55
-	}
52
+    $user = \OC::$server->getUserSession()->getUser();
53
+    if (!is_null($user)) {
54
+        $app->setupContactsProvider($cm, $user->getUID());
55
+    }
56 56
 });
Please login to merge, or discard this patch.
apps/dav/bin/chunkperf.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 require '../../../../3rdparty/autoload.php';
24 24
 
25 25
 if ($argc !== 6) {
26
-	echo "Invalid number of arguments" . PHP_EOL;
27
-	exit;
26
+    echo "Invalid number of arguments" . PHP_EOL;
27
+    exit;
28 28
 }
29 29
 
30 30
 /**
@@ -33,15 +33,15 @@  discard block
 block discarded – undo
33 33
  * @return mixed
34 34
  */
35 35
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
36
-	echo "$method $uploadUrl ... ";
37
-	$t0 = microtime(true);
38
-	$result = $client->request($method, $uploadUrl, $data, $headers);
39
-	$t1 = microtime(true);
40
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
41
-	if (!in_array($result['statusCode'],  [200, 201])) {
42
-		echo $result['body'] . PHP_EOL;
43
-	}
44
-	return $result;
36
+    echo "$method $uploadUrl ... ";
37
+    $t0 = microtime(true);
38
+    $result = $client->request($method, $uploadUrl, $data, $headers);
39
+    $t1 = microtime(true);
40
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
41
+    if (!in_array($result['statusCode'],  [200, 201])) {
42
+        echo $result['body'] . PHP_EOL;
43
+    }
44
+    return $result;
45 45
 }
46 46
 
47 47
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@  discard block
 block discarded – undo
51 51
 $chunkSize = $argv[5] * 1024 * 1024;
52 52
 
53 53
 $client = new \Sabre\DAV\Client([
54
-	'baseUri' => $baseUri,
55
-	'userName' => $userName,
56
-	'password' => $password
54
+    'baseUri' => $baseUri,
55
+    'userName' => $userName,
56
+    'password' => $password
57 57
 ]);
58 58
 
59 59
 $transfer = uniqid('transfer', true);
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
 
67 67
 $index = 0;
68 68
 while(!feof($stream)) {
69
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
70
-	$index++;
69
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
70
+    $index++;
71 71
 }
72 72
 
73 73
 $destination = pathinfo($file, PATHINFO_BASENAME);
74 74
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
75 75
 request($client, 'MOVE', "$uploadUrl/.file", null, [
76
-	'Destination' => "$baseUri/files/$userName/$destination"
76
+    'Destination' => "$baseUri/files/$userName/$destination"
77 77
 ]);
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 require '../../../../3rdparty/autoload.php';
24 24
 
25 25
 if ($argc !== 6) {
26
-	echo "Invalid number of arguments" . PHP_EOL;
26
+	echo "Invalid number of arguments".PHP_EOL;
27 27
 	exit;
28 28
 }
29 29
 
@@ -37,9 +37,9 @@  discard block
 block discarded – undo
37 37
 	$t0 = microtime(true);
38 38
 	$result = $client->request($method, $uploadUrl, $data, $headers);
39 39
 	$t1 = microtime(true);
40
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
41
-	if (!in_array($result['statusCode'],  [200, 201])) {
42
-		echo $result['body'] . PHP_EOL;
40
+	echo $result['statusCode']." - ".($t1 - $t0).' seconds'.PHP_EOL;
41
+	if (!in_array($result['statusCode'], [200, 201])) {
42
+		echo $result['body'].PHP_EOL;
43 43
 	}
44 44
 	return $result;
45 45
 }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 $stream = fopen($file, 'r');
66 66
 
67 67
 $index = 0;
68
-while(!feof($stream)) {
68
+while (!feof($stream)) {
69 69
 	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
70 70
 	$index++;
71 71
 }
Please login to merge, or discard this patch.
apps/admin_audit/lib/auditlogger.php 2 patches
Indentation   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -40,149 +40,149 @@
 block discarded – undo
40 40
 
41 41
 class AuditLogger {
42 42
 
43
-	/** @var ILogger */
44
-	private $logger;
43
+    /** @var ILogger */
44
+    private $logger;
45 45
 
46
-	/** @var IUserSession */
47
-	private $userSession;
46
+    /** @var IUserSession */
47
+    private $userSession;
48 48
 	
49
-	/** @var IGroupManager */
50
-	private $groupManager;
51
-
52
-	/**
53
-	 * AuditLogger constructor.
54
-	 *
55
-	 * @param ILogger $logger
56
-	 * @param IUserSession $userSession
57
-	 * @param IGroupManager $groupManager
58
-	 */
59
-	public function __construct(ILogger $logger,
60
-								IUserSession $userSession, 
61
-								IGroupManager $groupManager) {
62
-		$this->logger = $logger;
63
-		$this->userSession = $userSession;
64
-		$this->groupManager = $groupManager;
65
-	}
66
-
67
-	/**
68
-	 * register hooks in order to log them
69
-	 */
70
-	public function registerHooks() {
71
-		$this->userManagementHooks();
72
-		$this->groupHooks();
73
-		$this->sharingHooks();
74
-		$this->authHooks();
75
-		$this->fileHooks();
76
-		$this->trashbinHooks();
77
-		$this->versionsHooks();
78
-	}
79
-
80
-	/**
81
-	 * connect to user management hooks
82
-	 */
83
-	private function userManagementHooks() {
84
-		$userActions = new UserManagement($this->logger);
85
-
86
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
87
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
88
-		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
89
-	}
49
+    /** @var IGroupManager */
50
+    private $groupManager;
51
+
52
+    /**
53
+     * AuditLogger constructor.
54
+     *
55
+     * @param ILogger $logger
56
+     * @param IUserSession $userSession
57
+     * @param IGroupManager $groupManager
58
+     */
59
+    public function __construct(ILogger $logger,
60
+                                IUserSession $userSession, 
61
+                                IGroupManager $groupManager) {
62
+        $this->logger = $logger;
63
+        $this->userSession = $userSession;
64
+        $this->groupManager = $groupManager;
65
+    }
66
+
67
+    /**
68
+     * register hooks in order to log them
69
+     */
70
+    public function registerHooks() {
71
+        $this->userManagementHooks();
72
+        $this->groupHooks();
73
+        $this->sharingHooks();
74
+        $this->authHooks();
75
+        $this->fileHooks();
76
+        $this->trashbinHooks();
77
+        $this->versionsHooks();
78
+    }
79
+
80
+    /**
81
+     * connect to user management hooks
82
+     */
83
+    private function userManagementHooks() {
84
+        $userActions = new UserManagement($this->logger);
85
+
86
+        Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
87
+        Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
88
+        $this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
89
+    }
90 90
 	
91
-	private function groupHooks()  {
92
-		$groupActions = new GroupManagement($this->logger);
93
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
94
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
95
-	}
96
-
97
-	/**
98
-	 * connect to sharing events
99
-	 */
100
-	private function sharingHooks() {
101
-		$shareActions = new Sharing($this->logger);
102
-
103
-		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
104
-		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
105
-		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
106
-		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
107
-		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
108
-		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
109
-	}
110
-
111
-	/**
112
-	 * connect to authentication event and related actions
113
-	 */
114
-	private function authHooks() {
115
-		$authActions = new Auth($this->logger);
116
-
117
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
118
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
119
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
120
-	}
121
-
122
-
123
-	/**
124
-	 * connect to file hooks
125
-	 */
126
-	private function fileHooks() {
127
-		$fileActions = new Files($this->logger);
128
-
129
-		Util::connectHook(
130
-			Filesystem::CLASSNAME,
131
-			Filesystem::signal_post_rename,
132
-			$fileActions,
133
-			'rename'
134
-		);
135
-		Util::connectHook(
136
-			Filesystem::CLASSNAME,
137
-			Filesystem::signal_post_create,
138
-			$fileActions,
139
-			'create'
140
-		);
141
-		Util::connectHook(
142
-			Filesystem::CLASSNAME,
143
-			Filesystem::signal_post_copy,
144
-			$fileActions,
145
-			'copy'
146
-		);
147
-		Util::connectHook(
148
-			Filesystem::CLASSNAME,
149
-			Filesystem::signal_post_write,
150
-			$fileActions,
151
-			'write'
152
-		);
153
-		Util::connectHook(
154
-			Filesystem::CLASSNAME,
155
-			Filesystem::signal_post_update,
156
-			$fileActions,
157
-			'update'
158
-		);
159
-		Util::connectHook(
160
-			Filesystem::CLASSNAME,
161
-			Filesystem::signal_read,
162
-			$fileActions,
163
-			'read'
164
-		);
165
-		Util::connectHook(
166
-			Filesystem::CLASSNAME,
167
-			Filesystem::signal_delete,
168
-			$fileActions,
169
-			'delete'
170
-		);
171
-	}
172
-
173
-	public function versionsHooks() {
174
-		$versionsActions = new Versions($this->logger);
175
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
176
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
177
-	}
178
-
179
-	/**
180
-	 * connect to trash bin hooks
181
-	 */
182
-	private function trashbinHooks() {
183
-		$trashActions = new Trashbin($this->logger);
184
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
185
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
186
-	}
91
+    private function groupHooks()  {
92
+        $groupActions = new GroupManagement($this->logger);
93
+        $this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
94
+        $this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
95
+    }
96
+
97
+    /**
98
+     * connect to sharing events
99
+     */
100
+    private function sharingHooks() {
101
+        $shareActions = new Sharing($this->logger);
102
+
103
+        Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
104
+        Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
105
+        Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
106
+        Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
107
+        Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
108
+        Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
109
+    }
110
+
111
+    /**
112
+     * connect to authentication event and related actions
113
+     */
114
+    private function authHooks() {
115
+        $authActions = new Auth($this->logger);
116
+
117
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
118
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
119
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
120
+    }
121
+
122
+
123
+    /**
124
+     * connect to file hooks
125
+     */
126
+    private function fileHooks() {
127
+        $fileActions = new Files($this->logger);
128
+
129
+        Util::connectHook(
130
+            Filesystem::CLASSNAME,
131
+            Filesystem::signal_post_rename,
132
+            $fileActions,
133
+            'rename'
134
+        );
135
+        Util::connectHook(
136
+            Filesystem::CLASSNAME,
137
+            Filesystem::signal_post_create,
138
+            $fileActions,
139
+            'create'
140
+        );
141
+        Util::connectHook(
142
+            Filesystem::CLASSNAME,
143
+            Filesystem::signal_post_copy,
144
+            $fileActions,
145
+            'copy'
146
+        );
147
+        Util::connectHook(
148
+            Filesystem::CLASSNAME,
149
+            Filesystem::signal_post_write,
150
+            $fileActions,
151
+            'write'
152
+        );
153
+        Util::connectHook(
154
+            Filesystem::CLASSNAME,
155
+            Filesystem::signal_post_update,
156
+            $fileActions,
157
+            'update'
158
+        );
159
+        Util::connectHook(
160
+            Filesystem::CLASSNAME,
161
+            Filesystem::signal_read,
162
+            $fileActions,
163
+            'read'
164
+        );
165
+        Util::connectHook(
166
+            Filesystem::CLASSNAME,
167
+            Filesystem::signal_delete,
168
+            $fileActions,
169
+            'delete'
170
+        );
171
+    }
172
+
173
+    public function versionsHooks() {
174
+        $versionsActions = new Versions($this->logger);
175
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
176
+        Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
177
+    }
178
+
179
+    /**
180
+     * connect to trash bin hooks
181
+     */
182
+    private function trashbinHooks() {
183
+        $trashActions = new Trashbin($this->logger);
184
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
185
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
186
+    }
187 187
 
188 188
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,15 +83,15 @@  discard block
 block discarded – undo
83 83
 	private function userManagementHooks() {
84 84
 		$userActions = new UserManagement($this->logger);
85 85
 
86
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
87
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
86
+		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
87
+		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
88 88
 		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
89 89
 	}
90 90
 	
91
-	private function groupHooks()  {
91
+	private function groupHooks() {
92 92
 		$groupActions = new GroupManagement($this->logger);
93
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
94
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
93
+		$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
94
+		$this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
95 95
 	}
96 96
 
97 97
 	/**
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	public function versionsHooks() {
174 174
 		$versionsActions = new Versions($this->logger);
175 175
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
176
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
176
+		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
177 177
 	}
178 178
 
179 179
 	/**
Please login to merge, or discard this patch.
apps/admin_audit/lib/actions/groupmanagement.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -37,40 +37,40 @@
 block discarded – undo
37 37
  */
38 38
 class GroupManagement extends Action {
39 39
 
40
-	/**
41
-	 * log add user to group event
42
-	 *
43
-	 * @param IGroup $group
44
-	 * @param IUser $user
45
-	 */
46
-	public function addUser(IGroup $group, IUser $user) {
47
-		$this->log('User "%s" added to group "%s"',
48
-			[
49
-				'group' => $group->getGID(),
50
-				'user' => $user->getUID()
51
-			],
52
-			[
53
-				'user', 'group'
54
-			]
55
-		);
56
-	}
40
+    /**
41
+     * log add user to group event
42
+     *
43
+     * @param IGroup $group
44
+     * @param IUser $user
45
+     */
46
+    public function addUser(IGroup $group, IUser $user) {
47
+        $this->log('User "%s" added to group "%s"',
48
+            [
49
+                'group' => $group->getGID(),
50
+                'user' => $user->getUID()
51
+            ],
52
+            [
53
+                'user', 'group'
54
+            ]
55
+        );
56
+    }
57 57
 
58
-	/**
59
-	 * log remove user from group event
60
-	 *
61
-	 * @param IGroup $group
62
-	 * @param IUser $user
63
-	 */
64
-	public function removeUser(IGroup $group, IUser $user) {
65
-		$this->log('User "%s" removed from group "%s"',
66
-			[
67
-				'group' => $group->getGID(),
68
-				'user' => $user->getUID()
69
-			],
70
-			[
71
-				'user', 'group'
72
-			]
73
-		);
74
-	}
58
+    /**
59
+     * log remove user from group event
60
+     *
61
+     * @param IGroup $group
62
+     * @param IUser $user
63
+     */
64
+    public function removeUser(IGroup $group, IUser $user) {
65
+        $this->log('User "%s" removed from group "%s"',
66
+            [
67
+                'group' => $group->getGID(),
68
+                'user' => $user->getUID()
69
+            ],
70
+            [
71
+                'user', 'group'
72
+            ]
73
+        );
74
+    }
75 75
 
76 76
 }
Please login to merge, or discard this patch.
apps/admin_audit/lib/actions/usermanagement.php 2 patches
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -30,52 +30,52 @@
 block discarded – undo
30 30
  * @package OCA\Admin_Audit\Actions
31 31
  */
32 32
 class UserManagement extends Action {
33
-	/**
34
-	 * Log creation of users
35
-	 *
36
-	 * @param array $params
37
-	 */
38
-	public function create(array $params) {
39
-		$this->log(
40
-			'User created: "%s"',
41
-			$params,
42
-			[
43
-				'uid',
44
-			]
45
-		);
46
-	}
33
+    /**
34
+     * Log creation of users
35
+     *
36
+     * @param array $params
37
+     */
38
+    public function create(array $params) {
39
+        $this->log(
40
+            'User created: "%s"',
41
+            $params,
42
+            [
43
+                'uid',
44
+            ]
45
+        );
46
+    }
47 47
 
48
-	/**
49
-	 * Log deletion of users
50
-	 *
51
-	 * @param array $params
52
-	 */
53
-	public function delete(array $params) {
54
-		$this->log(
55
-			'User deleted: "%s"',
56
-			$params,
57
-			[
58
-				'uid',
59
-			]
60
-		);
61
-	}
48
+    /**
49
+     * Log deletion of users
50
+     *
51
+     * @param array $params
52
+     */
53
+    public function delete(array $params) {
54
+        $this->log(
55
+            'User deleted: "%s"',
56
+            $params,
57
+            [
58
+                'uid',
59
+            ]
60
+        );
61
+    }
62 62
 
63
-	/**
64
-	 * Logs changing of the user scope
65
-	 *
66
-	 * @param IUser $user
67
-	 */
68
-	public function setPassword(IUser $user) {
69
-		if($user->getBackendClassName() === 'Database') {
70
-			$this->log(
71
-				'Password of user "%s" has been changed',
72
-				[
73
-					'user' => $user->getUID(),
74
-				],
75
-				[
76
-					'user',
77
-				]
78
-			);
79
-		}
80
-	}
63
+    /**
64
+     * Logs changing of the user scope
65
+     *
66
+     * @param IUser $user
67
+     */
68
+    public function setPassword(IUser $user) {
69
+        if($user->getBackendClassName() === 'Database') {
70
+            $this->log(
71
+                'Password of user "%s" has been changed',
72
+                [
73
+                    'user' => $user->getUID(),
74
+                ],
75
+                [
76
+                    'user',
77
+                ]
78
+            );
79
+        }
80
+    }
81 81
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 	 * @param IUser $user
67 67
 	 */
68 68
 	public function setPassword(IUser $user) {
69
-		if($user->getBackendClassName() === 'Database') {
69
+		if ($user->getBackendClassName() === 'Database') {
70 70
 			$this->log(
71 71
 				'Password of user "%s" has been changed',
72 72
 				[
Please login to merge, or discard this patch.
apps/admin_audit/lib/actions/action.php 2 patches
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -25,64 +25,64 @@
 block discarded – undo
25 25
 use OCP\ILogger;
26 26
 
27 27
 class Action {
28
-	/** @var ILogger */
29
-	private $logger;
28
+    /** @var ILogger */
29
+    private $logger;
30 30
 
31
-	/**
32
-	 * @param ILogger $logger
33
-	 */
34
-	public function __construct(ILogger $logger) {
35
-		$this->logger = $logger;
36
-	}
31
+    /**
32
+     * @param ILogger $logger
33
+     */
34
+    public function __construct(ILogger $logger) {
35
+        $this->logger = $logger;
36
+    }
37 37
 
38
-	/**
39
-	 * Log a single action with a log level of info
40
-	 *
41
-	 * @param string $text
42
-	 * @param array $params
43
-	 * @param array $elements
44
-	 * @param bool $obfuscateParameters
45
-	 */
46
-	public function log($text,
47
-						array $params,
48
-						array $elements,
49
-						$obfuscateParameters = false) {
50
-		foreach($elements as $element) {
51
-			if(!isset($params[$element])) {
52
-				if ($obfuscateParameters) {
53
-					$this->logger->critical(
54
-						'$params["'.$element.'"] was missing.',
55
-						['app' => 'admin_audit']
56
-					);
57
-				} else {
58
-					$this->logger->critical(
59
-						sprintf(
60
-							'$params["'.$element.'"] was missing. Transferred value: %s',
61
-							print_r($params, true)
62
-						),
63
-						['app' => 'admin_audit']
64
-					);
65
-				}
66
-				return;
67
-			}
68
-		}
38
+    /**
39
+     * Log a single action with a log level of info
40
+     *
41
+     * @param string $text
42
+     * @param array $params
43
+     * @param array $elements
44
+     * @param bool $obfuscateParameters
45
+     */
46
+    public function log($text,
47
+                        array $params,
48
+                        array $elements,
49
+                        $obfuscateParameters = false) {
50
+        foreach($elements as $element) {
51
+            if(!isset($params[$element])) {
52
+                if ($obfuscateParameters) {
53
+                    $this->logger->critical(
54
+                        '$params["'.$element.'"] was missing.',
55
+                        ['app' => 'admin_audit']
56
+                    );
57
+                } else {
58
+                    $this->logger->critical(
59
+                        sprintf(
60
+                            '$params["'.$element.'"] was missing. Transferred value: %s',
61
+                            print_r($params, true)
62
+                        ),
63
+                        ['app' => 'admin_audit']
64
+                    );
65
+                }
66
+                return;
67
+            }
68
+        }
69 69
 
70
-		$replaceArray = [];
71
-		foreach($elements as $element) {
72
-			if($params[$element] instanceof \DateTime) {
73
-				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
74
-			}
75
-			$replaceArray[] = $params[$element];
76
-		}
70
+        $replaceArray = [];
71
+        foreach($elements as $element) {
72
+            if($params[$element] instanceof \DateTime) {
73
+                $params[$element] = $params[$element]->format('Y-m-d H:i:s');
74
+            }
75
+            $replaceArray[] = $params[$element];
76
+        }
77 77
 
78
-		$this->logger->info(
79
-			vsprintf(
80
-				$text,
81
-				$replaceArray
82
-			),
83
-			[
84
-				'app' => 'admin_audit'
85
-			]
86
-		);
87
-	}
78
+        $this->logger->info(
79
+            vsprintf(
80
+                $text,
81
+                $replaceArray
82
+            ),
83
+            [
84
+                'app' => 'admin_audit'
85
+            ]
86
+        );
87
+    }
88 88
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 						array $params,
48 48
 						array $elements,
49 49
 						$obfuscateParameters = false) {
50
-		foreach($elements as $element) {
51
-			if(!isset($params[$element])) {
50
+		foreach ($elements as $element) {
51
+			if (!isset($params[$element])) {
52 52
 				if ($obfuscateParameters) {
53 53
 					$this->logger->critical(
54 54
 						'$params["'.$element.'"] was missing.',
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 		}
69 69
 
70 70
 		$replaceArray = [];
71
-		foreach($elements as $element) {
72
-			if($params[$element] instanceof \DateTime) {
71
+		foreach ($elements as $element) {
72
+			if ($params[$element] instanceof \DateTime) {
73 73
 				$params[$element] = $params[$element]->format('Y-m-d H:i:s');
74 74
 			}
75 75
 			$replaceArray[] = $params[$element];
Please login to merge, or discard this patch.
apps/admin_audit/lib/actions/files.php 1 patch
Indentation   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -28,110 +28,110 @@
 block discarded – undo
28 28
  * @package OCA\Admin_Audit\Actions
29 29
  */
30 30
 class Files extends Action {
31
-	/**
32
-	 * Logs file read actions
33
-	 *
34
-	 * @param array $params
35
-	 */
36
-	public function read(array $params) {
37
-		$this->log(
38
-			'File accessed: "%s"',
39
-			$params,
40
-			[
41
-				'path',
42
-			]
43
-		);
44
-	}
31
+    /**
32
+     * Logs file read actions
33
+     *
34
+     * @param array $params
35
+     */
36
+    public function read(array $params) {
37
+        $this->log(
38
+            'File accessed: "%s"',
39
+            $params,
40
+            [
41
+                'path',
42
+            ]
43
+        );
44
+    }
45 45
 
46
-	/**
47
-	 * Logs rename actions of files
48
-	 *
49
-	 * @param array $params
50
-	 */
51
-	public function rename(array $params) {
52
-		$this->log(
53
-			'File renamed: "%s" to "%s"',
54
-			$params,
55
-			[
56
-				'oldpath',
57
-				'newpath',
58
-			]
59
-		);
60
-	}
46
+    /**
47
+     * Logs rename actions of files
48
+     *
49
+     * @param array $params
50
+     */
51
+    public function rename(array $params) {
52
+        $this->log(
53
+            'File renamed: "%s" to "%s"',
54
+            $params,
55
+            [
56
+                'oldpath',
57
+                'newpath',
58
+            ]
59
+        );
60
+    }
61 61
 
62
-	/**
63
-	 * Logs creation of files
64
-	 *
65
-	 * @param array $params
66
-	 */
67
-	public function create(array $params) {
68
-		$this->log(
69
-			'File created: "%s"',
70
-			$params,
71
-			[
72
-				'path',
73
-			]
74
-		);
75
-	}
62
+    /**
63
+     * Logs creation of files
64
+     *
65
+     * @param array $params
66
+     */
67
+    public function create(array $params) {
68
+        $this->log(
69
+            'File created: "%s"',
70
+            $params,
71
+            [
72
+                'path',
73
+            ]
74
+        );
75
+    }
76 76
 
77
-	/**
78
-	 * Logs copying of files
79
-	 *
80
-	 * @param array $params
81
-	 */
82
-	public function copy(array $params) {
83
-		$this->log(
84
-			'File copied: "%s" to "%s"',
85
-			$params,
86
-			[
87
-				'oldpath',
88
-				'newpath',
89
-			]
90
-		);
91
-	}
77
+    /**
78
+     * Logs copying of files
79
+     *
80
+     * @param array $params
81
+     */
82
+    public function copy(array $params) {
83
+        $this->log(
84
+            'File copied: "%s" to "%s"',
85
+            $params,
86
+            [
87
+                'oldpath',
88
+                'newpath',
89
+            ]
90
+        );
91
+    }
92 92
 
93
-	/**
94
-	 * Logs writing of files
95
-	 *
96
-	 * @param array $params
97
-	 */
98
-	public function write(array $params) {
99
-		$this->log(
100
-			'File written to: "%s"',
101
-			$params,
102
-			[
103
-				'path',
104
-			]
105
-		);
106
-	}
93
+    /**
94
+     * Logs writing of files
95
+     *
96
+     * @param array $params
97
+     */
98
+    public function write(array $params) {
99
+        $this->log(
100
+            'File written to: "%s"',
101
+            $params,
102
+            [
103
+                'path',
104
+            ]
105
+        );
106
+    }
107 107
 
108
-	/**
109
-	 * Logs update of files
110
-	 *
111
-	 * @param array $params
112
-	 */
113
-	public function update(array $params) {
114
-		$this->log(
115
-			'File updated: "%s"',
116
-			$params,
117
-			[
118
-				'path',
119
-			]
120
-		);
121
-	}
108
+    /**
109
+     * Logs update of files
110
+     *
111
+     * @param array $params
112
+     */
113
+    public function update(array $params) {
114
+        $this->log(
115
+            'File updated: "%s"',
116
+            $params,
117
+            [
118
+                'path',
119
+            ]
120
+        );
121
+    }
122 122
 
123
-	/**
124
-	 * Logs deletions of files
125
-	 *
126
-	 * @param array $params
127
-	 */
128
-	public function delete(array $params) {
129
-		$this->log(
130
-			'File deleted: "%s"',
131
-			$params,
132
-			[
133
-				'path',
134
-			]
135
-		);
136
-	}
123
+    /**
124
+     * Logs deletions of files
125
+     *
126
+     * @param array $params
127
+     */
128
+    public function delete(array $params) {
129
+        $this->log(
130
+            'File deleted: "%s"',
131
+            $params,
132
+            [
133
+                'path',
134
+            ]
135
+        );
136
+    }
137 137
 }
Please login to merge, or discard this patch.
apps/admin_audit/lib/actions/auth.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -28,33 +28,33 @@
 block discarded – undo
28 28
  * @package OCA\Admin_Audit\Actions
29 29
  */
30 30
 class Auth extends Action {
31
-	public function loginAttempt(array $params) {
32
-		$this->log(
33
-			'Login attempt: "%s"',
34
-			$params,
35
-			[
36
-				'uid',
37
-			],
38
-			true
39
-		);
40
-	}
31
+    public function loginAttempt(array $params) {
32
+        $this->log(
33
+            'Login attempt: "%s"',
34
+            $params,
35
+            [
36
+                'uid',
37
+            ],
38
+            true
39
+        );
40
+    }
41 41
 
42
-	public function loginSuccessful(array $params) {
43
-		$this->log(
44
-			'Login successful: "%s"',
45
-			$params,
46
-			[
47
-				'uid',
48
-			],
49
-			true
50
-		);
51
-	}
42
+    public function loginSuccessful(array $params) {
43
+        $this->log(
44
+            'Login successful: "%s"',
45
+            $params,
46
+            [
47
+                'uid',
48
+            ],
49
+            true
50
+        );
51
+    }
52 52
 
53
-	public function logout(array $params) {
54
-		$this->log(
55
-			'Logout occurred',
56
-			[],
57
-			[]
58
-		);
59
-	}
53
+    public function logout(array $params) {
54
+        $this->log(
55
+            'Logout occurred',
56
+            [],
57
+            []
58
+        );
59
+    }
60 60
 }
Please login to merge, or discard this patch.