nextcloud / server

apps/dav/lib/CardDAV/ImageExportPlugin.php

Indentation +132 added lines, -132 removed lines

@@ -34,136 +34,136 @@
 
 class ImageExportPlugin extends ServerPlugin {
 
-	/** @var Server */
-	protected $server;
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Initializes the plugin and registers event handlers
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-
-		$this->server = $server;
-		$this->server->on('method:GET', [$this, 'httpGet'], 90);
-	}
-
-	/**
-	 * Intercepts GET requests on addressbook urls ending with ?photo.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool|void
-	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-		$queryParams = $request->getQueryParameters();
-		// TODO: in addition to photo we should also add logo some point in time
-		if (!array_key_exists('photo', $queryParams)) {
-			return true;
-		}
-
-		$path = $request->getPath();
-		$node = $this->server->tree->getNodeForPath($path);
-
-		if (!($node instanceof Card)) {
-			return true;
-		}
-
-		$this->server->transactionType = 'carddav-image-export';
-
-		// Checking ACL, if available.
-		if ($aclPlugin = $this->server->getPlugin('acl')) {
-			/** @var \Sabre\DAVACL\Plugin $aclPlugin */
-			$aclPlugin->checkPrivileges($path, '{DAV:}read');
-		}
-
-		if ($result = $this->getPhoto($node)) {
-			$response->setHeader('Content-Type', $result['Content-Type']);
-			$response->setHeader('Content-Disposition', 'attachment');
-			$response->setStatus(200);
-
-			$response->setBody($result['body']);
-
-			// Returning false to break the event chain
-			return false;
-		}
-		return true;
-	}
-
-	function getPhoto(Card $node) {
-		// TODO: this is kind of expensive - load carddav data from database and parse it
-		//       we might want to build up a cache one day
-		try {
-			$vObject = $this->readCard($node->get());
-			if (!$vObject->PHOTO) {
-				return false;
-			}
-
-			$photo = $vObject->PHOTO;
-			$type = $this->getType($photo);
-
-			$val = $photo->getValue();
-			if ($photo->getValueType() === 'URI') {
-				$parsed = \Sabre\URI\parse($val);
-				//only allow data://
-				if ($parsed['scheme'] !== 'data') {
-					return false;
-				}
-				if (substr_count($parsed['path'], ';') === 1) {
-					list($type,) = explode(';', $parsed['path']);
-				}
-				$val = file_get_contents($val);
-			}
-
-			$allowedContentTypes = [
-				'image/png',
-				'image/jpeg',
-				'image/gif',
-			];
-
-			if(!in_array($type, $allowedContentTypes, true)) {
-				$type = 'application/octet-stream';
-			}
-
-			return [
-				'Content-Type' => $type,
-				'body' => $val
-			];
-		} catch(\Exception $ex) {
-			$this->logger->logException($ex);
-		}
-		return false;
-	}
-
-	private function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * @param Binary $photo
-	 * @return Parameter
-	 */
-	private function getType($photo) {
-		$params = $photo->parameters();
-		if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
-			/** @var Parameter $typeParam */
-			$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
-			$type = $typeParam->getValue();
-
-			if (strpos($type, 'image/') === 0) {
-				return $type;
-			} else {
-				return 'image/' . strtolower($type);
-			}
-		}
-		return '';
-	}
+    /** @var Server */
+    protected $server;
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
+
+    /**
+     * Initializes the plugin and registers event handlers
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+
+        $this->server = $server;
+        $this->server->on('method:GET', [$this, 'httpGet'], 90);
+    }
+
+    /**
+     * Intercepts GET requests on addressbook urls ending with ?photo.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool|void
+     */
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+        $queryParams = $request->getQueryParameters();
+        // TODO: in addition to photo we should also add logo some point in time
+        if (!array_key_exists('photo', $queryParams)) {
+            return true;
+        }
+
+        $path = $request->getPath();
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!($node instanceof Card)) {
+            return true;
+        }
+
+        $this->server->transactionType = 'carddav-image-export';
+
+        // Checking ACL, if available.
+        if ($aclPlugin = $this->server->getPlugin('acl')) {
+            /** @var \Sabre\DAVACL\Plugin $aclPlugin */
+            $aclPlugin->checkPrivileges($path, '{DAV:}read');
+        }
+
+        if ($result = $this->getPhoto($node)) {
+            $response->setHeader('Content-Type', $result['Content-Type']);
+            $response->setHeader('Content-Disposition', 'attachment');
+            $response->setStatus(200);
+
+            $response->setBody($result['body']);
+
+            // Returning false to break the event chain
+            return false;
+        }
+        return true;
+    }
+
+    function getPhoto(Card $node) {
+        // TODO: this is kind of expensive - load carddav data from database and parse it
+        //       we might want to build up a cache one day
+        try {
+            $vObject = $this->readCard($node->get());
+            if (!$vObject->PHOTO) {
+                return false;
+            }
+
+            $photo = $vObject->PHOTO;
+            $type = $this->getType($photo);
+
+            $val = $photo->getValue();
+            if ($photo->getValueType() === 'URI') {
+                $parsed = \Sabre\URI\parse($val);
+                //only allow data://
+                if ($parsed['scheme'] !== 'data') {
+                    return false;
+                }
+                if (substr_count($parsed['path'], ';') === 1) {
+                    list($type,) = explode(';', $parsed['path']);
+                }
+                $val = file_get_contents($val);
+            }
+
+            $allowedContentTypes = [
+                'image/png',
+                'image/jpeg',
+                'image/gif',
+            ];
+
+            if(!in_array($type, $allowedContentTypes, true)) {
+                $type = 'application/octet-stream';
+            }
+
+            return [
+                'Content-Type' => $type,
+                'body' => $val
+            ];
+        } catch(\Exception $ex) {
+            $this->logger->logException($ex);
+        }
+        return false;
+    }
+
+    private function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * @param Binary $photo
+     * @return Parameter
+     */
+    private function getType($photo) {
+        $params = $photo->parameters();
+        if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
+            /** @var Parameter $typeParam */
+            $typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
+            $type = $typeParam->getValue();
+
+            if (strpos($type, 'image/') === 0) {
+                return $type;
+            } else {
+                return 'image/' . strtolower($type);
+            }
+        }
+        return '';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
 				'image/gif',
 			];
 
