nextcloud / server

apps/dav/lib/CalDAV/Publishing/PublishPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -113,12 +113,12 @@ 
 		$this->server = $server;
 
 		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
+		$this->server->on('propFind', [$this, 'propFind']);
 	}
 
 	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function() use ($node) {
 				if ($node->getPublishStatus()) {
 					// We return the publish-url only if the calendar is published.
 					$token = $node->getPublishStatus();
@@ -128,7 +128,7 @@ 
 				}
 			});
 
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function() use ($node) {
 				$canShare = (!$node->isSubscription() && $node->canWrite());
 				$canPublish = (!$node->isSubscription() && $node->canWrite());
 

Indentation +211 added lines, -211 removed lines

@@ -41,216 +41,216 @@
 use Sabre\HTTP\ResponseInterface;
 
 class PublishPlugin extends ServerPlugin {
-	public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * Config instance to get instance secret.
-	 *
-	 * @var IConfig
-	 */
-	protected $config;
-
-	/**
-	 * URL Generator for absolute URLs.
-	 *
-	 * @var IURLGenerator
-	 */
-	protected $urlGenerator;
-
-	/**
-	 * PublishPlugin constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * 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 ['oc-calendar-publishing', 'calendarserver-sharing'];
-	}
-
-	/**
-	 * 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 'oc-calendar-publishing';
-	}
-
-	/**
-	 * 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;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof Calendar) {
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
-				if ($node->getPublishStatus()) {
-					// We return the publish-url only if the calendar is published.
-					$token = $node->getPublishStatus();
-					$publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
-
-					return new Publisher($publishUrl, true);
-				}
-			});
-
-			$propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
-				$canShare = (!$node->isSubscription() && $node->canWrite());
-				$canPublish = (!$node->isSubscription() && $node->canWrite());
-
-				if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
-					$canShare &= ($node->getOwner() === $node->getPrincipalURI());
-					$canPublish &= ($node->getOwner() === $node->getPrincipalURI());
-				}
-
-				return new AllowedSharingModes($canShare, $canPublish);
-			});
-		}
-	}
-
-	/**
-	 * We intercept this to handle POST requests on calendars.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return void|bool
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-publish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				/** @var \Sabre\DAVACL\Plugin $acl */
-				$acl->checkPrivileges($path, '{DAV:}write');
-
-				$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-				$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-				if ($limitSharingToOwner && !$isOwner) {
-					return;
-				}
-			}
-
-			$node->setPublishStatus(true);
-
-			// iCloud sends back the 202, so we will too.
-			$response->setStatus(202);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
-
-			case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
-
-			// We can only deal with IShareableCalendar objects
-			if (!$node instanceof Calendar) {
-				return;
-			}
-			$this->server->transactionType = 'post-unpublish-calendar';
-
-			// Getting ACL info
-			$acl = $this->server->getPlugin('acl');
-
-			// If there's no ACL support, we allow everything
-			if ($acl) {
-				/** @var \Sabre\DAVACL\Plugin $acl */
-				$acl->checkPrivileges($path, '{DAV:}write');
-
-				$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-				$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-				if ($limitSharingToOwner && !$isOwner) {
-					return;
-				}
-			}
-
-			$node->setPublishStatus(false);
-
-			$response->setStatus(200);
-
-			// Adding this because sending a response body may cause issues,
-			// and I wanted some type of indicator the response was handled.
-			$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-			// Breaking the event chain
-			return false;
+    public const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * Config instance to get instance secret.
+     *
+     * @var IConfig
+     */
+    protected $config;
+
+    /**
+     * URL Generator for absolute URLs.
+     *
+     * @var IURLGenerator
+     */
+    protected $urlGenerator;
+
+    /**
+     * PublishPlugin constructor.
+     *
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IConfig $config, IURLGenerator $urlGenerator) {
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * 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 ['oc-calendar-publishing', 'calendarserver-sharing'];
+    }
+
+    /**
+     * 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 'oc-calendar-publishing';
+    }
+
+    /**
+     * 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;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof Calendar) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) {
+                if ($node->getPublishStatus()) {
+                    // We return the publish-url only if the calendar is published.
+                    $token = $node->getPublishStatus();
+                    $publishUrl = $this->urlGenerator->getAbsoluteURL($this->server->getBaseUri().'public-calendars/').$token;
+
+                    return new Publisher($publishUrl, true);
+                }
+            });
+
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}allowed-sharing-modes', function () use ($node) {
+                $canShare = (!$node->isSubscription() && $node->canWrite());
+                $canPublish = (!$node->isSubscription() && $node->canWrite());
+
+                if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
+                    $canShare &= ($node->getOwner() === $node->getPrincipalURI());
+                    $canPublish &= ($node->getOwner() === $node->getPrincipalURI());
+                }
+
+                return new AllowedSharingModes($canShare, $canPublish);
+            });
+        }
+    }
+
+    /**
+     * We intercept this to handle POST requests on calendars.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     *
+     * @return void|bool
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            case '{'.self::NS_CALENDARSERVER.'}publish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-publish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                /** @var \Sabre\DAVACL\Plugin $acl */
+                $acl->checkPrivileges($path, '{DAV:}write');
+
+                $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                if ($limitSharingToOwner && !$isOwner) {
+                    return;
+                }
+            }
+
+            $node->setPublishStatus(true);
+
+            // iCloud sends back the 202, so we will too.
+            $response->setStatus(202);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
+
+            case '{'.self::NS_CALENDARSERVER.'}unpublish-calendar':
+
+            // We can only deal with IShareableCalendar objects
+            if (!$node instanceof Calendar) {
+                return;
+            }
+            $this->server->transactionType = 'post-unpublish-calendar';
+
+            // Getting ACL info
+            $acl = $this->server->getPlugin('acl');
+
+            // If there's no ACL support, we allow everything
+            if ($acl) {
+                /** @var \Sabre\DAVACL\Plugin $acl */
+                $acl->checkPrivileges($path, '{DAV:}write');
+
+                $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                if ($limitSharingToOwner && !$isOwner) {
+                    return;
+                }
+            }
+
+            $node->setPublishStatus(false);
+
+            $response->setStatus(200);
+
+            // Adding this because sending a response body may cause issues,
+            // and I wanted some type of indicator the response was handled.
+            $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+            // Breaking the event chain
+            return false;
 
-		}
-	}
+        }
+    }
 }

core/ajax/update.php

Indentation +179 added lines, -179 removed lines

@@ -36,7 +36,7 @@ 
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 
 require_once '../../lib/base.php';
