nextcloud / server

apps/admin_audit/lib/Actions/GroupManagement.php

Indentation +64 added lines, -64 removed lines

@@ -38,71 +38,71 @@
  */
 class GroupManagement extends Action {
 
-	/**
-	 * log add user to group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function addUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" added to group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log add user to group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function addUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" added to group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 
-	/**
-	 * log remove user from group event
-	 *
-	 * @param IGroup $group
-	 * @param IUser $user
-	 */
-	public function removeUser(IGroup $group, IUser $user) {
-		$this->log('User "%s" removed from group "%s"',
-			[
-				'group' => $group->getGID(),
-				'user' => $user->getUID()
-			],
-			[
-				'user', 'group'
-			]
-		);
-	}
+    /**
+     * log remove user from group event
+     *
+     * @param IGroup $group
+     * @param IUser $user
+     */
+    public function removeUser(IGroup $group, IUser $user) {
+        $this->log('User "%s" removed from group "%s"',
+            [
+                'group' => $group->getGID(),
+                'user' => $user->getUID()
+            ],
+            [
+                'user', 'group'
+            ]
+        );
+    }
 	
-	/**
-	 * log create group to group event
-	 *
-	 * @param IGroup $group
-	 */
-	public function createGroup(IGroup $group) {
-		$this->log('Group created: "%s"',
-			[
-				'group' => $group->getGID()
-			],
-			[
-				'group'
-			]
-		);
-	}
+    /**
+     * log create group to group event
+     *
+     * @param IGroup $group
+     */
+    public function createGroup(IGroup $group) {
+        $this->log('Group created: "%s"',
+            [
+                'group' => $group->getGID()
+            ],
+            [
+                'group'
+            ]
+        );
+    }
 
-	/**
-	 * log delete group to group event
-	 *
-	 * @param IGroup $group
-	 */
-	public function deleteGroup(IGroup $group) {
-		$this->log('Group deleted: "%s"',
-			[
-				'group' => $group->getGID()
-			],
-			[
-				'group'
-			]
-		);
-	}
+    /**
+     * log delete group to group event
+     *
+     * @param IGroup $group
+     */
+    public function deleteGroup(IGroup $group) {
+        $this->log('Group deleted: "%s"',
+            [
+                'group' => $group->getGID()
+            ],
+            [
+                'group'
+            ]
+        );
+    }
 }

apps/admin_audit/lib/Actions/Files.php

Indentation +124 added lines, -124 removed lines