-			if(!in_array($type, $allowedContentTypes, true)) {
+			if (!in_array($type, $allowedContentTypes, true)) {
 				$type = 'application/octet-stream';
 			}
 
@@ -137,7 +137,7 @@ 
 				'Content-Type' => $type,
 				'body' => $val
 			];
-		} catch(\Exception $ex) {
+		} catch (\Exception $ex) {
 			$this->logger->logException($ex);
 		}
 		return false;
@@ -161,7 +161,7 @@ 
 			if (strpos($type, 'image/') === 0) {
 				return $type;
 			} else {
-				return 'image/' . strtolower($type);
+				return 'image/'.strtolower($type);
 			}
 		}
 		return '';

apps/dav/lib/CardDAV/SyncJob.php

Indentation +10 added lines, -10 removed lines

@@ -28,15 +28,15 @@
 
 class SyncJob extends TimedJob {
 
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	protected function run($argument) {
-		$app = new Application();
-		/** @var SyncService $ss */
-		$ss = $app->getSyncService();
-		$ss->syncInstance();
-	}
+    protected function run($argument) {
+        $app = new Application();
+        /** @var SyncService $ss */
+        $ss = $app->getSyncService();
+        $ss->syncInstance();
+    }
 }

apps/dav/lib/SystemTag/SystemTagMappingNode.php

Indentation +130 added lines, -130 removed lines