@@ -50,188 +50,188 @@ 
 $eventSource->send('success', $l->t('Preparing update'));
 
 class FeedBackHandler {
-	/** @var integer */
-	private $progressStateMax = 100;
-	/** @var integer */
-	private $progressStateStep = 0;
-	/** @var string */
-	private $currentStep;
-	/** @var \OCP\IEventSource */
-	private $eventSource;
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
-		$this->eventSource = $eventSource;
-		$this->l10n = $l10n;
-	}
-
-	public function handleRepairFeedback($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progressStateMax = $event->getArgument(0);
-				$this->progressStateStep = 0;
-				$this->currentStep = $event->getArgument(1);
-				break;
-			case '\OC\Repair::advance':
-				$this->progressStateStep += $event->getArgument(0);
-				$desc = $event->getArgument(1);
-				if (empty($desc)) {
-					$desc = $this->currentStep;
-				}
-				$this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progressStateMax = $this->progressStateStep;
-				$this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
-				break;
-			case '\OC\Repair::step':
-				$this->eventSource->send('success', $this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::info':
-				$this->eventSource->send('success', $this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', $this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->eventSource->send('notice', $this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
-				break;
-		}
-	}
+    /** @var integer */
+    private $progressStateMax = 100;
+    /** @var integer */
+    private $progressStateStep = 0;
+    /** @var string */
+    private $currentStep;
+    /** @var \OCP\IEventSource */
+    private $eventSource;
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    public function __construct(\OCP\IEventSource $eventSource, \OCP\IL10N $l10n) {
+        $this->eventSource = $eventSource;
+        $this->l10n = $l10n;
+    }
+
+    public function handleRepairFeedback($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progressStateMax = $event->getArgument(0);
+                $this->progressStateStep = 0;
+                $this->currentStep = $event->getArgument(1);
+                break;
+            case '\OC\Repair::advance':
+                $this->progressStateStep += $event->getArgument(0);
+                $desc = $event->getArgument(1);
+                if (empty($desc)) {
+                    $desc = $this->currentStep;
+                }
+                $this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $desc]));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progressStateMax = $this->progressStateStep;
+                $this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
+                break;
+            case '\OC\Repair::step':
+                $this->eventSource->send('success', $this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::info':
+                $this->eventSource->send('success', $this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::warning':
+                $this->eventSource->send('notice', $this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->eventSource->send('notice', $this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
+                break;
+        }
+    }
 }
 
 if (\OCP\Util::needUpgrade()) {
-	$config = \OC::$server->getSystemConfig();
-	if ($config->getValue('upgrade.disable-web', false)) {
-		$eventSource->send('failure', $l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-		$eventSource->close();
-		exit();
-	}
-
-	// if a user is currently logged in, their session must be ignored to
-	// avoid side effects
-	\OC_User::setIncognitoMode(true);
-
-	$logger = \OC::$server->getLogger();
-	$config = \OC::$server->getConfig();
-	$updater = new \OC\Updater(
-			$config,
-			\OC::$server->getIntegrityCodeChecker(),
-			$logger,
-			\OC::$server->query(\OC\Installer::class)
-	);
-	$incompatibleApps = [];
-
-	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', $l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($eventSource, $l) {
-		if ($event instanceof GenericEvent) {
-			$eventSource->send('success', $l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
-		}
-	});
-	$feedBack = new FeedBackHandler($eventSource, $l);
-	$dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
-	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
-
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Turned on maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Turned off maintenance mode'));
-	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Maintenance mode is kept active'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Updating database schema'));
-	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Updated database'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
-	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checked database schema update'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checking updates of apps'));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Update app "%s" from appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checked for update of app "%s" in appstore', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
-	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Checked database schema update for apps'));
-	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
-	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[] = $app;
-	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
-		$eventSource->send('failure', $message);
-		$eventSource->close();
-		$config->setSystemValue('maintenance', false);
-	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Set log level to debug'));
-	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Reset log level'));
-	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Starting code integrity check'));
-	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l) {
-		$eventSource->send('success', $l->t('Finished code integrity check'));
-	});
-
-	try {
-		$updater->upgrade();
-	} catch (\Exception $e) {
-		\OC::$server->getLogger()->logException($e, [
-			'level' => ILogger::ERROR,
-			'app' => 'update',
-		]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
-		$eventSource->close();
-		exit();
-	}
-
-	$disabledApps = [];
-	foreach ($incompatibleApps as $app) {
-		$disabledApps[$app] = $l->t('%s (incompatible)', [$app]);
-	}
-
-	if (!empty($disabledApps)) {
-		$eventSource->send('notice', $l->t('The following apps have been disabled: %s', [implode(', ', $disabledApps)]));
-	}
+    $config = \OC::$server->getSystemConfig();
+    if ($config->getValue('upgrade.disable-web', false)) {
+        $eventSource->send('failure', $l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+        $eventSource->close();
+        exit();
+    }
+
+    // if a user is currently logged in, their session must be ignored to
+    // avoid side effects
+    \OC_User::setIncognitoMode(true);
+
+    $logger = \OC::$server->getLogger();
+    $config = \OC::$server->getConfig();
+    $updater = new \OC\Updater(
+            $config,
+            \OC::$server->getIntegrityCodeChecker(),
+            $logger,
+            \OC::$server->query(\OC\Installer::class)
+    );
+    $incompatibleApps = [];
+
+    $dispatcher = \OC::$server->getEventDispatcher();
+    $dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', $l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($eventSource, $l) {
+        if ($event instanceof GenericEvent) {
+            $eventSource->send('success', $l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
+        }
+    });
+    $feedBack = new FeedBackHandler($eventSource, $l);
+    $dispatcher->addListener('\OC\Repair::startProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::advance', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::finishProgress', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::step', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::info', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
+    $dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
+
+    $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Turned on maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Turned off maintenance mode'));
+    });
+    $updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Maintenance mode is kept active'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Updating database schema'));
+    });
+    $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Updated database'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
+    });
+    $updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checked database schema update'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checking updates of apps'));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Update app "%s" from appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checked for update of app "%s" in appstore', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
+    });
+    $updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Checked database schema update for apps'));
+    });
+    $updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
+    });
+    $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
+        $incompatibleApps[] = $app;
+    });
+    $updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+        $eventSource->send('failure', $message);
+        $eventSource->close();
+        $config->setSystemValue('maintenance', false);
+    });
+    $updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Set log level to debug'));
+    });
+    $updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Reset log level'));
+    });
+    $updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Starting code integrity check'));
+    });
+    $updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l) {
+        $eventSource->send('success', $l->t('Finished code integrity check'));
+    });
+
+    try {
+        $updater->upgrade();
+    } catch (\Exception $e) {
+        \OC::$server->getLogger()->logException($e, [
+            'level' => ILogger::ERROR,
+            'app' => 'update',
+        ]);
+        $eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+        $eventSource->close();
+        exit();
+    }
+
+    $disabledApps = [];
+    foreach ($incompatibleApps as $app) {
+        $disabledApps[$app] = $l->t('%s (incompatible)', [$app]);
+    }
+
+    if (!empty($disabledApps)) {
+        $eventSource->send('notice', $l->t('The following apps have been disabled: %s', [implode(', ', $disabledApps)]));
+    }
 } else {
-	$eventSource->send('notice', $l->t('Already up to date'));
+    $eventSource->send('notice', $l->t('Already up to date'));
 }
 
 $eventSource->send('done', '');

Spacing +27 added lines, -27 removed lines

@@ -90,16 +90,16 @@ 
 				$this->eventSource->send('success', $this->l10n->t('[%d / %d]: %s', [$this->progressStateStep, $this->progressStateMax, $this->currentStep]));
 				break;
 			case '\OC\Repair::step':
-				$this->eventSource->send('success', $this->l10n->t('Repair step:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('success', $this->l10n->t('Repair step:').' '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::info':
-				$this->eventSource->send('success', $this->l10n->t('Repair info:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('success', $this->l10n->t('Repair info:').' '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::warning':
-				$this->eventSource->send('notice', $this->l10n->t('Repair warning:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('notice', $this->l10n->t('Repair warning:').' '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->eventSource->send('notice', $this->l10n->t('Repair error:') . ' ' . $event->getArgument(0));
+				$this->eventSource->send('notice', $this->l10n->t('Repair error:').' '.$event->getArgument(0));
 				break;
 		}
 	}
@@ -128,12 +128,12 @@ 
 	$incompatibleApps = [];
 
 	$dispatcher = \OC::$server->getEventDispatcher();
-	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function ($event) use ($eventSource, $l) {
+	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
 			$eventSource->send('success', $l->t('[%d / %d]: %s', [$event[0], $event[1], $event->getSubject()]));
 		}
 	});
-	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function ($event) use ($eventSource, $l) {
+	$dispatcher->addListener('\OC\DB\Migrator::checkTable', function($event) use ($eventSource, $l) {
 		if ($event instanceof GenericEvent) {
 			$eventSource->send('success', $l->t('[%d / %d]: Checking table %s', [$event[0], $event[1], $event->getSubject()]));
 		}
@@ -147,66 +147,66 @@ 
 	$dispatcher->addListener('\OC\Repair::warning', [$feedBack, 'handleRepairFeedback']);
 	$dispatcher->addListener('\OC\Repair::error', [$feedBack, 'handleRepairFeedback']);
 
-	$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'maintenanceEnabled', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Turned on maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceDisabled', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'maintenanceDisabled', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Turned off maintenance mode'));
 	});
-	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'maintenanceActive', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Maintenance mode is kept active'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Updating database schema'));
 	});
-	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'dbUpgrade', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Updated database'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'dbSimulateUpgradeBefore', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checking whether the database schema can be updated (this can take a long time depending on the database size)'));
 	});
-	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'dbSimulateUpgrade', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checked database schema update'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'appUpgradeCheckBefore', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checking updates of apps'));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function($app) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checking for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function($app) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Update app "%s" from appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'checkAppStoreApp', function ($app) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'checkAppStoreApp', function($app) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checked for update of app "%s" in appstore', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appSimulateUpdate', function ($app) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'appSimulateUpdate', function($app) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)', [$app]));
 	});
-	$updater->listen('\OC\Updater', 'appUpgradeCheck', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'appUpgradeCheck', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Checked database schema update for apps'));
 	});
-	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'appUpgrade', function($app, $version) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
 	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
+	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function($app) use (&$incompatibleApps) {
 		$incompatibleApps[] = $app;
 	});
-	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
+	$updater->listen('\OC\Updater', 'failure', function($message) use ($eventSource, $config) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
 		$config->setSystemValue('maintenance', false);
 	});
-	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'setDebugLogLevel', function($logLevel, $logLevelName) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Set log level to debug'));
 	});
-	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'resetLogLevel', function($logLevel, $logLevelName) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Reset log level'));
 	});
-	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'startCheckCodeIntegrity', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Starting code integrity check'));
 	});
-	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function () use ($eventSource, $l) {
+	$updater->listen('\OC\Updater', 'finishedCheckCodeIntegrity', function() use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Finished code integrity check'));
 	});
 
@@ -217,7 +217,7 @@ 
 			'level' => ILogger::ERROR,
 			'app' => 'update',
 		]);
-		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+		$eventSource->send('failure', get_class($e).': '.$e->getMessage());
 		$eventSource->close();
 		exit();
 	}

core/Migrations/Version13000Date20170718121200.php

Indentation +942 added lines, -942 removed lines

