nextcloud / server

apps/dav/lib/Migration/BuildCalendarSearchIndex.php

Indentation +45 added lines, -45 removed lines

@@ -30,57 +30,57 @@
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IDBConnection $db
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db,
-								IJobList $jobList,
-								IConfig $config) {
-		$this->db = $db;
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * @param IDBConnection $db
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db,
+                                IJobList $jobList,
+                                IConfig $config) {
+        $this->db = $db;
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Registering building of calendar search index as background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Registering building of calendar search index as background job';
+    }
 
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('dav', 'buildCalendarSearchIndex') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
 
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->createFunction('MAX(id)'))
-			->from('calendarobjects');
-		$maxId = (int)$query->execute()->fetchColumn();
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->createFunction('MAX(id)'))
+            ->from('calendarobjects');
+        $maxId = (int)$query->execute()->fetchColumn();
 
-		$output->info('Add background job');
-		$this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
-			'offset' => 0,
-			'stopAt' => $maxId
-		]);
+        $output->info('Add background job');
+        $this->jobList->add(BuildCalendarSearchIndexBackgroundJob::class, [
+            'offset' => 0,
+            'stopAt' => $maxId
+        ]);
 
-		// if all were done, no need to redo the repair during next upgrade
-		$this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
-	}
+        // if all were done, no need to redo the repair during next upgrade
+        $this->config->setAppValue('dav', 'buildCalendarSearchIndex', 'yes');
+    }
 }
\ No newline at end of file

apps/dav/lib/CalDAV/Search/SearchPlugin.php

Indentation +131 added lines, -131 removed lines

@@ -25,135 +25,135 @@
 use OCA\DAV\CalDAV\CalendarHome;
 
 class SearchPlugin extends ServerPlugin {
-	const NS_Nextcloud = 'http://nextcloud.com/ns';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		// May have to be changed to be detected
-		return ['nc-calendar-search'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'nc-calendar-search';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-
-		$server->on('report', [$this, 'report']);
-
-		$server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
-			'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport';
-	}
-
-	/**
-	 * This functions handles REPORT requests specific to CalDAV
-	 *
-	 * @param string $reportName
-	 * @param mixed $report
-	 * @param mixed $path
-	 * @return bool
-	 */
-	public function report($reportName, $report, $path) {
-		switch ($reportName) {
-			case '{' . self::NS_Nextcloud . '}calendar-search':
-				$this->server->transactionType = 'report-nc-calendar-search';
-				$this->calendarSearch($report);
-				return false;
-		}
-	}
-
-	/**
-	 * Returns a list of reports this plugin supports.
-	 *
-	 * This will be used in the {DAV:}supported-report-set property.
-	 * Note that you still need to subscribe to the 'report' event to actually
-	 * implement them
-	 *
-	 * @param string $uri
-	 * @return array
-	 */
-	public function getSupportedReportSet($uri) {
-		$node = $this->server->tree->getNodeForPath($uri);
-
-		$reports = [];
-		if ($node instanceof CalendarHome) {
-			$reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
-		}
-
-		return $reports;
-	}
-
-	/**
-	 * This function handles the calendar-query REPORT
-	 *
-	 * This report is used by clients to request calendar objects based on
-	 * complex conditions.
-	 *
-	 * @param Xml\Request\CalendarSearchReport $report
-	 * @return void
-	 */
-	private function calendarSearch($report) {
-		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-		$depth = $this->server->getHTTPDepth(2);
-
-		// The default result is an empty array
-		$result = [];
-
-		// If we're dealing with the calendar home, the calendar home itself is
-		// responsible for the calendar-query
-		if ($node instanceof CalendarHome && $depth == 2) {
-
-			$nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
-
-			foreach ($nodePaths as $path) {
-				list($properties) = $this->server->getPropertiesForPath(
-					$this->server->getRequestUri() . '/' . $path,
-					$report->properties);
-				$result[] = $properties;
-			}
-		}
-
-		$prefer = $this->server->getHTTPPrefer();
-
-		$this->server->httpResponse->setStatus(207);
-		$this->server->httpResponse->setHeader('Content-Type',
-			'application/xml; charset=utf-8');
-		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-		$this->server->httpResponse->setBody(
-			$this->server->generateMultiStatus($result,
-				$prefer['return'] === 'minimal'));
-	}
+    const NS_Nextcloud = 'http://nextcloud.com/ns';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        // May have to be changed to be detected
+        return ['nc-calendar-search'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'nc-calendar-search';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+
+        $server->on('report', [$this, 'report']);
+
+        $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] =
+            'OCA\\DAV\\CalDAV\\Search\\Xml\\Request\\CalendarSearchReport';
+    }
+
+    /**
+     * This functions handles REPORT requests specific to CalDAV
+     *
+     * @param string $reportName
+     * @param mixed $report
+     * @param mixed $path
+     * @return bool
+     */
+    public function report($reportName, $report, $path) {
+        switch ($reportName) {
+            case '{' . self::NS_Nextcloud . '}calendar-search':
+                $this->server->transactionType = 'report-nc-calendar-search';
+                $this->calendarSearch($report);
+                return false;
+        }
+    }
+
+    /**
+     * Returns a list of reports this plugin supports.
+     *
+     * This will be used in the {DAV:}supported-report-set property.
+     * Note that you still need to subscribe to the 'report' event to actually
+     * implement them
+     *
+     * @param string $uri
+     * @return array
+     */
+    public function getSupportedReportSet($uri) {
+        $node = $this->server->tree->getNodeForPath($uri);
+
+        $reports = [];
+        if ($node instanceof CalendarHome) {
+            $reports[] = '{' . self::NS_Nextcloud . '}calendar-search';
+        }
+
+        return $reports;
+    }
+
+    /**
+     * This function handles the calendar-query REPORT
+     *
+     * This report is used by clients to request calendar objects based on
+     * complex conditions.
+     *
+     * @param Xml\Request\CalendarSearchReport $report
+     * @return void
+     */
+    private function calendarSearch($report) {
+        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+        $depth = $this->server->getHTTPDepth(2);
+
+        // The default result is an empty array
+        $result = [];
+
+        // If we're dealing with the calendar home, the calendar home itself is
+        // responsible for the calendar-query
+        if ($node instanceof CalendarHome && $depth == 2) {
+
+            $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset);
+
+            foreach ($nodePaths as $path) {
+                list($properties) = $this->server->getPropertiesForPath(
+                    $this->server->getRequestUri() . '/' . $path,
+                    $report->properties);
+                $result[] = $properties;
+            }
+        }
+
+        $prefer = $this->server->getHTTPPrefer();
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type',
+            'application/xml; charset=utf-8');
+        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+        $this->server->httpResponse->setBody(
+            $this->server->generateMultiStatus($result,
+                $prefer['return'] === 'minimal'));
+    }
 }
\ No newline at end of file

apps/dav/lib/CalDAV/Search/Xml/Request/CalendarSearchReport.php

Indentation +125 added lines, -125 removed lines

@@ -35,129 +35,129 @@
  */
 class CalendarSearchReport implements XmlDeserializable {
 
-	/**
-	 * An array with requested properties.
-	 *
-	 * @var array
-	 */
-	public $properties;
-
-	/**
-	 * List of property/component filters.
-	 *
-	 * @var array
-	 */
-	public $filters;
-
-	/**
-	 * @var int
-	 */
-	public $limit;
-
-	/**
-	 * @var int
-	 */
-	public $offset;
-
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statically, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$elems = $reader->parseInnerTree([
-			'{http://nextcloud.com/ns}comp-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
-			'{http://nextcloud.com/ns}prop-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
-			'{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
-			'{http://nextcloud.com/ns}search-term'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
-			'{http://nextcloud.com/ns}limit'        => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
-			'{http://nextcloud.com/ns}offset'       => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
-			'{DAV:}prop'                            => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
-
-		$newProps = [
-			'filters'    => [],
-			'properties' => [],
-			'limit'      => null,
-			'offset'     => null
-		];
-
-		if (!is_array($elems)) {
-			$elems = [];
-		}
-
-		foreach ($elems as $elem) {
-			switch ($elem['name']) {
-				case '{DAV:}prop':
-					$newProps['properties'] = array_keys($elem['value']);
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}filter':
-					foreach ($elem['value'] as $subElem) {
-						if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
-							if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
-								$newProps['filters']['comps'] = [];
-							}
-							$newProps['filters']['comps'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
-							if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
-								$newProps['filters']['props'] = [];
-							}
-							$newProps['filters']['props'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
-							if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
-								$newProps['filters']['params'] = [];
-							}
-							$newProps['filters']['params'][] = $subElem['value'];
-						} elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
-							$newProps['filters']['search-term'] = $subElem['value'];
-						}
-					}
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}limit':
-					$newProps['limit'] = $elem['value'];
-					break;
-				case '{' . SearchPlugin::NS_Nextcloud . '}offset':
-					$newProps['offset'] = $elem['value'];
-					break;
-
-			}
-		}
-
-		if (empty($newProps['filters'])) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
-		}
-
-		$propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']));
-		$noCompsDefined = empty($newProps['filters']['comps']);
-		if ($propsOrParamsDefined && $noCompsDefined) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
-		}
-
-		if (!isset($newProps['filters']['search-term'])) {
-			throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
-		}
-
-
-		$obj = new self();
-		foreach ($newProps as $key => $value) {
-			$obj->$key = $value;
-		}
-		return $obj;
-	}
+    /**
+     * An array with requested properties.
+     *
+     * @var array
+     */
+    public $properties;
+
+    /**
+     * List of property/component filters.
+     *
+     * @var array
+     */
+    public $filters;
+
+    /**
+     * @var int
+     */
+    public $limit;
+
+    /**
+     * @var int
+     */
+    public $offset;
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statically, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $elems = $reader->parseInnerTree([
+            '{http://nextcloud.com/ns}comp-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\CompFilter',
+            '{http://nextcloud.com/ns}prop-filter'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\PropFilter',
+            '{http://nextcloud.com/ns}param-filter' => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\ParamFilter',
+            '{http://nextcloud.com/ns}search-term'  => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\SearchTermFilter',
+            '{http://nextcloud.com/ns}limit'        => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\LimitFilter',
+            '{http://nextcloud.com/ns}offset'       => 'OCA\\DAV\\CalDAV\\Search\\Xml\\Filter\\OffsetFilter',
+            '{DAV:}prop'                            => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
+
+        $newProps = [
+            'filters'    => [],
+            'properties' => [],
+            'limit'      => null,
+            'offset'     => null
+        ];
+
+        if (!is_array($elems)) {
+            $elems = [];
+        }
+
+        foreach ($elems as $elem) {
+            switch ($elem['name']) {
+                case '{DAV:}prop':
+                    $newProps['properties'] = array_keys($elem['value']);
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}filter':
+                    foreach ($elem['value'] as $subElem) {
+                        if ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}comp-filter') {
+                            if (!isset($newProps['filters']['comps']) || !is_array($newProps['filters']['comps'])) {
+                                $newProps['filters']['comps'] = [];
+                            }
+                            $newProps['filters']['comps'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}prop-filter') {
+                            if (!isset($newProps['filters']['props']) || !is_array($newProps['filters']['props'])) {
+                                $newProps['filters']['props'] = [];
+                            }
+                            $newProps['filters']['props'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}param-filter') {
+                            if (!isset($newProps['filters']['params']) || !is_array($newProps['filters']['params'])) {
+                                $newProps['filters']['params'] = [];
+                            }
+                            $newProps['filters']['params'][] = $subElem['value'];
+                        } elseif ($subElem['name'] === '{' . SearchPlugin::NS_Nextcloud . '}search-term') {
+                            $newProps['filters']['search-term'] = $subElem['value'];
+                        }
+                    }
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}limit':
+                    $newProps['limit'] = $elem['value'];
+                    break;
+                case '{' . SearchPlugin::NS_Nextcloud . '}offset':
+                    $newProps['offset'] = $elem['value'];
+                    break;
+
+            }
+        }
+
+        if (empty($newProps['filters'])) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}filter element is required for this request');
+        }
+
+        $propsOrParamsDefined = (!empty($newProps['filters']['props']) || !empty($newProps['filters']));
+        $noCompsDefined = empty($newProps['filters']['comps']);
+        if ($propsOrParamsDefined && $noCompsDefined) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}prop-filter or {' . SearchPlugin::NS_Nextcloud . '}param-filter given without any {' . SearchPlugin::NS_Nextcloud . '}comp-filter');
+        }
+
+        if (!isset($newProps['filters']['search-term'])) {
+            throw new BadRequest('{' . SearchPlugin::NS_Nextcloud . '}search-term is required for this request');
+        }
+
+
+        $obj = new self();
+        foreach ($newProps as $key => $value) {
+            $obj->$key = $value;
+        }
+        return $obj;
+    }
 }