@@ -37,134 +37,134 @@
  * Mapping node for system tag to object id
  */
 class SystemTagMappingNode implements \Sabre\DAV\INode {
-	/**
-	 * @var ISystemTag
-	 */
-	protected $tag;
-
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param ISystemTag $tag system tag
-	 * @param string $objectId
-	 * @param string $objectType
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 */
-	public function __construct(
-		ISystemTag $tag,
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tag = $tag;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-	}
-
-	/**
-	 * Returns the object id of the relationship
-	 *
-	 * @return string object id
-	 */
-	public function getObjectId() {
-		return $this->objectId;
-	}
-
-	/**
-	 * Returns the object type of the relationship
-	 *
-	 * @return string object type
-	 */
-	public function getObjectType() {
-		return $this->objectType;
-	}
-
-	/**
-	 * Returns the system tag represented by this node
-	 *
-	 * @return ISystemTag system tag
-	 */
-	public function getSystemTag() {
-		return $this->tag;
-	}
-
-	/**
-	 *  Returns the id of the tag
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->tag->getId();
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 *
-	 * @throws MethodNotAllowed not allowed to rename node
-	 */
-	public function setName($name) {
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Returns null, not supported
-	 *
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Delete tag to object association
-	 */
-	public function delete() {
-		try {
-			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
-			}
-			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
-			}
-			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
-		} catch (TagNotFoundException $e) {
-			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
-		}
-	}
+    /**
+     * @var ISystemTag
+     */
+    protected $tag;
+
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    protected $user;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param ISystemTag $tag system tag
+     * @param string $objectId
+     * @param string $objectType
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     */
+    public function __construct(
+        ISystemTag $tag,
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tag = $tag;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+    }
+
+    /**
+     * Returns the object id of the relationship
+     *
+     * @return string object id
+     */
+    public function getObjectId() {
+        return $this->objectId;
+    }
+
+    /**
+     * Returns the object type of the relationship
+     *
+     * @return string object type
+     */
+    public function getObjectType() {
+        return $this->objectType;
+    }
+
+    /**
+     * Returns the system tag represented by this node
+     *
+     * @return ISystemTag system tag
+     */
+    public function getSystemTag() {
+        return $this->tag;
+    }
+
+    /**
+     *  Returns the id of the tag
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->tag->getId();
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     *
+     * @throws MethodNotAllowed not allowed to rename node
+     */
+    public function setName($name) {
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Returns null, not supported
+     *
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Delete tag to object association
+     */
+    public function delete() {
+        try {
+            if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
+                throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+            }
+            if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
+                throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+            }
+            $this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
+        } catch (TagNotFoundException $e) {
+            // can happen if concurrent deletion occurred
+            throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -156,15 +156,15 @@
 	public function delete() {
 		try {
 			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+				throw new NotFound('Tag with id '.$this->tag->getId().' not found');
 			}
 			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+				throw new Forbidden('No permission to unassign tag '.$this->tag->getId());
 			}
 			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
 		} catch (TagNotFoundException $e) {
 			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$this->tag->getId().' not found', 0, $e);
 		}
 	}
 }

apps/dav/lib/SystemTag/SystemTagsRelationsCollection.php

Indentation +49 added lines, -49 removed lines