@@ -38,850 +38,850 @@ 
 
 class Version13000Date20170718121200 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 preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('properties')) {
-			return;
-		}
-		// in case we have a properties table from oc we drop it since we will only migrate
-		// the dav_properties values in the postSchemaChange step
-		$table = $schema->getTable('properties');
-		if ($table->hasColumn('fileid')) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('properties');
-			$qb->execute();
-		}
-	}
+        if (!$schema->hasTable('properties')) {
+            return;
+        }
+        // in case we have a properties table from oc we drop it since we will only migrate
+        // the dav_properties values in the postSchemaChange step
+        $table = $schema->getTable('properties');
+        if ($table->hasColumn('fileid')) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('properties');
+            $qb->execute();
+        }
+    }
 
 
-	/**
-	 * @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('appconfig')) {
-			$table = $schema->createTable('appconfig');
-			$table->addColumn('appid', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('configkey', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('configvalue', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['appid', 'configkey']);
-			$table->addIndex(['configkey'], 'appconfig_config_key_index');
-			$table->addIndex(['appid'], 'appconfig_appid_key');
-		}
+        if (!$schema->hasTable('appconfig')) {
+            $table = $schema->createTable('appconfig');
+            $table->addColumn('appid', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('configkey', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('configvalue', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['appid', 'configkey']);
+            $table->addIndex(['configkey'], 'appconfig_config_key_index');
+            $table->addIndex(['appid'], 'appconfig_appid_key');
+        }
 
-		if (!$schema->hasTable('storages')) {
-			$table = $schema->createTable('storages');
-			$table->addColumn('id', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('numeric_id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('available', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-			]);
-			$table->addColumn('last_checked', 'integer', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['numeric_id']);
-			$table->addUniqueIndex(['id'], 'storages_id_index');
-		}
+        if (!$schema->hasTable('storages')) {
+            $table = $schema->createTable('storages');
+            $table->addColumn('id', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('numeric_id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('available', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+            ]);
+            $table->addColumn('last_checked', 'integer', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['numeric_id']);
+            $table->addUniqueIndex(['id'], 'storages_id_index');
+        }
 
-		if (!$schema->hasTable('mounts')) {
-			$table = $schema->createTable('mounts');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('storage_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('root_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('user_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('mount_point', 'string', [
-				'notnull' => true,
-				'length' => 4000,
-			]);
-			$table->addColumn('mount_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 20,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['user_id'], 'mounts_user_index');
-			$table->addIndex(['storage_id'], 'mounts_storage_index');
-			$table->addIndex(['root_id'], 'mounts_root_index');
-			$table->addIndex(['mount_id'], 'mounts_mount_id_index');
-			$table->addUniqueIndex(['user_id', 'root_id'], 'mounts_user_root_index');
-		} else {
-			$table = $schema->getTable('mounts');
-			$table->addColumn('mount_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 20,
-			]);
-			if (!$table->hasIndex('mounts_mount_id_index')) {
-				$table->addIndex(['mount_id'], 'mounts_mount_id_index');
-			}
-		}
+        if (!$schema->hasTable('mounts')) {
+            $table = $schema->createTable('mounts');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('storage_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('root_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('user_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('mount_point', 'string', [
+                'notnull' => true,
+                'length' => 4000,
+            ]);
+            $table->addColumn('mount_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 20,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['user_id'], 'mounts_user_index');
+            $table->addIndex(['storage_id'], 'mounts_storage_index');
+            $table->addIndex(['root_id'], 'mounts_root_index');
+            $table->addIndex(['mount_id'], 'mounts_mount_id_index');
+            $table->addUniqueIndex(['user_id', 'root_id'], 'mounts_user_root_index');
+        } else {
+            $table = $schema->getTable('mounts');
+            $table->addColumn('mount_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 20,
+            ]);
+            if (!$table->hasIndex('mounts_mount_id_index')) {
+                $table->addIndex(['mount_id'], 'mounts_mount_id_index');
+            }
+        }
 
-		if (!$schema->hasTable('mimetypes')) {
-			$table = $schema->createTable('mimetypes');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('mimetype', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['mimetype'], 'mimetype_id_index');
-		}
+        if (!$schema->hasTable('mimetypes')) {
+            $table = $schema->createTable('mimetypes');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('mimetype', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['mimetype'], 'mimetype_id_index');
+        }
 
-		if (!$schema->hasTable('filecache')) {
-			$table = $schema->createTable('filecache');
-			$table->addColumn('fileid', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('storage', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('path', 'string', [
-				'notnull' => false,
-				'length' => 4000,
-			]);
-			$table->addColumn('path_hash', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('parent', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 250,
-			]);
-			$table->addColumn('mimetype', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('mimepart', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('mtime', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('storage_mtime', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('encrypted', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('unencrypted_size', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 40,
-			]);
-			$table->addColumn('permissions', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('checksum', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['fileid']);
-			$table->addUniqueIndex(['storage', 'path_hash'], 'fs_storage_path_hash');
-			$table->addIndex(['parent', 'name'], 'fs_parent_name_hash');
-			$table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
-			$table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
-			$table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
-			$table->addIndex(['mtime'], 'fs_mtime');
-			$table->addIndex(['size'], 'fs_size');
-		}
+        if (!$schema->hasTable('filecache')) {
+            $table = $schema->createTable('filecache');
+            $table->addColumn('fileid', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('storage', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('path', 'string', [
+                'notnull' => false,
+                'length' => 4000,
+            ]);
+            $table->addColumn('path_hash', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('parent', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 250,
+            ]);
+            $table->addColumn('mimetype', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('mimepart', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('mtime', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('storage_mtime', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('encrypted', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('unencrypted_size', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 40,
+            ]);
+            $table->addColumn('permissions', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('checksum', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['fileid']);
+            $table->addUniqueIndex(['storage', 'path_hash'], 'fs_storage_path_hash');
+            $table->addIndex(['parent', 'name'], 'fs_parent_name_hash');
+            $table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
+            $table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
+            $table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
+            $table->addIndex(['mtime'], 'fs_mtime');
+            $table->addIndex(['size'], 'fs_size');
+        }
 
-		if (!$schema->hasTable('group_user')) {
-			$table = $schema->createTable('group_user');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid', 'uid']);
-			$table->addIndex(['uid'], 'gu_uid_index');
-		}
+        if (!$schema->hasTable('group_user')) {
+            $table = $schema->createTable('group_user');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid', 'uid']);
+            $table->addIndex(['uid'], 'gu_uid_index');
+        }
 
-		if (!$schema->hasTable('group_admin')) {
-			$table = $schema->createTable('group_admin');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid', 'uid']);
-			$table->addIndex(['uid'], 'group_admin_uid');
-		}
+        if (!$schema->hasTable('group_admin')) {
+            $table = $schema->createTable('group_admin');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid', 'uid']);
+            $table->addIndex(['uid'], 'group_admin_uid');
+        }
 
-		if (!$schema->hasTable('groups')) {
-			$table = $schema->createTable('groups');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid']);
-		}
+        if (!$schema->hasTable('groups')) {
+            $table = $schema->createTable('groups');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid']);
+        }
 
-		if (!$schema->hasTable('preferences')) {
-			$table = $schema->createTable('preferences');
-			$table->addColumn('userid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('appid', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('configkey', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('configvalue', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['userid', 'appid', 'configkey']);
-		}
+        if (!$schema->hasTable('preferences')) {
+            $table = $schema->createTable('preferences');
+            $table->addColumn('userid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('appid', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('configkey', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('configvalue', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['userid', 'appid', 'configkey']);
+        }
 
-		if (!$schema->hasTable('properties')) {
-			$table = $schema->createTable('properties');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('userid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('propertypath', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('propertyname', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('propertyvalue', 'text', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['userid'], 'property_index');
-			$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
-		} else {
-			$table = $schema->getTable('properties');
-			if ($table->hasColumn('propertytype')) {
-				$table->dropColumn('propertytype');
-			}
-			if ($table->hasColumn('fileid')) {
-				$table->dropColumn('fileid');
-			}
-			if (!$table->hasColumn('propertypath')) {
-				$table->addColumn('propertypath', 'string', [
-					'notnull' => true,
-					'length' => 255,
-				]);
-			}
-			if (!$table->hasColumn('userid')) {
-				$table->addColumn('userid', 'string', [
-					'notnull' => false,
-					'length' => 64,
-					'default' => '',
-				]);
-			}
-		}
+        if (!$schema->hasTable('properties')) {
+            $table = $schema->createTable('properties');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('userid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('propertypath', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('propertyname', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('propertyvalue', 'text', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['userid'], 'property_index');
+            $table->addIndex(['userid', 'propertypath'], 'properties_path_index');
+        } else {
+            $table = $schema->getTable('properties');
+            if ($table->hasColumn('propertytype')) {
+                $table->dropColumn('propertytype');
+            }
+            if ($table->hasColumn('fileid')) {
+                $table->dropColumn('fileid');
+            }
+            if (!$table->hasColumn('propertypath')) {
+                $table->addColumn('propertypath', 'string', [
+                    'notnull' => true,
+                    'length' => 255,
+                ]);
+            }
+            if (!$table->hasColumn('userid')) {
+                $table->addColumn('userid', 'string', [
+                    'notnull' => false,
+                    'length' => 64,
+                    'default' => '',
+                ]);
+            }
+        }
 
-		if (!$schema->hasTable('share')) {
-			$table = $schema->createTable('share');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('share_type', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('share_with', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('password', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uid_owner', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid_initiator', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('parent', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('item_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('item_source', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('item_target', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('file_source', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('file_target', 'string', [
-				'notnull' => false,
-				'length' => 512,
-			]);
-			$table->addColumn('permissions', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('stime', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('accepted', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('expiration', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('token', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('mail_send', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('share_name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['item_type', 'share_type'], 'item_share_type_index');
-			$table->addIndex(['file_source'], 'file_source_index');
-			$table->addIndex(['token'], 'token_index');
-			$table->addIndex(['share_with'], 'share_with_index');
-			$table->addIndex(['parent'], 'parent_index');
-			$table->addIndex(['uid_owner'], 'owner_index');
-			$table->addIndex(['uid_initiator'], 'initiator_index');
-		} else {
-			$table = $schema->getTable('share');
-			if (!$table->hasColumn('password')) {
-				$table->addColumn('password', 'string', [
-					'notnull' => false,
-					'length' => 255,
-				]);
-			}
-		}
+        if (!$schema->hasTable('share')) {
+            $table = $schema->createTable('share');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('share_type', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('share_with', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('password', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uid_owner', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid_initiator', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('parent', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('item_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('item_source', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('item_target', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('file_source', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('file_target', 'string', [
+                'notnull' => false,
+                'length' => 512,
+            ]);
+            $table->addColumn('permissions', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('stime', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('accepted', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('expiration', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('token', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('mail_send', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('share_name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['item_type', 'share_type'], 'item_share_type_index');
+            $table->addIndex(['file_source'], 'file_source_index');
+            $table->addIndex(['token'], 'token_index');
+            $table->addIndex(['share_with'], 'share_with_index');
+            $table->addIndex(['parent'], 'parent_index');
+            $table->addIndex(['uid_owner'], 'owner_index');
+            $table->addIndex(['uid_initiator'], 'initiator_index');
+        } else {
+            $table = $schema->getTable('share');
+            if (!$table->hasColumn('password')) {
+                $table->addColumn('password', 'string', [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+            }
+        }
 
-		if (!$schema->hasTable('jobs')) {
-			$table = $schema->createTable('jobs');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('argument', 'string', [
-				'notnull' => true,
-				'length' => 4000,
-				'default' => '',
-			]);
-			$table->addColumn('last_run', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('last_checked', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('reserved_at', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('execution_duration', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['class'], 'job_class_index');
-		}
+        if (!$schema->hasTable('jobs')) {
+            $table = $schema->createTable('jobs');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('argument', 'string', [
+                'notnull' => true,
+                'length' => 4000,
+                'default' => '',
+            ]);
+            $table->addColumn('last_run', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('last_checked', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('reserved_at', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('execution_duration', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['class'], 'job_class_index');
+        }
 
-		if (!$schema->hasTable('users')) {
-			$table = $schema->createTable('users');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('password', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
+        if (!$schema->hasTable('users')) {
+            $table = $schema->createTable('users');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('password', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
 
-		if (!$schema->hasTable('authtoken')) {
-			$table = $schema->createTable('authtoken');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('login_name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('password', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('name', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->addColumn('token', 'string', [
-				'notnull' => true,
-				'length' => 200,
-				'default' => '',
-			]);
-			$table->addColumn('type', 'smallint', [
-				'notnull' => false,
-				'length' => 2,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('remember', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('last_activity', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('scope', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['token'], 'authtoken_token_index');
-			$table->addIndex(['last_activity'], 'authtoken_last_activity_idx');
-		} else {
-			$table = $schema->getTable('authtoken');
-			$table->addColumn('scope', 'text', [
-				'notnull' => false,
-			]);
-		}
+        if (!$schema->hasTable('authtoken')) {
+            $table = $schema->createTable('authtoken');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('login_name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('password', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('name', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->addColumn('token', 'string', [
+                'notnull' => true,
+                'length' => 200,
+                'default' => '',
+            ]);
+            $table->addColumn('type', 'smallint', [
+                'notnull' => false,
+                'length' => 2,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('remember', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('last_activity', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('scope', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['token'], 'authtoken_token_index');
+            $table->addIndex(['last_activity'], 'authtoken_last_activity_idx');
+        } else {
+            $table = $schema->getTable('authtoken');
+            $table->addColumn('scope', 'text', [
+                'notnull' => false,
+            ]);
+        }
 
-		if (!$schema->hasTable('bruteforce_attempts')) {
-			$table = $schema->createTable('bruteforce_attempts');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('action', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('occurred', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('ip', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('subnet', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('metadata', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['ip'], 'bruteforce_attempts_ip');
-			$table->addIndex(['subnet'], 'bruteforce_attempts_subnet');
-		}
+        if (!$schema->hasTable('bruteforce_attempts')) {
+            $table = $schema->createTable('bruteforce_attempts');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('action', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('occurred', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('ip', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('subnet', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('metadata', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['ip'], 'bruteforce_attempts_ip');
+            $table->addIndex(['subnet'], 'bruteforce_attempts_subnet');
+        }
 
-		if (!$schema->hasTable('vcategory')) {
-			$table = $schema->createTable('vcategory');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('category', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'uid_index');
-			$table->addIndex(['type'], 'type_index');
-			$table->addIndex(['category'], 'category_index');
-		}
+        if (!$schema->hasTable('vcategory')) {
+            $table = $schema->createTable('vcategory');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('category', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'uid_index');
+            $table->addIndex(['type'], 'type_index');
+            $table->addIndex(['category'], 'category_index');
+        }
 
-		if (!$schema->hasTable('vcategory_to_object')) {
-			$table = $schema->createTable('vcategory_to_object');
-			$table->addColumn('objid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('categoryid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['categoryid', 'objid', 'type']);
-			$table->addIndex(['objid', 'type'], 'vcategory_objectd_index');
-		}
+        if (!$schema->hasTable('vcategory_to_object')) {
+            $table = $schema->createTable('vcategory_to_object');
+            $table->addColumn('objid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('categoryid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['categoryid', 'objid', 'type']);
+            $table->addIndex(['objid', 'type'], 'vcategory_objectd_index');
+        }
 
-		if (!$schema->hasTable('systemtag')) {
-			$table = $schema->createTable('systemtag');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('visibility', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 1,
-			]);
-			$table->addColumn('editable', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['name', 'visibility', 'editable'], 'tag_ident');
-		}
+        if (!$schema->hasTable('systemtag')) {
+            $table = $schema->createTable('systemtag');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('visibility', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 1,
+            ]);
+            $table->addColumn('editable', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['name', 'visibility', 'editable'], 'tag_ident');
+        }
 
-		if (!$schema->hasTable('systemtag_object_mapping')) {
-			$table = $schema->createTable('systemtag_object_mapping');
-			$table->addColumn('objectid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('objecttype', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('systemtagid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk');
+        if (!$schema->hasTable('systemtag_object_mapping')) {
+            $table = $schema->createTable('systemtag_object_mapping');
+            $table->addColumn('objectid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('objecttype', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('systemtagid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk');
 //			$table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping');
-		}
+        }
 
-		if (!$schema->hasTable('systemtag_group')) {
-			$table = $schema->createTable('systemtag_group');
-			$table->addColumn('systemtagid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['gid', 'systemtagid']);
-		}
+        if (!$schema->hasTable('systemtag_group')) {
+            $table = $schema->createTable('systemtag_group');
+            $table->addColumn('systemtagid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['gid', 'systemtagid']);
+        }
 
-		if (!$schema->hasTable('file_locks')) {
-			$table = $schema->createTable('file_locks');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lock', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('key', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('ttl', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => -1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['key'], 'lock_key_index');
-			$table->addIndex(['ttl'], 'lock_ttl_index');
-		}
+        if (!$schema->hasTable('file_locks')) {
+            $table = $schema->createTable('file_locks');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lock', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('key', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('ttl', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => -1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['key'], 'lock_key_index');
+            $table->addIndex(['ttl'], 'lock_ttl_index');
+        }
 
-		if (!$schema->hasTable('comments')) {
-			$table = $schema->createTable('comments');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('parent_id', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('topmost_parent_id', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('children_count', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('actor_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('actor_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('message', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('verb', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('creation_timestamp', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('latest_child_timestamp', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('object_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('object_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('reference_id', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['parent_id'], 'comments_parent_id_index');
-			$table->addIndex(['topmost_parent_id'], 'comments_topmost_parent_id_idx');
-			$table->addIndex(['object_type', 'object_id', 'creation_timestamp'], 'comments_object_index');
-			$table->addIndex(['actor_type', 'actor_id'], 'comments_actor_index');
-		}
+        if (!$schema->hasTable('comments')) {
+            $table = $schema->createTable('comments');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('parent_id', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('topmost_parent_id', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('children_count', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('actor_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('actor_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('message', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('verb', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('creation_timestamp', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('latest_child_timestamp', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('object_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('object_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('reference_id', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['parent_id'], 'comments_parent_id_index');
+            $table->addIndex(['topmost_parent_id'], 'comments_topmost_parent_id_idx');
+            $table->addIndex(['object_type', 'object_id', 'creation_timestamp'], 'comments_object_index');
+            $table->addIndex(['actor_type', 'actor_id'], 'comments_actor_index');
+        }
 
-		if (!$schema->hasTable('comments_read_markers')) {
-			$table = $schema->createTable('comments_read_markers');
-			$table->addColumn('user_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('marker_datetime', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('object_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('object_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index');
-			$table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk');
+        if (!$schema->hasTable('comments_read_markers')) {
+            $table = $schema->createTable('comments_read_markers');
+            $table->addColumn('user_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('marker_datetime', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('object_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('object_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index');
+            $table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk');
 //			$table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index');
-		}
+        }
 
 //		if (!$schema->hasTable('credentials')) {
 //			$table = $schema->createTable('credentials');
@@ -900,139 +900,139 @@ 
 //			$table->addIndex(['user'], 'credentials_user');
 //		}
 
-		if (!$schema->hasTable('admin_sections')) {
-			$table = $schema->createTable('admin_sections');
-			$table->addColumn('id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'admin_sections_class');
-		}
+        if (!$schema->hasTable('admin_sections')) {
+            $table = $schema->createTable('admin_sections');
+            $table->addColumn('id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'admin_sections_class');
+        }
 
-		if (!$schema->hasTable('admin_settings')) {
-			$table = $schema->createTable('admin_settings');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('section', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'admin_settings_class');
-			$table->addIndex(['section'], 'admin_settings_section');
-		}
+        if (!$schema->hasTable('admin_settings')) {
+            $table = $schema->createTable('admin_settings');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('section', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'admin_settings_class');
+            $table->addIndex(['section'], 'admin_settings_section');
+        }
 
-		if (!$schema->hasTable('personal_sections')) {
-			$table = $schema->createTable('personal_sections');
-			$table->addColumn('id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'personal_sections_class');
-		}
+        if (!$schema->hasTable('personal_sections')) {
+            $table = $schema->createTable('personal_sections');
+            $table->addColumn('id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'personal_sections_class');
+        }
 
-		if (!$schema->hasTable('personal_settings')) {
-			$table = $schema->createTable('personal_settings');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('section', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'personal_settings_class');
-			$table->addIndex(['section'], 'personal_settings_section');
-		}
+        if (!$schema->hasTable('personal_settings')) {
+            $table = $schema->createTable('personal_settings');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('section', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'personal_settings_class');
+            $table->addIndex(['section'], 'personal_settings_section');
+        }
 
-		if (!$schema->hasTable('accounts')) {
-			$table = $schema->createTable('accounts');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('accounts')) {
+            $table = $schema->createTable('accounts');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
+        return $schema;
+    }
 
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('dav_properties')) {
-			return;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('dav_properties');
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('dav_properties')) {
+            return;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('dav_properties');
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('properties')
-			->setValue('propertypath', $insert->createParameter('propertypath'))
-			->setValue('propertyname', $insert->createParameter('propertyname'))
-			->setValue('propertyvalue', $insert->createParameter('propertyvalue'))
-			->setValue('userid', $insert->createParameter('userid'));
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('properties')
+            ->setValue('propertypath', $insert->createParameter('propertypath'))
+            ->setValue('propertyname', $insert->createParameter('propertyname'))
+            ->setValue('propertyvalue', $insert->createParameter('propertyvalue'))
+            ->setValue('userid', $insert->createParameter('userid'));
 
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			preg_match('/(calendar)\/([A-z0-9-@_]+)\//', $row['propertypath'], $match);
-			$insert->setParameter('propertypath', (string) $row['propertypath'])
-				->setParameter('propertyname', (string) $row['propertyname'])
-				->setParameter('propertyvalue', (string) $row['propertyvalue'])
-				->setParameter('userid', ($match[2] ?? ''));
-			$insert->execute();
-		}
-	}
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            preg_match('/(calendar)\/([A-z0-9-@_]+)\//', $row['propertypath'], $match);
+            $insert->setParameter('propertypath', (string) $row['propertypath'])
+                ->setParameter('propertyname', (string) $row['propertyname'])
+                ->setParameter('propertyvalue', (string) $row['propertyvalue'])
+                ->setParameter('userid', ($match[2] ?? ''));
+            $insert->execute();
+        }
+    }
 }

lib/private/Security/Normalizer/IpAddress.php

Indentation +76 added lines, -76 removed lines

@@ -37,85 +37,85 @@
  * @package OC\Security\Normalizer
  */
 class IpAddress {
-	/** @var string */
-	private $ip;
+    /** @var string */
+    private $ip;
 
-	/**
-	 * @param string $ip IP to normalized
-	 */
-	public function __construct(string $ip) {
-		$this->ip = $ip;
-	}
+    /**
+     * @param string $ip IP to normalized
+     */
+    public function __construct(string $ip) {
+        $this->ip = $ip;
+    }
 
-	/**
-	 * Return the given subnet for an IPv4 address and mask bits
-	 *
-	 * @param string $ip
-	 * @param int $maskBits
-	 * @return string
-	 */
-	private function getIPv4Subnet(string $ip, int $maskBits = 32): string {
-		$binary = \inet_pton($ip);
-		for ($i = 32; $i > $maskBits; $i -= 8) {
-			$j = \intdiv($i, 8) - 1;
-			$k = \min(8, $i - $maskBits);
-			$mask = (0xff - ((2 ** $k) - 1));
-			$int = \unpack('C', $binary[$j]);
-			$binary[$j] = \pack('C', $int[1] & $mask);
-		}
-		return \inet_ntop($binary).'/'.$maskBits;
-	}
+    /**
+     * Return the given subnet for an IPv4 address and mask bits
+     *
+     * @param string $ip
+     * @param int $maskBits
+     * @return string
+     */
+    private function getIPv4Subnet(string $ip, int $maskBits = 32): string {
+        $binary = \inet_pton($ip);
+        for ($i = 32; $i > $maskBits; $i -= 8) {
+            $j = \intdiv($i, 8) - 1;
+            $k = \min(8, $i - $maskBits);
+            $mask = (0xff - ((2 ** $k) - 1));
+            $int = \unpack('C', $binary[$j]);
+            $binary[$j] = \pack('C', $int[1] & $mask);
+        }
+        return \inet_ntop($binary).'/'.$maskBits;
+    }
 
-	/**
-	 * Return the given subnet for an IPv6 address and mask bits
-	 *
-	 * @param string $ip
-	 * @param int $maskBits
-	 * @return string
-	 */
-	private function getIPv6Subnet(string $ip, int $maskBits = 48): string {
-		if ($ip[0] === '[' && $ip[-1] === ']') { // If IP is with brackets, for example [::1]
-			$ip = substr($ip, 1, strlen($ip) - 2);
-		}
-		$pos = strpos($ip, '%'); // if there is an explicit interface added to the IP, e.g. fe80::ae2d:d1e7:fe1e:9a8d%enp2s0
-		if ($pos !== false) {
-			$ip = substr($ip, 0, $pos - 1);
-		}
-		$binary = \inet_pton($ip);
-		for ($i = 128; $i > $maskBits; $i -= 8) {
-			$j = \intdiv($i, 8) - 1;
-			$k = \min(8, $i - $maskBits);
-			$mask = (0xff - ((2 ** $k) - 1));
-			$int = \unpack('C', $binary[$j]);
-			$binary[$j] = \pack('C', $int[1] & $mask);
-		}
-		return \inet_ntop($binary).'/'.$maskBits;
-	}
+    /**
+     * Return the given subnet for an IPv6 address and mask bits
+     *
+     * @param string $ip
+     * @param int $maskBits
+     * @return string
+     */
+    private function getIPv6Subnet(string $ip, int $maskBits = 48): string {
+        if ($ip[0] === '[' && $ip[-1] === ']') { // If IP is with brackets, for example [::1]
+            $ip = substr($ip, 1, strlen($ip) - 2);
+        }
+        $pos = strpos($ip, '%'); // if there is an explicit interface added to the IP, e.g. fe80::ae2d:d1e7:fe1e:9a8d%enp2s0
+        if ($pos !== false) {
+            $ip = substr($ip, 0, $pos - 1);
+        }
+        $binary = \inet_pton($ip);
+        for ($i = 128; $i > $maskBits; $i -= 8) {
+            $j = \intdiv($i, 8) - 1;
+            $k = \min(8, $i - $maskBits);
+            $mask = (0xff - ((2 ** $k) - 1));
+            $int = \unpack('C', $binary[$j]);
+            $binary[$j] = \pack('C', $int[1] & $mask);
+        }
+        return \inet_ntop($binary).'/'.$maskBits;
+    }
 
-	/**
-	 * Gets either the /32 (IPv4) or the /128 (IPv6) subnet of an IP address
-	 *
-	 * @return string
-	 */
-	public function getSubnet(): string {
-		if (\preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $this->ip)) {
-			return $this->getIPv4Subnet(
-				$this->ip,
-				32
-			);
-		}
-		return $this->getIPv6Subnet(
-			$this->ip,
-			128
-		);
-	}
+    /**
+     * Gets either the /32 (IPv4) or the /128 (IPv6) subnet of an IP address
+     *
+     * @return string
+     */
+    public function getSubnet(): string {
+        if (\preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $this->ip)) {
+            return $this->getIPv4Subnet(
+                $this->ip,
+                32
+            );
+        }
+        return $this->getIPv6Subnet(
+            $this->ip,
+            128
+        );
+    }
 
