nextcloud / server

apps/dav/lib/Migration/Version1005Date20180530124431.php

Spacing +6 added lines, -6 removed lines

@@ -41,9 +41,9 @@ 
 		$schema = $schemaClosure();
 
 		$types = ['resources', 'rooms'];
-		foreach($types as $type) {
-			if (!$schema->hasTable('calendar_' . $type)) {
-				$table = $schema->createTable('calendar_' . $type);
+		foreach ($types as $type) {
+			if (!$schema->hasTable('calendar_'.$type)) {
+				$table = $schema->createTable('calendar_'.$type);
 
 				$table->addColumn('id', Type::BIGINT, [
 					'autoincrement' => true,
@@ -73,9 +73,9 @@ 
 				]);
 
 				$table->setPrimaryKey(['id']);
-				$table->addIndex(['backend_id', 'resource_id'], 'calendar_' . $type . '_bkdrsc');
-				$table->addIndex(['email'], 'calendar_' . $type . '_email');
-				$table->addIndex(['displayname'], 'calendar_' . $type . '_name');
+				$table->addIndex(['backend_id', 'resource_id'], 'calendar_'.$type.'_bkdrsc');
+				$table->addIndex(['email'], 'calendar_'.$type.'_email');
+				$table->addIndex(['displayname'], 'calendar_'.$type.'_name');
 			}
 		}
 

apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
 		$this->groupManager = $groupManager;
 		$this->logger = $logger;
 		$this->principalPrefix = $principalPrefix;
-		$this->dbTableName = 'calendar_' . $dbPrefix;
+		$this->dbTableName = 'calendar_'.$dbPrefix;
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 				->from($this->dbTableName);
 			$stmt = $query->execute();
 
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 				$principals[] = $this->rowToPrincipal($row);
 			}
 
@@ -117,7 +117,7 @@ 
 		}
 		list(, $name) = \Sabre\Uri\split($path);
 
-		list($backendId, $resourceId) = explode('-',  $name, 2);
+		list($backendId, $resourceId) = explode('-', $name, 2);
 
 		$query = $this->db->getQueryBuilder();
 		$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
@@ -127,7 +127,7 @@ 
 		$stmt = $query->execute();
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-		if(!$row) {
+		if (!$row) {
 			return null;
 		}
 
@@ -203,11 +203,11 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('email', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -222,11 +222,11 @@ 
 					$query = $this->db->getQueryBuilder();
 					$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
 						->from($this->dbTableName)
-						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
+						->where($query->expr()->iLike('displayname', $query->createNamedParameter('%'.$this->db->escapeLikeParameter($value).'%')));
 
 					$stmt = $query->execute();
 					$principals = [];
-					while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+					while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
 						if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
 							continue;
 						}
@@ -281,7 +281,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -298,7 +298,7 @@ 
 			}
 
 			list(, $name) = \Sabre\Uri\split($path);
-			list($backendId, $resourceId) = explode('-',  $name, 2);
+			list($backendId, $resourceId) = explode('-', $name, 2);
 
 			$query = $this->db->getQueryBuilder();
 			$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname', 'group_restrictions'])
@@ -308,7 +308,7 @@ 
 			$stmt = $query->execute();
 			$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-			if(!$row) {
+			if (!$row) {
 				return null;
 			}
 			if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -326,7 +326,7 @@ 
 	 */
 	private function rowToPrincipal($row) {
 		return [
-			'uri' => $this->principalPrefix . '/' . $row['backend_id'] . '-' . $row['resource_id'],
+			'uri' => $this->principalPrefix.'/'.$row['backend_id'].'-'.$row['resource_id'],
 			'{DAV:}displayname' => $row['displayname'],
 			'{http://sabredav.org/ns}email-address' => $row['email']
 		];
@@ -347,7 +347,7 @@ 
 		// group restrictions contains something, but not parsable, deny access and log warning
 		$json = json_decode($row['group_restrictions']);
 		if (!\is_array($json)) {
-			$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
+			$this->logger->info('group_restrictions field could not be parsed for '.$this->dbTableName.'::'.$row['id'].', denying access to resource');
 			return false;
 		}