@@ -36,59 +36,59 @@
 
 class SystemTagsRelationsCollection extends SimpleCollection {
 
-	/**
-	 * SystemTagsRelationsCollection constructor.
-	 *
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper,
-		IUserSession $userSession,
-		IGroupManager $groupManager,
-		EventDispatcherInterface $dispatcher
-	) {
-		$children = [
-			new SystemTagsObjectTypeCollection(
-				'files',
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				function($name) {
-					$nodes = \OC::$server->getUserFolder()->getById(intval($name));
-					return !empty($nodes);
-				}
-			),
-		];
+    /**
+     * SystemTagsRelationsCollection constructor.
+     *
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper,
+        IUserSession $userSession,
+        IGroupManager $groupManager,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $children = [
+            new SystemTagsObjectTypeCollection(
+                'files',
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                function($name) {
+                    $nodes = \OC::$server->getUserFolder()->getById(intval($name));
+                    return !empty($nodes);
+                }
+            ),
+        ];
 
-		$event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
-		$dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
+        $event = new SystemTagsEntityEvent(SystemTagsEntityEvent::EVENT_ENTITY);
+        $dispatcher->dispatch(SystemTagsEntityEvent::EVENT_ENTITY, $event);
 
-		foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
-			$children[] = new SystemTagsObjectTypeCollection(
-				$entity,
-				$tagManager,
-				$tagMapper,
-				$userSession,
-				$groupManager,
-				$entityExistsFunction
-			);
-		}
+        foreach ($event->getEntityCollections() as $entity => $entityExistsFunction) {
+            $children[] = new SystemTagsObjectTypeCollection(
+                $entity,
+                $tagManager,
+                $tagMapper,
+                $userSession,
+                $groupManager,
+                $entityExistsFunction
+            );
+        }
 
-		parent::__construct('root', $children);
-	}
+        parent::__construct('root', $children);
+    }
 
-	function getName() {
-		return 'systemtags-relations';
-	}
+    function getName() {
+        return 'systemtags-relations';
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
 
 }

apps/dav/appinfo/v1/webdav.php

Indentation +16 added lines, -16 removed lines

@@ -31,30 +31,30 @@
 \OC_Util::obEnd();
 
 $serverFactory = new \OCA\DAV\Connector\Sabre\ServerFactory(
-	\OC::$server->getConfig(),
-	\OC::$server->getLogger(),
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager(),
-	\OC::$server->getRequest(),
-	\OC::$server->getPreviewManager()
+    \OC::$server->getConfig(),
+    \OC::$server->getLogger(),
+    \OC::$server->getDatabaseConnection(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getMountManager(),
+    \OC::$server->getTagManager(),
+    \OC::$server->getRequest(),
+    \OC::$server->getPreviewManager()
 );
 
 // Backends
 $authBackend = new \OCA\DAV\Connector\Sabre\Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function() {
-	// use the view for the logged in user
-	return \OC\Files\Filesystem::getView();
+    // use the view for the logged in user
+    return \OC\Files\Filesystem::getView();
 });
 
 // And off we go!

apps/dav/appinfo/v1/caldav.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 $server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
 $server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
-$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\IMipPlugin( \OC::$server->getMailer(), \OC::$server->getLogger()));
+$server->addPlugin(new \OCA\DAV\CalDAV\Schedule\IMipPlugin(\OC::$server->getMailer(), \OC::$server->getLogger()));
 $server->addPlugin(new ExceptionLoggerPlugin('caldav', \OC::$server->getLogger()));
 
 // And off we go!

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@ 
 use OCA\DAV\Connector\Sabre\Principal;
 
 $authBackend = new Auth(
-	\OC::$server->getSession(),
-	\OC::$server->getUserSession(),
-	\OC::$server->getRequest(),
-	\OC::$server->getTwoFactorAuthManager(),
-	\OC::$server->getBruteForceThrottler(),
-	'principals/'
+    \OC::$server->getSession(),
+    \OC::$server->getUserSession(),
+    \OC::$server->getRequest(),
+    \OC::$server->getTwoFactorAuthManager(),
+    \OC::$server->getBruteForceThrottler(),
+    'principals/'
 );
 $principalBackend = new Principal(
-	\OC::$server->getUserManager(),
-	\OC::$server->getGroupManager(),
-	'principals/'
+    \OC::$server->getUserManager(),
+    \OC::$server->getGroupManager(),
+    'principals/'
 );
 $db = \OC::$server->getDatabaseConnection();
 $calDavBackend = new CalDavBackend($db, $principalBackend);
@@ -58,8 +58,8 @@ 
 $addressBookRoot->disableListing = !$debugging; // Disable listing
 
 $nodes = array(
-	$principalCollection,
-	$addressBookRoot,
+    $principalCollection,
+    $addressBookRoot,
 );
 
 // Fire up server
@@ -75,7 +75,7 @@ 
 
 $server->addPlugin(new LegacyDAVACL());
 if ($debugging) {
-	$server->addPlugin(new Sabre\DAV\Browser\Plugin());
+    $server->addPlugin(new Sabre\DAV\Browser\Plugin());
 }
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());

apps/dav/bin/chunkperf.php

Indentation +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
-	exit;
+    echo "Invalid number of arguments" . PHP_EOL;
+    exit;
 }
 
 /**
@@ -33,15 +33,15 @@ 
  * @return mixed
  */
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
-	echo "$method $uploadUrl ... ";
-	$t0 = microtime(true);
-	$result = $client->request($method, $uploadUrl, $data, $headers);
-	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
-	}
-	return $result;
+    echo "$method $uploadUrl ... ";
+    $t0 = microtime(true);
+    $result = $client->request($method, $uploadUrl, $data, $headers);
+    $t1 = microtime(true);
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+    if (!in_array($result['statusCode'],  [200, 201])) {
+        echo $result['body'] . PHP_EOL;
+    }
+    return $result;
 }
 
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@ 
 $chunkSize = $argv[5] * 1024 * 1024;
 
 $client = new \Sabre\DAV\Client([
-	'baseUri' => $baseUri,
-	'userName' => $userName,
-	'password' => $password
+    'baseUri' => $baseUri,
+    'userName' => $userName,
+    'password' => $password
 ]);
 
 $transfer = uniqid('transfer', true);