-	/**
-	 * Returns the specified IP address
-	 *
-	 * @return string
-	 */
-	public function __toString(): string {
-		return $this->ip;
-	}
+    /**
+     * Returns the specified IP address
+     *
+     * @return string
+     */
+    public function __toString(): string {
+        return $this->ip;
+    }
 }

lib/private/App/DependencyAnalyzer.php

Indentation +367 added lines, -367 removed lines

@@ -36,371 +36,371 @@
 
 class DependencyAnalyzer {
 
-	/** @var Platform */
-	private $platform;
-	/** @var \OCP\IL10N */
-	private $l;
-	/** @var array */
-	private $appInfo;
-
-	/**
-	 * @param Platform $platform
-	 * @param \OCP\IL10N $l
-	 */
-	public function __construct(Platform $platform, IL10N $l) {
-		$this->platform = $platform;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param array $app
-	 * @returns array of missing dependencies
-	 */
-	public function analyze(array $app, bool $ignoreMax = false) {
-		$this->appInfo = $app;
-		if (isset($app['dependencies'])) {
-			$dependencies = $app['dependencies'];
-		} else {
-			$dependencies = [];
-		}
-
-		return array_merge(
-			$this->analyzeArchitecture($dependencies),
-			$this->analyzePhpVersion($dependencies),
-			$this->analyzeDatabases($dependencies),
-			$this->analyzeCommands($dependencies),
-			$this->analyzeLibraries($dependencies),
-			$this->analyzeOS($dependencies),
-			$this->analyzeOC($dependencies, $app, $ignoreMax)
-		);
-	}
-
-	public function isMarkedCompatible(array $app): bool {
-		if (isset($app['dependencies'])) {
-			$dependencies = $app['dependencies'];
-		} else {
-			$dependencies = [];
-		}
-
-		$maxVersion = $this->getMaxVersion($dependencies, $app);
-		if ($maxVersion === null) {
-			return true;
-		}
-		return !$this->compareBigger($this->platform->getOcVersion(), $maxVersion);
-	}
-
-	/**
-	 * Truncates both versions to the lowest common version, e.g.
-	 * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
-	 * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
-	 * @param string $first
-	 * @param string $second
-	 * @return string[] first element is the first version, second element is the
-	 * second version
-	 */
-	private function normalizeVersions($first, $second) {
-		$first = explode('.', $first);
-		$second = explode('.', $second);
-
-		// get both arrays to the same minimum size
-		$length = min(count($second), count($first));
-		$first = array_slice($first, 0, $length);
-		$second = array_slice($second, 0, $length);
-
-		return [implode('.', $first), implode('.', $second)];
-	}
-
-	/**
-	 * Parameters will be normalized and then passed into version_compare
-	 * in the same order they are specified in the method header
-	 * @param string $first
-	 * @param string $second
-	 * @param string $operator
-	 * @return bool result similar to version_compare
-	 */
-	private function compare($first, $second, $operator) {
-		// we can't normalize versions if one of the given parameters is not a
-		// version string but null. In case one parameter is null normalization
-		// will therefore be skipped
-		if ($first !== null && $second !== null) {
-			list($first, $second) = $this->normalizeVersions($first, $second);
-		}
-
-		return version_compare($first, $second, $operator);
-	}
-
-	/**
-	 * Checks if a version is bigger than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is bigger than the second
-	 */
-	private function compareBigger($first, $second) {
-		return $this->compare($first, $second, '>');
-	}
-
-	/**
-	 * Checks if a version is smaller than another version
-	 * @param string $first
-	 * @param string $second
-	 * @return bool true if the first version is smaller than the second
-	 */
-	private function compareSmaller($first, $second) {
-		return $this->compare($first, $second, '<');
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzePhpVersion(array $dependencies) {
-		$missing = [];
-		if (isset($dependencies['php']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['php']['@attributes']['min-version'];
-			if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
-				$missing[] = $this->l->t('PHP %s or higher is required.', [$minVersion]);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['max-version'])) {
-			$maxVersion = $dependencies['php']['@attributes']['max-version'];
-			if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
-				$missing[] = $this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
-			}
-		}
-		if (isset($dependencies['php']['@attributes']['min-int-size'])) {
-			$intSize = $dependencies['php']['@attributes']['min-int-size'];
-			if ($intSize > $this->platform->getIntSize() * 8) {
-				$missing[] = $this->l->t('%sbit or higher PHP required.', [$intSize]);
-			}
-		}
-		return $missing;
-	}
-
-	private function analyzeArchitecture(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['architecture'])) {
-			return $missing;
-		}
-
-		$supportedArchitectures = $dependencies['architecture'];
-		if (empty($supportedArchitectures)) {
-			return $missing;
-		}
-		if (!is_array($supportedArchitectures)) {
-			$supportedArchitectures = [$supportedArchitectures];
-		}
-		$supportedArchitectures = array_map(function ($architecture) {
-			return $this->getValue($architecture);
-		}, $supportedArchitectures);
-		$currentArchitecture = $this->platform->getArchitecture();
-		if (!in_array($currentArchitecture, $supportedArchitectures, true)) {
-			$missing[] = $this->l->t('The following architectures are supported: %s', [implode(', ', $supportedArchitectures)]);
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeDatabases(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['database'])) {
-			return $missing;
-		}
-
-		$supportedDatabases = $dependencies['database'];
-		if (empty($supportedDatabases)) {
-			return $missing;
-		}
-		if (!is_array($supportedDatabases)) {
-			$supportedDatabases = [$supportedDatabases];
-		}
-		$supportedDatabases = array_map(function ($db) {
-			return $this->getValue($db);
-		}, $supportedDatabases);
-		$currentDatabase = $this->platform->getDatabase();
-		if (!in_array($currentDatabase, $supportedDatabases)) {
-			$missing[] = $this->l->t('The following databases are supported: %s', [implode(', ', $supportedDatabases)]);
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeCommands(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['command'])) {
-			return $missing;
-		}
-
-		$commands = $dependencies['command'];
-		if (!is_array($commands)) {
-			$commands = [$commands];
-		}
-		if (isset($commands['@value'])) {
-			$commands = [$commands];
-		}
-		$os = $this->platform->getOS();
-		foreach ($commands as $command) {
-			if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
-				continue;
-			}
-			$commandName = $this->getValue($command);
-			if (!$this->platform->isCommandKnown($commandName)) {
-				$missing[] = $this->l->t('The command line tool %s could not be found', [$commandName]);
-			}
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeLibraries(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['lib'])) {
-			return $missing;
-		}
-
-		$libs = $dependencies['lib'];
-		if (!is_array($libs)) {
-			$libs = [$libs];
-		}
-		if (isset($libs['@value'])) {
-			$libs = [$libs];
-		}
-		foreach ($libs as $lib) {
-			$libName = $this->getValue($lib);
-			$libVersion = $this->platform->getLibraryVersion($libName);
-			if (is_null($libVersion)) {
-				$missing[] = $this->l->t('The library %s is not available.', [$libName]);
-				continue;
-			}
-
-			if (is_array($lib)) {
-				if (isset($lib['@attributes']['min-version'])) {
-					$minVersion = $lib['@attributes']['min-version'];
-					if ($this->compareSmaller($libVersion, $minVersion)) {
-						$missing[] = $this->l->t('Library %1$s with a version higher than %2$s is required - available version %3$s.',
-							[$libName, $minVersion, $libVersion]);
-					}
-				}
-				if (isset($lib['@attributes']['max-version'])) {
-					$maxVersion = $lib['@attributes']['max-version'];
-					if ($this->compareBigger($libVersion, $maxVersion)) {
-						$missing[] = $this->l->t('Library %1$s with a version lower than %2$s is required - available version %3$s.',
-							[$libName, $maxVersion, $libVersion]);
-					}
-				}
-			}
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @return array
-	 */
-	private function analyzeOS(array $dependencies) {
-		$missing = [];
-		if (!isset($dependencies['os'])) {
-			return $missing;
-		}
-
-		$oss = $dependencies['os'];
-		if (empty($oss)) {
-			return $missing;
-		}
-		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
-				return $this->getValue($os);
-			}, $oss);
-		} else {
-			$oss = [$oss];
-		}
-		$currentOS = $this->platform->getOS();
-		if (!in_array($currentOS, $oss)) {
-			$missing[] = $this->l->t('The following platforms are supported: %s', [implode(', ', $oss)]);
-		}
-		return $missing;
-	}
-
-	/**
-	 * @param array $dependencies
-	 * @param array $appInfo
-	 * @return array
-	 */
-	private function analyzeOC(array $dependencies, array $appInfo, bool $ignoreMax) {
-		$missing = [];
-		$minVersion = null;
-		if (isset($dependencies['nextcloud']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['nextcloud']['@attributes']['min-version'];
-		} elseif (isset($dependencies['owncloud']['@attributes']['min-version'])) {
-			$minVersion = $dependencies['owncloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['requiremin'])) {
-			$minVersion = $appInfo['requiremin'];
-		} elseif (isset($appInfo['require'])) {
-			$minVersion = $appInfo['require'];
-		}
-		$maxVersion = $this->getMaxVersion($dependencies, $appInfo);
-
-		if (!is_null($minVersion)) {
-			if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
-				$missing[] = $this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
-			}
-		}
-		if (!$ignoreMax && !is_null($maxVersion)) {
-			if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
-				$missing[] = $this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
-			}
-		}
-		return $missing;
-	}
-
-	private function getMaxVersion(array $dependencies, array $appInfo): ?string {
-		if (isset($dependencies['nextcloud']['@attributes']['max-version'])) {
-			return $dependencies['nextcloud']['@attributes']['max-version'];
-		}
-		if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
-			return $dependencies['owncloud']['@attributes']['max-version'];
-		}
-		if (isset($appInfo['requiremax'])) {
-			return $appInfo['requiremax'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Map the internal version number to the Nextcloud version
-	 *
-	 * @param string $version
-	 * @return string
-	 */
-	protected function toVisibleVersion($version) {
-		switch ($version) {
-			case '9.1':
-				return '10';
-			default:
-				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
-				}
-				return $version;
-		}
-	}
-
-	/**
-	 * @param $element
-	 * @return mixed
-	 */
-	private function getValue($element) {
-		if (isset($element['@value'])) {
-			return $element['@value'];
-		}
-		return (string)$element;
-	}
+    /** @var Platform */
+    private $platform;
+    /** @var \OCP\IL10N */
+    private $l;
+    /** @var array */
+    private $appInfo;
+
+    /**
+     * @param Platform $platform
+     * @param \OCP\IL10N $l
+     */
+    public function __construct(Platform $platform, IL10N $l) {
+        $this->platform = $platform;
+        $this->l = $l;
+    }
+
+    /**
+     * @param array $app
+     * @returns array of missing dependencies
+     */
+    public function analyze(array $app, bool $ignoreMax = false) {
+        $this->appInfo = $app;
+        if (isset($app['dependencies'])) {
+            $dependencies = $app['dependencies'];
+        } else {
+            $dependencies = [];
+        }
+
+        return array_merge(
+            $this->analyzeArchitecture($dependencies),
+            $this->analyzePhpVersion($dependencies),
+            $this->analyzeDatabases($dependencies),
+            $this->analyzeCommands($dependencies),
+            $this->analyzeLibraries($dependencies),
+            $this->analyzeOS($dependencies),
+            $this->analyzeOC($dependencies, $app, $ignoreMax)
+        );
+    }
+
+    public function isMarkedCompatible(array $app): bool {
+        if (isset($app['dependencies'])) {
+            $dependencies = $app['dependencies'];
+        } else {
+            $dependencies = [];
+        }
+
+        $maxVersion = $this->getMaxVersion($dependencies, $app);
+        if ($maxVersion === null) {
+            return true;
+        }
+        return !$this->compareBigger($this->platform->getOcVersion(), $maxVersion);
+    }
+
+    /**
+     * Truncates both versions to the lowest common version, e.g.
+     * 5.1.2.3 and 5.1 will be turned into 5.1 and 5.1,
+     * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
+     * @param string $first
+     * @param string $second
+     * @return string[] first element is the first version, second element is the
+     * second version
+     */
+    private function normalizeVersions($first, $second) {
+        $first = explode('.', $first);
+        $second = explode('.', $second);
+
+        // get both arrays to the same minimum size
+        $length = min(count($second), count($first));
+        $first = array_slice($first, 0, $length);
+        $second = array_slice($second, 0, $length);
+
+        return [implode('.', $first), implode('.', $second)];
+    }
+
+    /**
+     * Parameters will be normalized and then passed into version_compare
+     * in the same order they are specified in the method header
+     * @param string $first
+     * @param string $second
+     * @param string $operator
+     * @return bool result similar to version_compare
+     */
+    private function compare($first, $second, $operator) {
+        // we can't normalize versions if one of the given parameters is not a
+        // version string but null. In case one parameter is null normalization
+        // will therefore be skipped
+        if ($first !== null && $second !== null) {
+            list($first, $second) = $this->normalizeVersions($first, $second);
+        }
+
+        return version_compare($first, $second, $operator);
+    }
+
+    /**
+     * Checks if a version is bigger than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is bigger than the second
+     */
+    private function compareBigger($first, $second) {
+        return $this->compare($first, $second, '>');
+    }
+
+    /**
+     * Checks if a version is smaller than another version
+     * @param string $first
+     * @param string $second
+     * @return bool true if the first version is smaller than the second
+     */
+    private function compareSmaller($first, $second) {
+        return $this->compare($first, $second, '<');
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzePhpVersion(array $dependencies) {
+        $missing = [];
+        if (isset($dependencies['php']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['php']['@attributes']['min-version'];
+            if ($this->compareSmaller($this->platform->getPhpVersion(), $minVersion)) {
+                $missing[] = $this->l->t('PHP %s or higher is required.', [$minVersion]);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['max-version'])) {
+            $maxVersion = $dependencies['php']['@attributes']['max-version'];
+            if ($this->compareBigger($this->platform->getPhpVersion(), $maxVersion)) {
+                $missing[] = $this->l->t('PHP with a version lower than %s is required.', [$maxVersion]);
+            }
+        }
+        if (isset($dependencies['php']['@attributes']['min-int-size'])) {
+            $intSize = $dependencies['php']['@attributes']['min-int-size'];
+            if ($intSize > $this->platform->getIntSize() * 8) {
+                $missing[] = $this->l->t('%sbit or higher PHP required.', [$intSize]);
+            }
+        }
+        return $missing;
+    }
+
+    private function analyzeArchitecture(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['architecture'])) {
+            return $missing;
+        }
+
+        $supportedArchitectures = $dependencies['architecture'];
+        if (empty($supportedArchitectures)) {
+            return $missing;
+        }
+        if (!is_array($supportedArchitectures)) {
+            $supportedArchitectures = [$supportedArchitectures];
+        }
+        $supportedArchitectures = array_map(function ($architecture) {
+            return $this->getValue($architecture);
+        }, $supportedArchitectures);
+        $currentArchitecture = $this->platform->getArchitecture();
+        if (!in_array($currentArchitecture, $supportedArchitectures, true)) {
+            $missing[] = $this->l->t('The following architectures are supported: %s', [implode(', ', $supportedArchitectures)]);
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeDatabases(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['database'])) {
+            return $missing;
+        }
+
+        $supportedDatabases = $dependencies['database'];
+        if (empty($supportedDatabases)) {
+            return $missing;
+        }
+        if (!is_array($supportedDatabases)) {
+            $supportedDatabases = [$supportedDatabases];
+        }
+        $supportedDatabases = array_map(function ($db) {
+            return $this->getValue($db);
+        }, $supportedDatabases);
+        $currentDatabase = $this->platform->getDatabase();
+        if (!in_array($currentDatabase, $supportedDatabases)) {
+            $missing[] = $this->l->t('The following databases are supported: %s', [implode(', ', $supportedDatabases)]);
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeCommands(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['command'])) {
+            return $missing;
+        }
+
+        $commands = $dependencies['command'];
+        if (!is_array($commands)) {
+            $commands = [$commands];
+        }
+        if (isset($commands['@value'])) {
+            $commands = [$commands];
+        }
+        $os = $this->platform->getOS();
+        foreach ($commands as $command) {
+            if (isset($command['@attributes']['os']) && $command['@attributes']['os'] !== $os) {
+                continue;
+            }
+            $commandName = $this->getValue($command);
+            if (!$this->platform->isCommandKnown($commandName)) {
+                $missing[] = $this->l->t('The command line tool %s could not be found', [$commandName]);
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeLibraries(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['lib'])) {
+            return $missing;
+        }
+
+        $libs = $dependencies['lib'];
+        if (!is_array($libs)) {
+            $libs = [$libs];
+        }
+        if (isset($libs['@value'])) {
+            $libs = [$libs];
+        }
+        foreach ($libs as $lib) {
+            $libName = $this->getValue($lib);
+            $libVersion = $this->platform->getLibraryVersion($libName);
+            if (is_null($libVersion)) {
+                $missing[] = $this->l->t('The library %s is not available.', [$libName]);
+                continue;
+            }
+
+            if (is_array($lib)) {
+                if (isset($lib['@attributes']['min-version'])) {
+                    $minVersion = $lib['@attributes']['min-version'];
+                    if ($this->compareSmaller($libVersion, $minVersion)) {
+                        $missing[] = $this->l->t('Library %1$s with a version higher than %2$s is required - available version %3$s.',
+                            [$libName, $minVersion, $libVersion]);
+                    }
+                }
+                if (isset($lib['@attributes']['max-version'])) {
+                    $maxVersion = $lib['@attributes']['max-version'];
+                    if ($this->compareBigger($libVersion, $maxVersion)) {
+                        $missing[] = $this->l->t('Library %1$s with a version lower than %2$s is required - available version %3$s.',
+                            [$libName, $maxVersion, $libVersion]);
+                    }
+                }
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @return array
+     */
+    private function analyzeOS(array $dependencies) {
+        $missing = [];
+        if (!isset($dependencies['os'])) {
+            return $missing;
+        }
+
+        $oss = $dependencies['os'];
+        if (empty($oss)) {
+            return $missing;
+        }
+        if (is_array($oss)) {
+            $oss = array_map(function ($os) {
+                return $this->getValue($os);
+            }, $oss);
+        } else {
+            $oss = [$oss];
+        }
+        $currentOS = $this->platform->getOS();
+        if (!in_array($currentOS, $oss)) {
+            $missing[] = $this->l->t('The following platforms are supported: %s', [implode(', ', $oss)]);
+        }
+        return $missing;
+    }
+
+    /**
+     * @param array $dependencies
+     * @param array $appInfo
+     * @return array
+     */
+    private function analyzeOC(array $dependencies, array $appInfo, bool $ignoreMax) {
+        $missing = [];
+        $minVersion = null;
+        if (isset($dependencies['nextcloud']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['nextcloud']['@attributes']['min-version'];
+        } elseif (isset($dependencies['owncloud']['@attributes']['min-version'])) {
+            $minVersion = $dependencies['owncloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['requiremin'])) {
+            $minVersion = $appInfo['requiremin'];
+        } elseif (isset($appInfo['require'])) {
+            $minVersion = $appInfo['require'];
+        }
+        $maxVersion = $this->getMaxVersion($dependencies, $appInfo);
+
+        if (!is_null($minVersion)) {
+            if ($this->compareSmaller($this->platform->getOcVersion(), $minVersion)) {
+                $missing[] = $this->l->t('Server version %s or higher is required.', [$this->toVisibleVersion($minVersion)]);
+            }
+        }
+        if (!$ignoreMax && !is_null($maxVersion)) {
+            if ($this->compareBigger($this->platform->getOcVersion(), $maxVersion)) {
+                $missing[] = $this->l->t('Server version %s or lower is required.', [$this->toVisibleVersion($maxVersion)]);
+            }
+        }
+        return $missing;
+    }
+
+    private function getMaxVersion(array $dependencies, array $appInfo): ?string {
+        if (isset($dependencies['nextcloud']['@attributes']['max-version'])) {
+            return $dependencies['nextcloud']['@attributes']['max-version'];
+        }
+        if (isset($dependencies['owncloud']['@attributes']['max-version'])) {
+            return $dependencies['owncloud']['@attributes']['max-version'];
+        }
+        if (isset($appInfo['requiremax'])) {
+            return $appInfo['requiremax'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Map the internal version number to the Nextcloud version
+     *
+     * @param string $version
+     * @return string
+     */
+    protected function toVisibleVersion($version) {
+        switch ($version) {
+            case '9.1':
+                return '10';
+            default:
+                if (strpos($version, '9.1.') === 0) {
+                    $version = '10.0.' . substr($version, 4);
+                }
+                return $version;
+        }
+    }
+
+    /**
+     * @param $element
+     * @return mixed
+     */
+    private function getValue($element) {
+        if (isset($element['@value'])) {
+            return $element['@value'];
+        }
+        return (string)$element;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -189,7 +189,7 @@ 
 		if (!is_array($supportedArchitectures)) {
 			$supportedArchitectures = [$supportedArchitectures];
 		}
-		$supportedArchitectures = array_map(function ($architecture) {
+		$supportedArchitectures = array_map(function($architecture) {
 			return $this->getValue($architecture);
 		}, $supportedArchitectures);
 		$currentArchitecture = $this->platform->getArchitecture();
@@ -216,7 +216,7 @@ 
 		if (!is_array($supportedDatabases)) {
 			$supportedDatabases = [$supportedDatabases];
 		}
-		$supportedDatabases = array_map(function ($db) {
+		$supportedDatabases = array_map(function($db) {
 			return $this->getValue($db);
 		}, $supportedDatabases);
 		$currentDatabase = $this->platform->getDatabase();
@@ -316,7 +316,7 @@ 
 			return $missing;
 		}
 		if (is_array($oss)) {
-			$oss = array_map(function ($os) {
+			$oss = array_map(function($os) {
 				return $this->getValue($os);
 			}, $oss);
 		} else {
@@ -387,7 +387,7 @@ 
 				return '10';
 			default:
 				if (strpos($version, '9.1.') === 0) {
-					$version = '10.0.' . substr($version, 4);
+					$version = '10.0.'.substr($version, 4);
 				}
 				return $version;
 		}
@@ -401,6 +401,6 @@ 
 		if (isset($element['@value'])) {
 			return $element['@value'];
 		}
-		return (string)$element;
+		return (string) $element;
 	}
 }

lib/private/App/AppStore/Bundles/EducationBundle.php

Indentation +19 added lines, -19 removed lines

@@ -25,24 +25,24 @@
 
 class EducationBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return $this->l10n->t('Education Edition');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return $this->l10n->t('Education Edition');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'dashboard',
-			'circles',
-			'groupfolders',
-			'announcementcenter',
-			'quota_warning',
-			'user_saml',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'dashboard',
+            'circles',
+            'groupfolders',
+            'announcementcenter',
+            'quota_warning',
+            'user_saml',
+        ];
+    }
 }

lib/private/App/AppStore/Bundles/GroupwareBundle.php

Indentation +17 added lines, -17 removed lines

@@ -26,22 +26,22 @@
 
 class GroupwareBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return $this->l10n->t('Groupware bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return $this->l10n->t('Groupware bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'calendar',
-			'contacts',
-			'deck',
-			'mail'
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'calendar',
+            'contacts',
+            'deck',
+            'mail'
+        ];
+    }
 }

lib/private/App/AppStore/Bundles/SocialSharingBundle.php

Indentation +17 added lines, -17 removed lines

@@ -25,22 +25,22 @@
 
 class SocialSharingBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return $this->l10n->t('Social sharing bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return $this->l10n->t('Social sharing bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'socialsharing_twitter',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'socialsharing_twitter',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 }

lib/private/Preview/TXT.php

Indentation +70 added lines, -70 removed lines

@@ -35,74 +35,74 @@
 use OCP\IImage;
 
 class TXT extends ProviderV2 {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/text\/plain/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(FileInfo $file): bool {
-		return $file->getSize() > 0;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$content = $file->fopen('r');
-
-		if ($content === false) {
-			return null;
-		}
-
-		$content = stream_get_contents($content,3000);
-
-		//don't create previews of empty text files
-		if (trim($content) === '') {
-			return null;
-		}
-
-		$lines = preg_split("/\r\n|\n|\r/", $content);
-
-		// Define text size of text file preview
-		$fontSize = $maxX ? (int) ((1 / 32) * $maxX) : 5; //5px
-		$lineSize = ceil($fontSize * 1.5);
-
-		$image = imagecreate($maxX, $maxY);
-		imagecolorallocate($image, 255, 255, 255);
-		$textColor = imagecolorallocate($image, 0, 0, 0);
-
-		$fontFile = __DIR__;
-		$fontFile .= '/../../../core';
-		$fontFile .= '/fonts/NotoSans-Regular.ttf';
-
-		$canUseTTF = function_exists('imagettftext');
-
-		foreach ($lines as $index => $line) {
-			$index = $index + 1;
-
-			$x = 1;
-			$y = (int) ($index * $lineSize);
-
-			if ($canUseTTF === true) {
-				imagettftext($image, $fontSize, 0, $x, $y, $textColor, $fontFile, $line);
-			} else {
-				$y -= $fontSize;
-				imagestring($image, 1, $x, $y, $line, $textColor);
-			}
-
-			if (($index * $lineSize) >= $maxY) {
-				break;
-			}
-		}
-
-		$imageObject = new \OC_Image();
-		$imageObject->setResource($image);
-
-		return $imageObject->valid() ? $imageObject : null;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/text\/plain/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(FileInfo $file): bool {
+        return $file->getSize() > 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $content = $file->fopen('r');
+
+        if ($content === false) {
+            return null;
+        }
+
+        $content = stream_get_contents($content,3000);
+
+        //don't create previews of empty text files
+        if (trim($content) === '') {
+            return null;
+        }
+
+        $lines = preg_split("/\r\n|\n|\r/", $content);
+
+        // Define text size of text file preview
+        $fontSize = $maxX ? (int) ((1 / 32) * $maxX) : 5; //5px
+        $lineSize = ceil($fontSize * 1.5);
+
+        $image = imagecreate($maxX, $maxY);
+        imagecolorallocate($image, 255, 255, 255);
+        $textColor = imagecolorallocate($image, 0, 0, 0);
+
+        $fontFile = __DIR__;
+        $fontFile .= '/../../../core';
+        $fontFile .= '/fonts/NotoSans-Regular.ttf';
+
+        $canUseTTF = function_exists('imagettftext');
+
+        foreach ($lines as $index => $line) {
+            $index = $index + 1;
+
+            $x = 1;
+            $y = (int) ($index * $lineSize);
+
+            if ($canUseTTF === true) {
+                imagettftext($image, $fontSize, 0, $x, $y, $textColor, $fontFile, $line);
+            } else {
+                $y -= $fontSize;
+                imagestring($image, 1, $x, $y, $line, $textColor);
+            }
+
+            if (($index * $lineSize) >= $maxY) {
+                break;
+            }
+        }
+
+        $imageObject = new \OC_Image();
+        $imageObject->setResource($image);
+
+        return $imageObject->valid() ? $imageObject : null;
+    }
 }