@@ -29,137 +29,137 @@
  * @package OCA\AdminAudit\Actions
  */
 class Files extends Action {
-	/**
-	 * Logs file read actions
-	 *
-	 * @param array $params
-	 */
-	public function read(array $params) {
-		$this->log(
-			'File accessed: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs file read actions
+     *
+     * @param array $params
+     */
+    public function read(array $params) {
+        $this->log(
+            'File accessed: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs rename actions of files
-	 *
-	 * @param array $params
-	 */
-	public function rename(array $params) {
-		$this->log(
-			'File renamed: "%s" to "%s"',
-			$params,
-			[
-				'oldpath',
-				'newpath',
-			]
-		);
-	}
+    /**
+     * Logs rename actions of files
+     *
+     * @param array $params
+     */
+    public function rename(array $params) {
+        $this->log(
+            'File renamed: "%s" to "%s"',
+            $params,
+            [
+                'oldpath',
+                'newpath',
+            ]
+        );
+    }
 
-	/**
-	 * Logs creation of files
-	 *
-	 * @param array $params
-	 */
-	public function create(array $params) {
-		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
-			return;
-		}
+    /**
+     * Logs creation of files
+     *
+     * @param array $params
+     */
+    public function create(array $params) {
+        if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+            return;
+        }
 
-		$this->log(
-			'File created: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+        $this->log(
+            'File created: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs copying of files
-	 *
-	 * @param array $params
-	 */
-	public function copy(array $params) {
-		$this->log(
-			'File copied: "%s" to "%s"',
-			$params,
-			[
-				'oldpath',
-				'newpath',
-			]
-		);
-	}
+    /**
+     * Logs copying of files
+     *
+     * @param array $params
+     */
+    public function copy(array $params) {
+        $this->log(
+            'File copied: "%s" to "%s"',
+            $params,
+            [
+                'oldpath',
+                'newpath',
+            ]
+        );
+    }
 
-	/**
-	 * Logs writing of files
-	 *
-	 * @param array $params
-	 */
-	public function write(array $params) {
-		if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
-			return;
-		}
+    /**
+     * Logs writing of files
+     *
+     * @param array $params
+     */
+    public function write(array $params) {
+        if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
+            return;
+        }
 
-		$this->log(
-			'File written to: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+        $this->log(
+            'File written to: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs update of files
-	 *
-	 * @param array $params
-	 */
-	public function update(array $params) {
-		$this->log(
-			'File updated: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs update of files
+     *
+     * @param array $params
+     */
+    public function update(array $params) {
+        $this->log(
+            'File updated: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs deletions of files
-	 *
-	 * @param array $params
-	 */
-	public function delete(array $params) {
-		$this->log(
-			'File deleted: "%s"',
-			$params,
-			[
-				'path',
-			]
-		);
-	}
+    /**
+     * Logs deletions of files
+     *
+     * @param array $params
+     */
+    public function delete(array $params) {
+        $this->log(
+            'File deleted: "%s"',
+            $params,
+            [
+                'path',
+            ]
+        );
+    }
 
-	/**
-	 * Logs preview access to a file
-	 *
-	 * @param array $params
-	 */
-	public function preview(array $params) {
-		$this->log(
-			'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
-			$params,
-			[
-				'path',
-				'width',
-				'height',
-				'crop',
-				'mode'
-			]
-		);
-	}
+    /**
+     * Logs preview access to a file
+     *
+     * @param array $params
+     */
+    public function preview(array $params) {
+        $this->log(
+            'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
+            $params,
+            [
+                'path',
+                'width',
+                'height',
+                'crop',
+                'mode'
+            ]
+        );
+    }
 }

apps/admin_audit/lib/Actions/Auth.php

Indentation +27 added lines, -27 removed lines

@@ -29,33 +29,33 @@
  * @package OCA\AdminAudit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params) {
-		$this->log(
-			'Login attempt: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginAttempt(array $params) {
+        $this->log(
+            'Login attempt: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function loginSuccessful(array $params) {
-		$this->log(
-			'Login successful: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginSuccessful(array $params) {
+        $this->log(
+            'Login successful: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function logout(array $params) {
-		$this->log(
-			'Logout occurred',
-			[],
-			[]
-		);
-	}
+    public function logout(array $params) {
+        $this->log(
+            'Logout occurred',
+            [],
+            []
+        );
+    }
 }

apps/files_external/lib/Settings/PersonalSection.php

Indentation +18 added lines, -18 removed lines

@@ -29,25 +29,25 @@
 use OCP\IUserSession;
 
 class PersonalSection extends Section {
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	public function __construct(
-		IURLGenerator $url,
-		IL10N $l,
-		IUserSession $userSession,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService
-	) {
-		parent::__construct($url, $l);
-		$this->userSession = $userSession;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-	}
+    public function __construct(
+        IURLGenerator $url,
+        IL10N $l,
+        IUserSession $userSession,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService
+    ) {
+        parent::__construct($url, $l);
+        $this->userSession = $userSession;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+    }
 }

apps/dav/lib/Upload/AssemblyStream.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 
 	/**
 	 * @param string $data
-	 * @return int
+	 * @return boolean
 	 */
 	public function stream_write($data) {
 		return false;

Spacing +3 added lines, -3 removed lines

@@ -66,14 +66,14 @@ 
 
 		$nodes = $this->nodes;
 		// http://stackoverflow.com/a/10985500
-		@usort($nodes, function (IFile $a, IFile $b) {
+		@usort($nodes, function(IFile $a, IFile $b) {
 			return strnatcmp($a->getName(), $b->getName());
 		});
 		$this->nodes = array_values($nodes);
 		if (count($this->nodes) > 0) {
 			$this->currentStream = $this->getStream($this->nodes[0]);
 		}
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+		$this->size = array_reduce($this->nodes, function($size, IFile $file) {
 			return $size + $file->getSize();
 		}, 0);
 		return true;
@@ -202,7 +202,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['nodes']) and is_array($context['nodes'])) {
 			$this->nodes = $context['nodes'];

Indentation +189 added lines, -189 removed lines

@@ -39,218 +39,218 @@
  */
 class AssemblyStream implements \Icewind\Streams\File {
 
-	/** @var resource */
-	private $context;
+    /** @var resource */
+    private $context;
 
-	/** @var IFile[] */
-	private $nodes;
+    /** @var IFile[] */
+    private $nodes;
 
-	/** @var int */
-	private $pos = 0;
+    /** @var int */
+    private $pos = 0;
 
-	/** @var int */
-	private $size = 0;
+    /** @var int */
+    private $size = 0;
 
-	/** @var resource */
-	private $currentStream = null;
+    /** @var resource */
+    private $currentStream = null;
 
-	/** @var int */
-	private $currentNode = 0;
+    /** @var int */
+    private $currentNode = 0;
 
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @param int $options
-	 * @param string &$opened_path
-	 * @return bool
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$this->loadContext('assembly');
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->loadContext('assembly');
 
-		$nodes = $this->nodes;
-		// http://stackoverflow.com/a/10985500
-		@usort($nodes, function (IFile $a, IFile $b) {
-			return strnatcmp($a->getName(), $b->getName());
-		});
-		$this->nodes = array_values($nodes);
-		if (count($this->nodes) > 0) {
-			$this->currentStream = $this->getStream($this->nodes[0]);
-		}
-		$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
-			return $size + $file->getSize();
-		}, 0);
-		return true;
-	}
+        $nodes = $this->nodes;
+        // http://stackoverflow.com/a/10985500
+        @usort($nodes, function (IFile $a, IFile $b) {
+            return strnatcmp($a->getName(), $b->getName());
+        });
+        $this->nodes = array_values($nodes);
+        if (count($this->nodes) > 0) {
+            $this->currentStream = $this->getStream($this->nodes[0]);
+        }
+        $this->size = array_reduce($this->nodes, function ($size, IFile $file) {
+            return $size + $file->getSize();
+        }, 0);
+        return true;
+    }
 
-	/**
-	 * @param string $offset
-	 * @param int $whence
-	 * @return bool
-	 */
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
+    /**
+     * @param string $offset
+     * @param int $whence
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function stream_tell() {
-		return $this->pos;
-	}
+    /**
+     * @return int
+     */
+    public function stream_tell() {
+        return $this->pos;
+    }
 
-	/**
-	 * @param int $count
-	 * @return string
-	 */
-	public function stream_read($count) {
-		if (is_null($this->currentStream)) {
-			return '';
-		}
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count) {
+        if (is_null($this->currentStream)) {
+            return '';
+        }
 
-		do {
-			$data = fread($this->currentStream, $count);
-			$read = strlen($data);
+        do {
+            $data = fread($this->currentStream, $count);
+            $read = strlen($data);
 
-			if (feof($this->currentStream)) {
-				fclose($this->currentStream);
-				$this->currentNode++;
-				if ($this->currentNode < count($this->nodes)) {
-					$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
-				} else {
-					$this->currentStream = null;
-				}
-			}
-			// if no data read, try again with the next node because
-			// returning empty data can make the caller think there is no more
-			// data left to read
-		} while ($read === 0 && !is_null($this->currentStream));
+            if (feof($this->currentStream)) {
+                fclose($this->currentStream);
+                $this->currentNode++;
+                if ($this->currentNode < count($this->nodes)) {
+                    $this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
+                } else {
+                    $this->currentStream = null;
+                }
+            }
+            // if no data read, try again with the next node because
+            // returning empty data can make the caller think there is no more
+            // data left to read
+        } while ($read === 0 && !is_null($this->currentStream));
 
-		// update position
-		$this->pos += $read;
-		return $data;
-	}
+        // update position
+        $this->pos += $read;
+        return $data;
+    }
 
-	/**
-	 * @param string $data
-	 * @return int
-	 */
-	public function stream_write($data) {
-		return false;
-	}
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data) {
+        return false;
+    }
 
-	/**
-	 * @param int $option
-	 * @param int $arg1
-	 * @param int $arg2
-	 * @return bool
-	 */
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
+    /**
+     * @param int $option
+     * @param int $arg1
+     * @param int $arg2
+     * @return bool
+     */
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
 
-	/**
-	 * @param int $size
-	 * @return bool
-	 */
-	public function stream_truncate($size) {
-		return false;
-	}
+    /**
+     * @param int $size
+     * @return bool
+     */
+    public function stream_truncate($size) {
+        return false;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function stream_stat() {
-		return [];
-	}
+    /**
+     * @return array
+     */
+    public function stream_stat() {
+        return [];
+    }
 
-	/**
-	 * @param int $operation
-	 * @return bool
-	 */
-	public function stream_lock($operation) {
-		return false;
-	}
+    /**
+     * @param int $operation
+     * @return bool
+     */
+    public function stream_lock($operation) {
+        return false;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function stream_flush() {
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function stream_flush() {
+        return false;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function stream_eof() {
-		return $this->pos >= $this->size;
-	}
+    /**
+     * @return bool
+     */
+    public function stream_eof() {
+        return $this->pos >= $this->size;
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function stream_close() {
-		return true;
-	}
+    /**
+     * @return bool
+     */
+    public function stream_close() {
+        return true;
+    }
 
 
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['nodes']) and is_array($context['nodes'])) {
-			$this->nodes = $context['nodes'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, nodes not set');
-		}
-		return $context;
-	}
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @return array
+     * @throws \Exception
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['nodes']) and is_array($context['nodes'])) {
+            $this->nodes = $context['nodes'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, nodes not set');
+        }
+        return $context;
+    }
 
-	/**
-	 * @param IFile[] $nodes
-	 * @return resource
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public static function wrap(array $nodes) {
-		$context = stream_context_create([
-			'assembly' => [
-				'nodes' => $nodes
-			]
-		]);
-		stream_wrapper_register('assembly', self::class);
-		try {
-			$wrapped = fopen('assembly://', 'r', null, $context);
-		} catch (\BadMethodCallException $e) {
-			stream_wrapper_unregister('assembly');
-			throw $e;
-		}
-		stream_wrapper_unregister('assembly');
-		return $wrapped;
-	}
+    /**
+     * @param IFile[] $nodes
+     * @return resource
+     *
+     * @throws \BadMethodCallException
+     */
+    public static function wrap(array $nodes) {
+        $context = stream_context_create([
+            'assembly' => [
+                'nodes' => $nodes
+            ]
+        ]);
+        stream_wrapper_register('assembly', self::class);
+        try {
+            $wrapped = fopen('assembly://', 'r', null, $context);
+        } catch (\BadMethodCallException $e) {
+            stream_wrapper_unregister('assembly');
+            throw $e;
+        }
+        stream_wrapper_unregister('assembly');
+        return $wrapped;
+    }
 
-	/**
-	 * @param IFile $node
-	 * @return resource
-	 */
-	private function getStream(IFile $node) {
-		$data = $node->get();
-		if (is_resource($data)) {
-			return $data;
-		} else {
-			$tmp = fopen('php://temp', 'w+');
-			fwrite($tmp, $data);
-			rewind($tmp);
-			return $tmp;
-		}
-	}
+    /**
+     * @param IFile $node
+     * @return resource
+     */
+    private function getStream(IFile $node) {
+        $data = $node->get();
+        if (is_resource($data)) {
+            return $data;
+        } else {
+            $tmp = fopen('php://temp', 'w+');
+            fwrite($tmp, $data);
+            rewind($tmp);
+            return $tmp;
+        }
+    }
 }

lib/private/Files/Cache/Wrapper/JailPropagator.php

Indentation +14 added lines, -14 removed lines

@@ -26,19 +26,19 @@
 use OC\Files\Storage\Wrapper\Jail;
 
 class JailPropagator extends Propagator {
-	/**
-	 * @var Jail
-	 */
-	protected $storage;
+    /**
+     * @var Jail
+     */
+    protected $storage;
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
-		$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        /** @var \OC\Files\Storage\Storage $storage */
+        list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
+        $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
+    }
 }

lib/private/Security/Bruteforce/Capabilities.php

Indentation +22 added lines, -22 removed lines

@@ -24,29 +24,29 @@
 use OCP\IRequest;
 
 class Capabilities implements IPublicCapability {
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var Throttler */
-	private $throttler;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IRequest $request
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->throttler = $throttler;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IRequest $request
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->throttler = $throttler;
+    }
 
-	public function getCapabilities() {
-		return [
-			'bruteforce' => [
-				'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'bruteforce' => [
+                'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
+            ]
+        ];
+    }
 }

lib/private/Files/Storage/Wrapper/PermissionsMask.php

Indentation +118 added lines, -118 removed lines

@@ -37,122 +37,122 @@
  * Note that the read permissions can't be masked
  */
 class PermissionsMask extends Wrapper {
-	/**
-	 * @var int the permissions bits we want to keep
-	 */
-	private $mask;
-
-	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $mask]
-	 *
-	 * $storage: The storage the permissions mask should be applied on
-	 * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
-	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->mask = $arguments['mask'];
-	}
-
-	private function checkMask($permissions) {
-		return ($this->mask & $permissions) === $permissions;
-	}
-
-	public function isUpdatable($path) {
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
-	}
-
-	public function isCreatable($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
-	}
-
-	public function isDeletable($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
-	}
-
-	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
-	}
-
-	public function getPermissions($path) {
-		return $this->storage->getPermissions($path) & $this->mask;
-	}
-
-	public function rename($path1, $path2) {
-		$p = strpos($path1, $path2);
-		if ($p === 0) {
-			$part = substr($path1, strlen($path2));
-			//This is a rename of the transfer file to the original file
-			if (strpos($part, '.ocTransferId') === 0) {
-				return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
-			}
-		}
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
-	}
-
-	public function copy($path1, $path2) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
-	}
-
-	public function touch($path, $mtime = null) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) and parent::touch($path, $mtime);
-	}
-
-	public function mkdir($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
-	}
-
-	public function rmdir($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
-	}
-
-	public function unlink($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
-	}
-
-	public function file_put_contents($path, $data) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
-	}
-
-	public function fopen($path, $mode) {
-		if ($mode === 'r' or $mode === 'rb') {
-			return parent::fopen($path, $mode);
-		} else {
-			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
-		}
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		$sourceCache = parent::getCache($path, $storage);
-		return new CachePermissionsMask($sourceCache, $this->mask);
-	}
-
-	public function getMetaData($path) {
-		$data = parent::getMetaData($path);
-
-		if ($data && isset($data['permissions'])) {
-			$data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
-			$data['permissions'] &= $this->mask;
-		}
-		return $data;
-	}
-
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this->storage;
-		}
-		return parent::getScanner($path, $storage);
-	}
+    /**
+     * @var int the permissions bits we want to keep
+     */
+    private $mask;
+
+    /**
+     * @param array $arguments ['storage' => $storage, 'mask' => $mask]
+     *
+     * $storage: The storage the permissions mask should be applied on
+     * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
+     */
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->mask = $arguments['mask'];
+    }
+
+    private function checkMask($permissions) {
+        return ($this->mask & $permissions) === $permissions;
+    }
+
+    public function isUpdatable($path) {
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
+    }
+
+    public function isCreatable($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
+    }
+
+    public function isDeletable($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
+    }
+
+    public function isSharable($path) {
+        return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
+    }
+
+    public function getPermissions($path) {
+        return $this->storage->getPermissions($path) & $this->mask;
+    }
+
+    public function rename($path1, $path2) {
+        $p = strpos($path1, $path2);
+        if ($p === 0) {
+            $part = substr($path1, strlen($path2));
+            //This is a rename of the transfer file to the original file
+            if (strpos($part, '.ocTransferId') === 0) {
+                return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
+            }
+        }
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
+    }
+
+    public function copy($path1, $path2) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
+    }
+
+    public function touch($path, $mtime = null) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) and parent::touch($path, $mtime);
+    }
+
+    public function mkdir($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
+    }
+
+    public function rmdir($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
+    }
+
+    public function unlink($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
+    }
+
+    public function file_put_contents($path, $data) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
+    }
+
+    public function fopen($path, $mode) {
+        if ($mode === 'r' or $mode === 'rb') {
+            return parent::fopen($path, $mode);
+        } else {
+            $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+            return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
+        }
+    }
+
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        $sourceCache = parent::getCache($path, $storage);
+        return new CachePermissionsMask($sourceCache, $this->mask);
+    }
+
+    public function getMetaData($path) {
+        $data = parent::getMetaData($path);
+
+        if ($data && isset($data['permissions'])) {
+            $data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
+            $data['permissions'] &= $this->mask;
+        }
+        return $data;
+    }
+
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this->storage;
+        }
+        return parent::getScanner($path, $storage);
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Indentation +55 added lines, -55 removed lines

@@ -29,68 +29,68 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	/**
-	 * @var \OC\Diagnostics\Query
-	 */
-	protected $activeQuery;
+    /**
+     * @var \OC\Diagnostics\Query
+     */
+    protected $activeQuery;
 
-	/**
-	 * @var CappedMemoryCache
-	 */
-	protected $queries;
+    /**
+     * @var CappedMemoryCache
+     */
+    protected $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, array $params = null, array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, array $params = null, array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[] = $this->activeQuery;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[] = $this->activeQuery;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }