nextcloud / server

apps/dav/lib/BackgroundJob/RefreshWebcalJob.php

Indentation +110 added lines, -110 removed lines

@@ -41,114 +41,114 @@
 
 class RefreshWebcalJob extends Job {
 
-	/**
-	 * @var RefreshWebcalService
-	 */
-	private $refreshWebcalService;
-
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * RefreshWebcalJob constructor.
-	 *
-	 * @param RefreshWebcalService $refreshWebcalService
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(RefreshWebcalService $refreshWebcalService, IConfig $config, ILogger $logger, ITimeFactory $timeFactory) {
-		parent::__construct($timeFactory);
-		$this->refreshWebcalService = $refreshWebcalService;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * this function is called at most every hour
-	 *
-	 * @inheritdoc
-	 */
-	public function execute(IJobList $jobList, ILogger $logger = null) {
-		$subscription = $this->refreshWebcalService->getSubscription($this->argument['principaluri'], $this->argument['uri']);
-		if (!$subscription) {
-			return;
-		}
-
-		$this->fixSubscriptionRowTyping($subscription);
-
-		// if no refresh rate was configured, just refresh once a week
-		$defaultRefreshRate = $this->config->getAppValue('dav', 'calendarSubscriptionRefreshRate', 'P1W');
-		$refreshRate = $subscription[RefreshWebcalService::REFRESH_RATE] ?? $defaultRefreshRate;
-
-		$subscriptionId = $subscription['id'];
-
-		try {
-			/** @var DateInterval $dateInterval */
-			$dateInterval = DateTimeParser::parseDuration($refreshRate);
-		} catch (InvalidDataException $ex) {
-			$this->logger->logException($ex);
-			$this->logger->warning("Subscription $subscriptionId could not be refreshed, refreshrate in database is invalid");
-			return;
-		}
-
-		$interval = $this->getIntervalFromDateInterval($dateInterval);
-		if (($this->timeFactory->getTime() - $this->lastRun) <= $interval) {
-			return;
-		}
-
-		parent::execute($jobList, $logger);
-	}
-
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument) {
-		$this->refreshWebcalService->refreshSubscription($argument['principaluri'], $argument['uri']);
-	}
-
-	/**
-	 * get total number of seconds from DateInterval object
-	 *
-	 * @param DateInterval $interval
-	 * @return int
-	 */
-	private function getIntervalFromDateInterval(DateInterval $interval):int {
-		return $interval->s
-			+ ($interval->i * 60)
-			+ ($interval->h * 60 * 60)
-			+ ($interval->d * 60 * 60 * 24)
-			+ ($interval->m * 60 * 60 * 24 * 30)
-			+ ($interval->y * 60 * 60 * 24 * 365);
-	}
-
-	/**
-	 * Fixes types of rows
-	 *
-	 * @param array $row
-	 */
-	private function fixSubscriptionRowTyping(array &$row):void {
-		$forceInt = [
-			'id',
-			'lastmodified',
-			RefreshWebcalService::STRIP_ALARMS,
-			RefreshWebcalService::STRIP_ATTACHMENTS,
-			RefreshWebcalService::STRIP_TODOS,
-		];
-
-		foreach ($forceInt as $column) {
-			if (isset($row[$column])) {
-				$row[$column] = (int) $row[$column];
-			}
-		}
-	}
+    /**
+     * @var RefreshWebcalService
+     */
+    private $refreshWebcalService;
+
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * RefreshWebcalJob constructor.
+     *
+     * @param RefreshWebcalService $refreshWebcalService
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(RefreshWebcalService $refreshWebcalService, IConfig $config, ILogger $logger, ITimeFactory $timeFactory) {
+        parent::__construct($timeFactory);
+        $this->refreshWebcalService = $refreshWebcalService;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * this function is called at most every hour
+     *
+     * @inheritdoc
+     */
+    public function execute(IJobList $jobList, ILogger $logger = null) {
+        $subscription = $this->refreshWebcalService->getSubscription($this->argument['principaluri'], $this->argument['uri']);
+        if (!$subscription) {
+            return;
+        }
+
+        $this->fixSubscriptionRowTyping($subscription);
+
+        // if no refresh rate was configured, just refresh once a week
+        $defaultRefreshRate = $this->config->getAppValue('dav', 'calendarSubscriptionRefreshRate', 'P1W');
+        $refreshRate = $subscription[RefreshWebcalService::REFRESH_RATE] ?? $defaultRefreshRate;
+
+        $subscriptionId = $subscription['id'];
+
+        try {
+            /** @var DateInterval $dateInterval */
+            $dateInterval = DateTimeParser::parseDuration($refreshRate);
+        } catch (InvalidDataException $ex) {
+            $this->logger->logException($ex);
+            $this->logger->warning("Subscription $subscriptionId could not be refreshed, refreshrate in database is invalid");
+            return;
+        }
+
+        $interval = $this->getIntervalFromDateInterval($dateInterval);
+        if (($this->timeFactory->getTime() - $this->lastRun) <= $interval) {
+            return;
+        }
+
+        parent::execute($jobList, $logger);
+    }
+
+    /**
+     * @param array $argument
+     */
+    protected function run($argument) {
+        $this->refreshWebcalService->refreshSubscription($argument['principaluri'], $argument['uri']);
+    }
+
+    /**
+     * get total number of seconds from DateInterval object
+     *
+     * @param DateInterval $interval
+     * @return int
+     */
+    private function getIntervalFromDateInterval(DateInterval $interval):int {
+        return $interval->s
+            + ($interval->i * 60)
+            + ($interval->h * 60 * 60)
+            + ($interval->d * 60 * 60 * 24)
+            + ($interval->m * 60 * 60 * 24 * 30)
+            + ($interval->y * 60 * 60 * 24 * 365);
+    }
+
+    /**
+     * Fixes types of rows
+     *
+     * @param array $row
+     */
+    private function fixSubscriptionRowTyping(array &$row):void {
+        $forceInt = [
+            'id',
+            'lastmodified',
+            RefreshWebcalService::STRIP_ALARMS,
+            RefreshWebcalService::STRIP_ATTACHMENTS,
+            RefreshWebcalService::STRIP_TODOS,
+        ];
+
+        foreach ($forceInt as $column) {
+            if (isset($row[$column])) {
+                $row[$column] = (int) $row[$column];
+            }
+        }
+    }
 }

apps/user_ldap/lib/Migration/SetDefaultProvider.php

Indentation +22 added lines, -22 removed lines

@@ -33,26 +33,26 @@
 
 class SetDefaultProvider implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-
-	/** @var Helper */
-	private $helper;
-
-	public function __construct(IConfig $config,
-								Helper $helper) {
-		$this->config = $config;
-		$this->helper = $helper;
-	}
-
-	public function getName(): string {
-		return 'Set default LDAP provider';
-	}
-
-	public function run(IOutput $output): void {
-		$current = $this->config->getSystemValue('ldapProviderFactory', null);
-		if ($current === null) {
-			$this->config->setSystemValue('ldapProviderFactory', LDAPProviderFactory::class);
-		}
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var Helper */
+    private $helper;
+
+    public function __construct(IConfig $config,
+                                Helper $helper) {
+        $this->config = $config;
+        $this->helper = $helper;
+    }
+
+    public function getName(): string {
+        return 'Set default LDAP provider';
+    }
+
+    public function run(IOutput $output): void {
+        $current = $this->config->getSystemValue('ldapProviderFactory', null);
+        if ($current === null) {
+            $this->config->setSystemValue('ldapProviderFactory', LDAPProviderFactory::class);
+        }
+    }
 }

lib/public/Files/Cache/ICacheEvent.php

Indentation +25 added lines, -25 removed lines

@@ -33,33 +33,33 @@
  * @since 16.0.0
  */
 interface ICacheEvent {
-	/**
-	 * @return IStorage
-	 * @since 16.0.0
-	 */
-	public function getStorage(): IStorage;
+    /**
+     * @return IStorage
+     * @since 16.0.0
+     */
+    public function getStorage(): IStorage;
 
-	/**
-	 * @return string
-	 * @since 16.0.0
-	 */
-	public function getPath(): string;
+    /**
+     * @return string
+     * @since 16.0.0
+     */
+    public function getPath(): string;
 
-	/**
-	 * @param string $path
-	 * @since 19.0.0
-	 */
-	public function setPath(string $path): void;
+    /**
+     * @param string $path
+     * @since 19.0.0
+     */
+    public function setPath(string $path): void;
 
-	/**
-	 * @return int
-	 * @since 16.0.0
-	 */
-	public function getFileId(): int;
+    /**
+     * @return int
+     * @since 16.0.0
+     */
+    public function getFileId(): int;
 
-	/**
-	 * @return int
-	 * @since 21.0.0
-	 */
-	public function getStorageId(): int;
+    /**
+     * @return int
+     * @since 21.0.0
+     */
+    public function getStorageId(): int;
 }

core/Migrations/Version21000Date20201202095923.php

Indentation +37 added lines, -37 removed lines

@@ -32,44 +32,44 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version21000Date20201202095923 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('accounts_data')) {
-			$table = $schema->createTable('accounts_data');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('name', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('value', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'accounts_data_uid');
-			$table->addIndex(['name'], 'accounts_data_name');
-			$table->addIndex(['value'], 'accounts_data_value');
+        if (!$schema->hasTable('accounts_data')) {
+            $table = $schema->createTable('accounts_data');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('name', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('value', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'accounts_data_uid');
+            $table->addIndex(['name'], 'accounts_data_name');
+            $table->addIndex(['value'], 'accounts_data_value');
 
-			return $schema;
-		}
+            return $schema;
+        }
 
-		return null;
-	}
+        return null;
+    }
 }

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

Indentation +28 added lines, -28 removed lines

@@ -35,37 +35,37 @@
 
 class Version1011Date20201120125158 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('federated_reshares')) {
-			$table = $schema->getTable('federated_reshares');
-			$remoteIdColumn = $table->getColumn('remote_id');
-			if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
-				$remoteIdColumn->setNotnull(false);
-				$remoteIdColumn->setType(Type::getType(Types::STRING));
-				$remoteIdColumn->setOptions(['length' => 255]);
-				$remoteIdColumn->setDefault('');
-				return $schema;
-			}
-		}
+        if ($schema->hasTable('federated_reshares')) {
+            $table = $schema->getTable('federated_reshares');
+            $remoteIdColumn = $table->getColumn('remote_id');
+            if ($remoteIdColumn && $remoteIdColumn->getType()->getName() !== Types::STRING) {
+                $remoteIdColumn->setNotnull(false);
+                $remoteIdColumn->setType(Type::getType(Types::STRING));
+                $remoteIdColumn->setOptions(['length' => 255]);
+                $remoteIdColumn->setDefault('');
+                return $schema;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->update('federated_reshares')
-			->set('remote_id', $qb->createNamedParameter(''))
-			->where($qb->expr()->eq('remote_id', $qb->createNamedParameter('-1')));
-		$qb->execute();
-	}
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->update('federated_reshares')
+            ->set('remote_id', $qb->createNamedParameter(''))
+            ->where($qb->expr()->eq('remote_id', $qb->createNamedParameter('-1')));
+        $qb->execute();
+    }
 }

apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php

Indentation +23 added lines, -23 removed lines

@@ -32,29 +32,29 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1010Date20200630191755 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('federated_reshares')) {
-			$table = $schema->createTable('federated_reshares');
-			$table->addColumn('share_id', Types::BIGINT, [
-				'notnull' => true,
-			]);
-			$table->addColumn('remote_id', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['share_id'], 'federated_res_pk');
+        if (!$schema->hasTable('federated_reshares')) {
+            $table = $schema->createTable('federated_reshares');
+            $table->addColumn('share_id', Types::BIGINT, [
+                'notnull' => true,
+            ]);
+            $table->addColumn('remote_id', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['share_id'], 'federated_res_pk');
 //			$table->addUniqueIndex(['share_id'], 'share_id_index');
-		}
-		return $schema;
-	}
+        }
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1004Date20170825134824.php

Indentation +452 added lines, -452 removed lines

@@ -30,467 +30,467 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1004Date20170825134824 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('addressbooks')) {
-			$table = $schema->createTable('addressbooks');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('description', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'addressbook_index');
-		}
+        if (!$schema->hasTable('addressbooks')) {
+            $table = $schema->createTable('addressbooks');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('description', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'addressbook_index');
+        }
 
-		if (!$schema->hasTable('cards')) {
-			$table = $schema->createTable('cards');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('carddata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('lastmodified', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-		}
+        if (!$schema->hasTable('cards')) {
+            $table = $schema->createTable('cards');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('carddata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('lastmodified', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+        }
 
-		if (!$schema->hasTable('addressbookchanges')) {
-			$table = $schema->createTable('addressbookchanges');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('operation', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['addressbookid', 'synctoken'], 'addressbookid_synctoken');
-		}
+        if (!$schema->hasTable('addressbookchanges')) {
+            $table = $schema->createTable('addressbookchanges');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('operation', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['addressbookid', 'synctoken'], 'addressbookid_synctoken');
+        }
 
-		if (!$schema->hasTable('calendarobjects')) {
-			$table = $schema->createTable('calendarobjects');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendardata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendarid', 'integer', [
-				'notnull' => true,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('componenttype', 'string', [
-				'notnull' => false,
-				'length' => 8,
-			]);
-			$table->addColumn('firstoccurence', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lastoccurence', 'bigint', [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('classification', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['calendarid', 'uri'], 'calobjects_index');
-		}
+        if (!$schema->hasTable('calendarobjects')) {
+            $table = $schema->createTable('calendarobjects');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendardata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendarid', 'integer', [
+                'notnull' => true,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('componenttype', 'string', [
+                'notnull' => false,
+                'length' => 8,
+            ]);
+            $table->addColumn('firstoccurence', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lastoccurence', 'bigint', [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('classification', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['calendarid', 'uri'], 'calobjects_index');
+        }
 
-		if (!$schema->hasTable('calendars')) {
-			$table = $schema->createTable('calendars');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'unsigned' => true,
-			]);
-			$table->addColumn('description', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendarorder', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarcolor', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('timezone', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('components', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('transparent', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'calendars_index');
-		} else {
-			$table = $schema->getTable('calendars');
-			$table->changeColumn('components', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-		}
+        if (!$schema->hasTable('calendars')) {
+            $table = $schema->createTable('calendars');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('description', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendarorder', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarcolor', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('timezone', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('components', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('transparent', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'calendars_index');
+        } else {
+            $table = $schema->getTable('calendars');
+            $table->changeColumn('components', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+        }
 
-		if (!$schema->hasTable('calendarchanges')) {
-			$table = $schema->createTable('calendarchanges');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('synctoken', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-				'length' => 10,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarid', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('operation', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['calendarid', 'synctoken'], 'calendarid_synctoken');
-		}
+        if (!$schema->hasTable('calendarchanges')) {
+            $table = $schema->createTable('calendarchanges');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('synctoken', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+                'length' => 10,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarid', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('operation', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['calendarid', 'synctoken'], 'calendarid_synctoken');
+        }
 
-		if (!$schema->hasTable('calendarsubscriptions')) {
-			$table = $schema->createTable('calendarsubscriptions');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('source', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 100,
-			]);
-			$table->addColumn('refreshrate', 'string', [
-				'notnull' => false,
-				'length' => 10,
-			]);
-			$table->addColumn('calendarorder', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarcolor', 'string', [
-				'notnull' => false,
-			]);
-			$table->addColumn('striptodos', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('stripalarms', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('stripattachments', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'uri'], 'calsub_index');
-		} else {
-			$table = $schema->getTable('calendarsubscriptions');
-			$table->changeColumn('lastmodified', [
-				'notnull' => false,
-				'unsigned' => true,
-			]);
-		}
+        if (!$schema->hasTable('calendarsubscriptions')) {
+            $table = $schema->createTable('calendarsubscriptions');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('source', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 100,
+            ]);
+            $table->addColumn('refreshrate', 'string', [
+                'notnull' => false,
+                'length' => 10,
+            ]);
+            $table->addColumn('calendarorder', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarcolor', 'string', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('striptodos', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('stripalarms', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('stripattachments', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'uri'], 'calsub_index');
+        } else {
+            $table = $schema->getTable('calendarsubscriptions');
+            $table->changeColumn('lastmodified', [
+                'notnull' => false,
+                'unsigned' => true,
+            ]);
+        }
 
-		if (!$schema->hasTable('schedulingobjects')) {
-			$table = $schema->createTable('schedulingobjects');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('calendardata', 'blob', [
-				'notnull' => false,
-			]);
-			$table->addColumn('uri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('lastmodified', 'integer', [
-				'notnull' => false,
-				'unsigned' => true,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['principaluri'], 'schedulobj_principuri_index');
-		}
+        if (!$schema->hasTable('schedulingobjects')) {
+            $table = $schema->createTable('schedulingobjects');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('calendardata', 'blob', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('uri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('lastmodified', 'integer', [
+                'notnull' => false,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['principaluri'], 'schedulobj_principuri_index');
+        }
 
-		if (!$schema->hasTable('cards_properties')) {
-			$table = $schema->createTable('cards_properties');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('addressbookid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-			]);
-			$table->addColumn('cardid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('value', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('preferred', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['cardid'], 'card_contactid_index');
-			$table->addIndex(['name'], 'card_name_index');
-			$table->addIndex(['value'], 'card_value_index');
-		}
+        if (!$schema->hasTable('cards_properties')) {
+            $table = $schema->createTable('cards_properties');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('addressbookid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+            ]);
+            $table->addColumn('cardid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('value', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('preferred', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['cardid'], 'card_contactid_index');
+            $table->addIndex(['name'], 'card_name_index');
+            $table->addIndex(['value'], 'card_value_index');
+        }
 
-		if (!$schema->hasTable('calendarobjects_props')) {
-			$table = $schema->createTable('calendarobjects_props');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('calendarid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-			]);
-			$table->addColumn('objectid', 'bigint', [
-				'notnull' => true,
-				'length' => 11,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('parameter', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('value', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['objectid'], 'calendarobject_index');
-			$table->addIndex(['name'], 'calendarobject_name_index');
-			$table->addIndex(['value'], 'calendarobject_value_index');
-		}
+        if (!$schema->hasTable('calendarobjects_props')) {
+            $table = $schema->createTable('calendarobjects_props');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('calendarid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+            ]);
+            $table->addColumn('objectid', 'bigint', [
+                'notnull' => true,
+                'length' => 11,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('parameter', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('value', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['objectid'], 'calendarobject_index');
+            $table->addIndex(['name'], 'calendarobject_name_index');
+            $table->addIndex(['value'], 'calendarobject_value_index');
+        }
 
-		if (!$schema->hasTable('dav_shares')) {
-			$table = $schema->createTable('dav_shares');
-			$table->addColumn('id', 'bigint', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('principaluri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('access', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-			]);
-			$table->addColumn('resourceid', 'integer', [
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('publicuri', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['principaluri', 'resourceid', 'type', 'publicuri'], 'dav_shares_index');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('dav_shares')) {
+            $table = $schema->createTable('dav_shares');
+            $table->addColumn('id', 'bigint', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('principaluri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('access', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+            ]);
+            $table->addColumn('resourceid', 'integer', [
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('publicuri', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['principaluri', 'resourceid', 'type', 'publicuri'], 'dav_shares_index');
+        }
+        return $schema;
+    }
 }

apps/dav/lib/Search/ContactsSearchProvider.php

Indentation +163 added lines, -163 removed lines

@@ -41,167 +41,167 @@
 
 class ContactsSearchProvider implements IProvider {
 
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var CardDavBackend */
-	private $backend;
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'N',
-		'FN',
-		'NICKNAME',
-		'EMAIL',
-		'TEL',
-		'ADR',
-		'TITLE',
-		'ORG',
-		'NOTE',
-	];
-
-	/**
-	 * ContactsSearchProvider constructor.
-	 *
-	 * @param IAppManager $appManager
-	 * @param IL10N $l10n
-	 * @param IURLGenerator $urlGenerator
-	 * @param CardDavBackend $backend
-	 */
-	public function __construct(IAppManager $appManager,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								CardDavBackend $backend) {
-		$this->appManager = $appManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'contacts';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Contacts');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'contacts.Page.index') {
-			return -1;
-		}
-		return 25;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('contacts', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$addressBooks = $this->backend->getAddressBooksForUser($principalUri);
-		$addressBooksById = [];
-		foreach ($addressBooks as $addressBook) {
-			$addressBooksById[(int) $addressBook['id']] = $addressBook;
-		}
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			self::$searchProperties,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
-			$addressBook = $addressBooksById[$contactRow['addressbookid']];
-
-			/** @var VCard $vCard */
-			$vCard = Reader::read($contactRow['carddata']);
-			$thumbnailUrl = '';
-			if ($vCard->PHOTO) {
-				$thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
-			}
-
-			$title = (string)$vCard->FN;
-			$subline = $this->generateSubline($vCard);
-			$resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
-
-			return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $addressBookUri
-	 * @param string $contactsUri
-	 * @return string
-	 */
-	protected function getDavUrlForContact(string $principalUri,
-										   string $addressBookUri,
-										   string $contactsUri): string {
-		[, $principalType, $principalId] = explode('/', $principalUri, 3);
-
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
-				. $principalType . '/'
-				. $principalId . '/'
-				. $addressBookUri . '/'
-				. $contactsUri
-		);
-	}
-
-	/**
-	 * @param string $addressBookUri
-	 * @param string $contactUid
-	 * @return string
-	 */
-	protected function getDeepLinkToContactsApp(string $addressBookUri,
-												string $contactUid): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('contacts.contacts.direct', [
-				'contact' => $contactUid . '~' . $addressBookUri
-			])
-		);
-	}
-
-	/**
-	 * @param VCard $vCard
-	 * @return string
-	 */
-	protected function generateSubline(VCard $vCard): string {
-		$emailAddresses = $vCard->select('EMAIL');
-		if (!is_array($emailAddresses) || empty($emailAddresses)) {
-			return '';
-		}
-
-		return (string)$emailAddresses[0];
-	}
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var CardDavBackend */
+    private $backend;
+
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'N',
+        'FN',
+        'NICKNAME',
+        'EMAIL',
+        'TEL',
+        'ADR',
+        'TITLE',
+        'ORG',
+        'NOTE',
+    ];
+
+    /**
+     * ContactsSearchProvider constructor.
+     *
+     * @param IAppManager $appManager
+     * @param IL10N $l10n
+     * @param IURLGenerator $urlGenerator
+     * @param CardDavBackend $backend
+     */
+    public function __construct(IAppManager $appManager,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                CardDavBackend $backend) {
+        $this->appManager = $appManager;
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->backend = $backend;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'contacts';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Contacts');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'contacts.Page.index') {
+            return -1;
+        }
+        return 25;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('contacts', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $addressBooks = $this->backend->getAddressBooksForUser($principalUri);
+        $addressBooksById = [];
+        foreach ($addressBooks as $addressBook) {
+            $addressBooksById[(int) $addressBook['id']] = $addressBook;
+        }
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            self::$searchProperties,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
+            $addressBook = $addressBooksById[$contactRow['addressbookid']];
+
+            /** @var VCard $vCard */
+            $vCard = Reader::read($contactRow['carddata']);
+            $thumbnailUrl = '';
+            if ($vCard->PHOTO) {
+                $thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
+            }
+
+            $title = (string)$vCard->FN;
+            $subline = $this->generateSubline($vCard);
+            $resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
+
+            return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $addressBookUri
+     * @param string $contactsUri
+     * @return string
+     */
+    protected function getDavUrlForContact(string $principalUri,
+                                            string $addressBookUri,
+                                            string $contactsUri): string {
+        [, $principalType, $principalId] = explode('/', $principalUri, 3);
+
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
+                . $principalType . '/'
+                . $principalId . '/'
+                . $addressBookUri . '/'
+                . $contactsUri
+        );
+    }
+
+    /**
+     * @param string $addressBookUri
+     * @param string $contactUid
+     * @return string
+     */
+    protected function getDeepLinkToContactsApp(string $addressBookUri,
+                                                string $contactUid): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('contacts.contacts.direct', [
+                'contact' => $contactUid . '~' . $addressBookUri
+            ])
+        );
+    }
+
+    /**
+     * @param VCard $vCard
+     * @return string
+     */
+    protected function generateSubline(VCard $vCard): string {
+        $emailAddresses = $vCard->select('EMAIL');
+        if (!is_array($emailAddresses) || empty($emailAddresses)) {
+            return '';
+        }
+
+        return (string)$emailAddresses[0];
+    }
 }

lib/public/Constants.php

Indentation +20 added lines, -20 removed lines

@@ -36,26 +36,26 @@
  * @since 8.0.0
  */
 class Constants {
-	/**
-	 * CRUDS permissions.
-	 * @since 8.0.0
-	 */
-	public const PERMISSION_CREATE = 4;
-	public const PERMISSION_READ = 1;
-	public const PERMISSION_UPDATE = 2;
-	public const PERMISSION_DELETE = 8;
-	public const PERMISSION_SHARE = 16;
-	public const PERMISSION_ALL = 31;
+    /**
+     * CRUDS permissions.
+     * @since 8.0.0
+     */
+    public const PERMISSION_CREATE = 4;
+    public const PERMISSION_READ = 1;
+    public const PERMISSION_UPDATE = 2;
+    public const PERMISSION_DELETE = 8;
+    public const PERMISSION_SHARE = 16;
+    public const PERMISSION_ALL = 31;
 
-	/**
-	 * @since 8.0.0 - Updated in 9.0.0 to allow all POSIX chars since we no
-	 * longer support windows as server platform.
-	 */
-	public const FILENAME_INVALID_CHARS = "\\/";
+    /**
+     * @since 8.0.0 - Updated in 9.0.0 to allow all POSIX chars since we no
+     * longer support windows as server platform.
+     */
+    public const FILENAME_INVALID_CHARS = "\\/";
 
-	/**
-	 * @since 21.0.0 – default value for autocomplete/search results limit,
-	 * cf. sharing.maxAutocompleteResults in config.sample.php.
-	 */
-	public const SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT = 25;
+    /**
+     * @since 21.0.0 – default value for autocomplete/search results limit,
+     * cf. sharing.maxAutocompleteResults in config.sample.php.
+     */
+    public const SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT = 25;
 }