@@ -66,12 +66,12 @@ 
 
 $index = 0;
 while(!feof($stream)) {
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
-	$index++;
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+    $index++;
 }
 
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination"
+    'Destination' => "$baseUri/files/$userName/$destination"
 ]);

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
+	echo "Invalid number of arguments".PHP_EOL;
 	exit;
 }
 
@@ -37,9 +37,9 @@ 
 	$t0 = microtime(true);
 	$result = $client->request($method, $uploadUrl, $data, $headers);
 	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
+	echo $result['statusCode']." - ".($t1 - $t0).' seconds'.PHP_EOL;
+	if (!in_array($result['statusCode'], [200, 201])) {
+		echo $result['body'].PHP_EOL;
 	}
 	return $result;
 }
@@ -65,7 +65,7 @@ 
 $stream = fopen($file, 'r');
 
 $index = 0;
-while(!feof($stream)) {
+while (!feof($stream)) {
 	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
 	$index++;
 }

apps/admin_audit/lib/auditlogger.php

Indentation +141 added lines, -141 removed lines

@@ -40,149 +40,149 @@
 
 class AuditLogger {
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 	
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/**
-	 * AuditLogger constructor.
-	 *
-	 * @param ILogger $logger
-	 * @param IUserSession $userSession
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(ILogger $logger,
-								IUserSession $userSession, 
-								IGroupManager $groupManager) {
-		$this->logger = $logger;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-	}
-
-	/**
-	 * register hooks in order to log them
-	 */
-	public function registerHooks() {
-		$this->userManagementHooks();
-		$this->groupHooks();
-		$this->sharingHooks();
-		$this->authHooks();
-		$this->fileHooks();
-		$this->trashbinHooks();
-		$this->versionsHooks();
-	}
-
-	/**
-	 * connect to user management hooks
-	 */
-	private function userManagementHooks() {
-		$userActions = new UserManagement($this->logger);
-
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
-		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
-	}
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /**
+     * AuditLogger constructor.
+     *
+     * @param ILogger $logger
+     * @param IUserSession $userSession
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(ILogger $logger,
+                                IUserSession $userSession, 
+                                IGroupManager $groupManager) {
+        $this->logger = $logger;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+    }
+
+    /**
+     * register hooks in order to log them
+     */
+    public function registerHooks() {
+        $this->userManagementHooks();
+        $this->groupHooks();
+        $this->sharingHooks();
+        $this->authHooks();
+        $this->fileHooks();
+        $this->trashbinHooks();
+        $this->versionsHooks();
+    }
+
+    /**
+     * connect to user management hooks
+     */
+    private function userManagementHooks() {
+        $userActions = new UserManagement($this->logger);
+
+        Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
+        Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+        $this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
+    }
 	
-	private function groupHooks()  {
-		$groupActions = new GroupManagement($this->logger);
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
-	}
-
-	/**
-	 * connect to sharing events
-	 */
-	private function sharingHooks() {
-		$shareActions = new Sharing($this->logger);
-
-		Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
-		Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
-		Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
-		Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
-		Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
-		Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
-	}
-
-	/**
-	 * connect to authentication event and related actions
-	 */
-	private function authHooks() {
-		$authActions = new Auth($this->logger);
-
-		Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
-		Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
-		Util::connectHook('OC_User', 'logout', $authActions, 'logout');
-	}
-
-
-	/**
-	 * connect to file hooks
-	 */
-	private function fileHooks() {
-		$fileActions = new Files($this->logger);
-
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_rename,
-			$fileActions,
-			'rename'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_create,
-			$fileActions,
-			'create'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_copy,
-			$fileActions,
-			'copy'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_write,
-			$fileActions,
-			'write'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_post_update,
-			$fileActions,
-			'update'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_read,
-			$fileActions,
-			'read'
-		);
-		Util::connectHook(
-			Filesystem::CLASSNAME,
-			Filesystem::signal_delete,
-			$fileActions,
-			'delete'
-		);
-	}
-
-	public function versionsHooks() {
-		$versionsActions = new Versions($this->logger);
-		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
-	}
-
-	/**
-	 * connect to trash bin hooks
-	 */
-	private function trashbinHooks() {
-		$trashActions = new Trashbin($this->logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
-	}
+    private function groupHooks()  {
+        $groupActions = new GroupManagement($this->logger);
+        $this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
+        $this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+    }
+
+    /**
+     * connect to sharing events
+     */
+    private function sharingHooks() {
+        $shareActions = new Sharing($this->logger);
+
+        Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
+        Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
+        Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
+        Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
+        Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
+        Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
+    }
+
+    /**
+     * connect to authentication event and related actions
+     */
+    private function authHooks() {
+        $authActions = new Auth($this->logger);
+
+        Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
+        Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
+        Util::connectHook('OC_User', 'logout', $authActions, 'logout');
+    }
+
+
+    /**
+     * connect to file hooks
+     */
+    private function fileHooks() {
+        $fileActions = new Files($this->logger);
+
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_rename,
+            $fileActions,
+            'rename'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_create,
+            $fileActions,
+            'create'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_copy,
+            $fileActions,
+            'copy'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_write,
+            $fileActions,
+            'write'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_post_update,
+            $fileActions,
+            'update'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_read,
+            $fileActions,
+            'read'
+        );
+        Util::connectHook(
+            Filesystem::CLASSNAME,
+            Filesystem::signal_delete,
+            $fileActions,
+            'delete'
+        );
+    }
+
+    public function versionsHooks() {
+        $versionsActions = new Versions($this->logger);
+        Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
+        Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+    }
+
+    /**
+     * connect to trash bin hooks
+     */
+    private function trashbinHooks() {
+        $trashActions = new Trashbin($this->logger);
+        Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
+        Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -83,15 +83,15 @@ 
 	private function userManagementHooks() {
 		$userActions = new UserManagement($this->logger);
 
-		Util::connectHook('OC_User', 'post_createUser',	$userActions, 'create');
-		Util::connectHook('OC_User', 'post_deleteUser',	$userActions, 'delete');
+		Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
+		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
 		$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
 	}
 	
-	private function groupHooks()  {
+	private function groupHooks() {
 		$groupActions = new GroupManagement($this->logger);
-		$this->groupManager->listen('\OC\Group', 'postRemoveUser',  [$groupActions, 'removeUser']);
-		$this->groupManager->listen('\OC\Group', 'postAddUser',  [$groupActions, 'addUser']);
+		$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
+		$this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	public function versionsHooks() {
 		$versionsActions = new Versions($this->logger);
 		Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
-		Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
+		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
 	/**

apps/admin_audit/lib/actions/groupmanagement.php

Indentation +34 added lines, -34 removed lines

@@ -37,40 +37,40 @@
  */
 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'
+            ]
+        );
+    }
 
 }