nextcloud / server

lib/private/legacy/user.php

Indentation +346 added lines, -346 removed lines

@@ -60,350 +60,350 @@
  */
 class OC_User {
 
-	private static $_usedBackends = array();
-
-	private static $_setupedBackends = array();
-
-	// bool, stores if a user want to access a resource anonymously, e.g if they open a public link
-	private static $incognitoMode = false;
-
-	/**
-	 * Adds the backend to the list of used backends
-	 *
-	 * @param string|\OCP\UserInterface $backend default: database The backend to use for user management
-	 * @return bool
-	 *
-	 * Set the User Authentication Module
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function useBackend($backend = 'database') {
-		if ($backend instanceof \OCP\UserInterface) {
-			self::$_usedBackends[get_class($backend)] = $backend;
-			\OC::$server->getUserManager()->registerBackend($backend);
-		} else {
-			// You'll never know what happens
-			if (null === $backend OR !is_string($backend)) {
-				$backend = 'database';
-			}
-
-			// Load backend
-			switch ($backend) {
-				case 'database':
-				case 'mysql':
-				case 'sqlite':
-					\OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
-					self::$_usedBackends[$backend] = new \OC\User\Database();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-				case 'dummy':
-					self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-				default:
-					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
-					$className = 'OC_USER_' . strtoupper($backend);
-					self::$_usedBackends[$backend] = new $className();
-					\OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
-					break;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * remove all used backends
-	 */
-	public static function clearBackends() {
-		self::$_usedBackends = array();
-		\OC::$server->getUserManager()->clearBackends();
-	}
-
-	/**
-	 * setup the configured backends in config.php
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function setupBackends() {
-		OC_App::loadApps(['prelogin']);
-		$backends = \OC::$server->getSystemConfig()->getValue('user_backends', []);
-		if (isset($backends['default']) && !$backends['default']) {
-			// clear default backends
-			self::clearBackends();
-		}
-		foreach ($backends as $i => $config) {
-			if (!is_array($config)) {
-				continue;
-			}
-			$class = $config['class'];
-			$arguments = $config['arguments'];
-			if (class_exists($class)) {
-				if (array_search($i, self::$_setupedBackends) === false) {
-					// make a reflection object
-					$reflectionObj = new ReflectionClass($class);
-
-					// use Reflection to create a new instance, using the $args
-					$backend = $reflectionObj->newInstanceArgs($arguments);
-					self::useBackend($backend);
-					self::$_setupedBackends[] = $i;
-				} else {
-					\OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
-				}
-			} else {
-				\OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
-			}
-		}
-	}
-
-	/**
-	 * Try to login a user, assuming authentication
-	 * has already happened (e.g. via Single Sign On).
-	 *
-	 * Log in a user and regenerate a new session.
-	 *
-	 * @param \OCP\Authentication\IApacheBackend $backend
-	 * @return bool
-	 */
-	public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) {
-
-		$uid = $backend->getCurrentUserId();
-		$run = true;
-		OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
-
-		if ($uid) {
-			if (self::getUser() !== $uid) {
-				self::setUserId($uid);
-				$userSession = \OC::$server->getUserSession();
-				$userSession->setLoginName($uid);
-				$request = OC::$server->getRequest();
-				$userSession->createSessionToken($request, $uid, $uid);
-				// setup the filesystem
-				OC_Util::setupFS($uid);
-				// first call the post_login hooks, the login-process needs to be
-				// completed before we can safely create the users folder.
-				// For example encryption needs to initialize the users keys first
-				// before we can create the user folder with the skeleton files
-				OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
-				//trigger creation of user home and /files folder
-				\OC::$server->getUserFolder($uid);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Verify with Apache whether user is authenticated.
-	 *
-	 * @return boolean|null
-	 *          true: authenticated
-	 *          false: not authenticated
-	 *          null: not handled / no backend available
-	 */
-	public static function handleApacheAuth() {
-		$backend = self::findFirstActiveUsedBackend();
-		if ($backend) {
-			OC_App::loadApps();
-
-			//setup extra user backends
-			self::setupBackends();
-			\OC::$server->getUserSession()->unsetMagicInCookie();
-
-			return self::loginWithApache($backend);
-		}
-
-		return null;
-	}
-
-
-	/**
-	 * Sets user id for session and triggers emit
-	 *
-	 * @param string $uid
-	 */
-	public static function setUserId($uid) {
-		$userSession = \OC::$server->getUserSession();
-		$userManager = \OC::$server->getUserManager();
-		if ($user = $userManager->get($uid)) {
-			$userSession->setUser($user);
-		} else {
-			\OC::$server->getSession()->set('user_id', $uid);
-		}
-	}
-
-	/**
-	 * Check if the user is logged in, considers also the HTTP basic credentials
-	 *
-	 * @deprecated use \OC::$server->getUserSession()->isLoggedIn()
-	 * @return bool
-	 */
-	public static function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * set incognito mode, e.g. if a user wants to open a public link
-	 *
-	 * @param bool $status
-	 */
-	public static function setIncognitoMode($status) {
-		self::$incognitoMode = $status;
-	}
-
-	/**
-	 * get incognito mode status
-	 *
-	 * @return bool
-	 */
-	public static function isIncognitoMode() {
-		return self::$incognitoMode;
-	}
-
-	/**
-	 * Returns the current logout URL valid for the currently logged-in user
-	 *
-	 * @param \OCP\IURLGenerator $urlGenerator
-	 * @return string
-	 */
-	public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
-		$backend = self::findFirstActiveUsedBackend();
-		if ($backend) {
-			return $backend->getLogoutUrl();
-		}
-
-		$logoutUrl = $urlGenerator->linkToRouteAbsolute(
-			'core.login.logout',
-			[
-				'requesttoken' => \OCP\Util::callRegister(),
-			]
-		);
-
-		return $logoutUrl;
-	}
-
-	/**
-	 * Check if the user is an admin user
-	 *
-	 * @param string $uid uid of the admin
-	 * @return bool
-	 */
-	public static function isAdminUser($uid) {
-		$group = \OC::$server->getGroupManager()->get('admin');
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * get the user id of the user currently logged in.
-	 *
-	 * @return string|bool uid or false
-	 */
-	public static function getUser() {
-		$uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
-		if (!is_null($uid) && self::$incognitoMode === false) {
-			return $uid;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * get the display name of the user currently logged in.
-	 *
-	 * @param string $uid
-	 * @return string|bool uid or false
-	 * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method
-	 *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 */
-	public static function getDisplayName($uid = null) {
-		if ($uid) {
-			$user = \OC::$server->getUserManager()->get($uid);
-			if ($user) {
-				return $user->getDisplayName();
-			} else {
-				return $uid;
-			}
-		} else {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user) {
-				return $user->getDisplayName();
-			} else {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Set password
-	 *
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @param string $recoveryPassword for the encryption app to reset encryption keys
-	 * @return bool
-	 *
-	 * Change the password of a user
-	 */
-	public static function setPassword($uid, $password, $recoveryPassword = null) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->setPassword($password, $recoveryPassword);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $uid The username
-	 * @return string
-	 *
-	 * returns the path to the users home directory
-	 * @deprecated Use \OC::$server->getUserManager->getHome()
-	 */
-	public static function getHome($uid) {
-		$user = \OC::$server->getUserManager()->get($uid);
-		if ($user) {
-			return $user->getHome();
-		} else {
-			return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
-	}
-
-	/**
-	 * Get a list of all users display name
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array associative array with all display names (value) and corresponding uids (key)
-	 *
-	 * Get a list of all display names and user ids.
-	 * @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
-	 */
-	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = array();
-		$users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
-		foreach ($users as $user) {
-			$displayNames[$user->getUID()] = $user->getDisplayName();
-		}
-		return $displayNames;
-	}
-
-	/**
-	 * Returns the first active backend from self::$_usedBackends.
-	 *
-	 * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
-	 */
-	private static function findFirstActiveUsedBackend() {
-		foreach (self::$_usedBackends as $backend) {
-			if ($backend instanceof OCP\Authentication\IApacheBackend) {
-				if ($backend->isSessionActive()) {
-					return $backend;
-				}
-			}
-		}
-
-		return null;
-	}
+    private static $_usedBackends = array();
+
+    private static $_setupedBackends = array();
+
+    // bool, stores if a user want to access a resource anonymously, e.g if they open a public link
+    private static $incognitoMode = false;
+
+    /**
+     * Adds the backend to the list of used backends
+     *
+     * @param string|\OCP\UserInterface $backend default: database The backend to use for user management
+     * @return bool
+     *
+     * Set the User Authentication Module
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function useBackend($backend = 'database') {
+        if ($backend instanceof \OCP\UserInterface) {
+            self::$_usedBackends[get_class($backend)] = $backend;
+            \OC::$server->getUserManager()->registerBackend($backend);
+        } else {
+            // You'll never know what happens
+            if (null === $backend OR !is_string($backend)) {
+                $backend = 'database';
+            }
+
+            // Load backend
+            switch ($backend) {
+                case 'database':
+                case 'mysql':
+                case 'sqlite':
+                    \OCP\Util::writeLog('core', 'Adding user backend ' . $backend . '.', ILogger::DEBUG);
+                    self::$_usedBackends[$backend] = new \OC\User\Database();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+                case 'dummy':
+                    self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+                default:
+                    \OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', ILogger::DEBUG);
+                    $className = 'OC_USER_' . strtoupper($backend);
+                    self::$_usedBackends[$backend] = new $className();
+                    \OC::$server->getUserManager()->registerBackend(self::$_usedBackends[$backend]);
+                    break;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * remove all used backends
+     */
+    public static function clearBackends() {
+        self::$_usedBackends = array();
+        \OC::$server->getUserManager()->clearBackends();
+    }
+
+    /**
+     * setup the configured backends in config.php
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function setupBackends() {
+        OC_App::loadApps(['prelogin']);
+        $backends = \OC::$server->getSystemConfig()->getValue('user_backends', []);
+        if (isset($backends['default']) && !$backends['default']) {
+            // clear default backends
+            self::clearBackends();
+        }
+        foreach ($backends as $i => $config) {
+            if (!is_array($config)) {
+                continue;
+            }
+            $class = $config['class'];
+            $arguments = $config['arguments'];
+            if (class_exists($class)) {
+                if (array_search($i, self::$_setupedBackends) === false) {
+                    // make a reflection object
+                    $reflectionObj = new ReflectionClass($class);
+
+                    // use Reflection to create a new instance, using the $args
+                    $backend = $reflectionObj->newInstanceArgs($arguments);
+                    self::useBackend($backend);
+                    self::$_setupedBackends[] = $i;
+                } else {
+                    \OCP\Util::writeLog('core', 'User backend ' . $class . ' already initialized.', ILogger::DEBUG);
+                }
+            } else {
+                \OCP\Util::writeLog('core', 'User backend ' . $class . ' not found.', ILogger::ERROR);
+            }
+        }
+    }
+
+    /**
+     * Try to login a user, assuming authentication
+     * has already happened (e.g. via Single Sign On).
+     *
+     * Log in a user and regenerate a new session.
+     *
+     * @param \OCP\Authentication\IApacheBackend $backend
+     * @return bool
+     */
+    public static function loginWithApache(\OCP\Authentication\IApacheBackend $backend) {
+
+        $uid = $backend->getCurrentUserId();
+        $run = true;
+        OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
+
+        if ($uid) {
+            if (self::getUser() !== $uid) {
+                self::setUserId($uid);
+                $userSession = \OC::$server->getUserSession();
+                $userSession->setLoginName($uid);
+                $request = OC::$server->getRequest();
+                $userSession->createSessionToken($request, $uid, $uid);
+                // setup the filesystem
+                OC_Util::setupFS($uid);
+                // first call the post_login hooks, the login-process needs to be
+                // completed before we can safely create the users folder.
+                // For example encryption needs to initialize the users keys first
+                // before we can create the user folder with the skeleton files
+                OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+                //trigger creation of user home and /files folder
+                \OC::$server->getUserFolder($uid);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Verify with Apache whether user is authenticated.
+     *
+     * @return boolean|null
+     *          true: authenticated
+     *          false: not authenticated
+     *          null: not handled / no backend available
+     */
+    public static function handleApacheAuth() {
+        $backend = self::findFirstActiveUsedBackend();
+        if ($backend) {
+            OC_App::loadApps();
+
+            //setup extra user backends
+            self::setupBackends();
+            \OC::$server->getUserSession()->unsetMagicInCookie();
+
+            return self::loginWithApache($backend);
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Sets user id for session and triggers emit
+     *
+     * @param string $uid
+     */
+    public static function setUserId($uid) {
+        $userSession = \OC::$server->getUserSession();
+        $userManager = \OC::$server->getUserManager();
+        if ($user = $userManager->get($uid)) {
+            $userSession->setUser($user);
+        } else {
+            \OC::$server->getSession()->set('user_id', $uid);
+        }
+    }
+
+    /**
+     * Check if the user is logged in, considers also the HTTP basic credentials
+     *
+     * @deprecated use \OC::$server->getUserSession()->isLoggedIn()
+     * @return bool
+     */
+    public static function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * set incognito mode, e.g. if a user wants to open a public link
+     *
+     * @param bool $status
+     */
+    public static function setIncognitoMode($status) {
+        self::$incognitoMode = $status;
+    }
+
+    /**
+     * get incognito mode status
+     *
+     * @return bool
+     */
+    public static function isIncognitoMode() {
+        return self::$incognitoMode;
+    }
+
+    /**
+     * Returns the current logout URL valid for the currently logged-in user
+     *
+     * @param \OCP\IURLGenerator $urlGenerator
+     * @return string
+     */
+    public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
+        $backend = self::findFirstActiveUsedBackend();
+        if ($backend) {
+            return $backend->getLogoutUrl();
+        }
+
+        $logoutUrl = $urlGenerator->linkToRouteAbsolute(
+            'core.login.logout',
+            [
+                'requesttoken' => \OCP\Util::callRegister(),
+            ]
+        );
+
+        return $logoutUrl;
+    }
+
+    /**
+     * Check if the user is an admin user
+     *
+     * @param string $uid uid of the admin
+     * @return bool
+     */
+    public static function isAdminUser($uid) {
+        $group = \OC::$server->getGroupManager()->get('admin');
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($group && $user && $group->inGroup($user) && self::$incognitoMode === false) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * get the user id of the user currently logged in.
+     *
+     * @return string|bool uid or false
+     */
+    public static function getUser() {
+        $uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
+        if (!is_null($uid) && self::$incognitoMode === false) {
+            return $uid;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * get the display name of the user currently logged in.
+     *
+     * @param string $uid
+     * @return string|bool uid or false
+     * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method
+     *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
+     */
+    public static function getDisplayName($uid = null) {
+        if ($uid) {
+            $user = \OC::$server->getUserManager()->get($uid);
+            if ($user) {
+                return $user->getDisplayName();
+            } else {
+                return $uid;
+            }
+        } else {
+            $user = \OC::$server->getUserSession()->getUser();
+            if ($user) {
+                return $user->getDisplayName();
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Set password
+     *
+     * @param string $uid The username
+     * @param string $password The new password
+     * @param string $recoveryPassword for the encryption app to reset encryption keys
+     * @return bool
+     *
+     * Change the password of a user
+     */
+    public static function setPassword($uid, $password, $recoveryPassword = null) {
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($user) {
+            return $user->setPassword($password, $recoveryPassword);
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $uid The username
+     * @return string
+     *
+     * returns the path to the users home directory
+     * @deprecated Use \OC::$server->getUserManager->getHome()
+     */
+    public static function getHome($uid) {
+        $user = \OC::$server->getUserManager()->get($uid);
+        if ($user) {
+            return $user->getHome();
+        } else {
+            return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
+    }
+
+    /**
+     * Get a list of all users display name
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array associative array with all display names (value) and corresponding uids (key)
+     *
+     * Get a list of all display names and user ids.
+     * @deprecated Use \OC::$server->getUserManager->searchDisplayName($search, $limit, $offset) instead.
+     */
+    public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = array();
+        $users = \OC::$server->getUserManager()->searchDisplayName($search, $limit, $offset);
+        foreach ($users as $user) {
+            $displayNames[$user->getUID()] = $user->getDisplayName();
+        }
+        return $displayNames;
+    }
+
+    /**
+     * Returns the first active backend from self::$_usedBackends.
+     *
+     * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend
+     */
+    private static function findFirstActiveUsedBackend() {
+        foreach (self::$_usedBackends as $backend) {
+            if ($backend instanceof OCP\Authentication\IApacheBackend) {
+                if ($backend->isSessionActive()) {
+                    return $backend;
+                }
+            }
+        }
+
+        return null;
+    }
 }

lib/private/legacy/db.php

Indentation +193 added lines, -193 removed lines

@@ -36,209 +36,209 @@
  */
 class OC_DB {
 
-	/**
-	 * get MDB2 schema manager
-	 *
-	 * @return \OC\DB\MDB2SchemaManager
-	 */
-	private static function getMDB2SchemaManager() {
-		return new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
-	}
+    /**
+     * get MDB2 schema manager
+     *
+     * @return \OC\DB\MDB2SchemaManager
+     */
+    private static function getMDB2SchemaManager() {
+        return new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
+    }
 
-	/**
-	 * Prepare a SQL query
-	 * @param string $query Query string
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @param bool|null $isManipulation
-	 * @throws \OC\DatabaseException
-	 * @return OC_DB_StatementWrapper prepared SQL query
-	 *
-	 * SQL query via Doctrine prepare(), needs to be execute()'d!
-	 */
-	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
-		$connection = \OC::$server->getDatabaseConnection();
+    /**
+     * Prepare a SQL query
+     * @param string $query Query string
+     * @param int|null $limit
+     * @param int|null $offset
+     * @param bool|null $isManipulation
+     * @throws \OC\DatabaseException
+     * @return OC_DB_StatementWrapper prepared SQL query
+     *
+     * SQL query via Doctrine prepare(), needs to be execute()'d!
+     */
+    static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
+        $connection = \OC::$server->getDatabaseConnection();
 
-		if ($isManipulation === null) {
-			//try to guess, so we return the number of rows on manipulations
-			$isManipulation = self::isManipulation($query);
-		}
+        if ($isManipulation === null) {
+            //try to guess, so we return the number of rows on manipulations
+            $isManipulation = self::isManipulation($query);
+        }
 
-		// return the result
-		try {
-			$result =$connection->prepare($query, $limit, $offset);
-		} catch (\Doctrine\DBAL\DBALException $e) {
-			throw new \OC\DatabaseException($e->getMessage());
-		}
-		// differentiate between query and manipulation
-		$result = new OC_DB_StatementWrapper($result, $isManipulation);
-		return $result;
-	}
+        // return the result
+        try {
+            $result =$connection->prepare($query, $limit, $offset);
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \OC\DatabaseException($e->getMessage());
+        }
+        // differentiate between query and manipulation
+        $result = new OC_DB_StatementWrapper($result, $isManipulation);
+        return $result;
+    }
 
-	/**
-	 * tries to guess the type of statement based on the first 10 characters
-	 * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
-	 *
-	 * @param string $sql
-	 * @return bool
-	 */
-	static public function isManipulation( $sql ) {
-		$selectOccurrence = stripos($sql, 'SELECT');
-		if ($selectOccurrence !== false && $selectOccurrence < 10) {
-			return false;
-		}
-		$insertOccurrence = stripos($sql, 'INSERT');
-		if ($insertOccurrence !== false && $insertOccurrence < 10) {
-			return true;
-		}
-		$updateOccurrence = stripos($sql, 'UPDATE');
-		if ($updateOccurrence !== false && $updateOccurrence < 10) {
-			return true;
-		}
-		$deleteOccurrence = stripos($sql, 'DELETE');
-		if ($deleteOccurrence !== false && $deleteOccurrence < 10) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * tries to guess the type of statement based on the first 10 characters
+     * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
+     *
+     * @param string $sql
+     * @return bool
+     */
+    static public function isManipulation( $sql ) {
+        $selectOccurrence = stripos($sql, 'SELECT');
+        if ($selectOccurrence !== false && $selectOccurrence < 10) {
+            return false;
+        }
+        $insertOccurrence = stripos($sql, 'INSERT');
+        if ($insertOccurrence !== false && $insertOccurrence < 10) {
+            return true;
+        }
+        $updateOccurrence = stripos($sql, 'UPDATE');
+        if ($updateOccurrence !== false && $updateOccurrence < 10) {
+            return true;
+        }
+        $deleteOccurrence = stripos($sql, 'DELETE');
+        if ($deleteOccurrence !== false && $deleteOccurrence < 10) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * execute a prepared statement, on error write log and throw exception
-	 * @param mixed $stmt OC_DB_StatementWrapper,
-	 *					  an array with 'sql' and optionally 'limit' and 'offset' keys
-	 *					.. or a simple sql query string
-	 * @param array $parameters
-	 * @return OC_DB_StatementWrapper
-	 * @throws \OC\DatabaseException
-	 */
-	static public function executeAudited( $stmt, array $parameters = []) {
-		if (is_string($stmt)) {
-			// convert to an array with 'sql'
-			if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
-				// TODO try to convert LIMIT OFFSET notation to parameters
-				$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
-						 . ' pass an array with \'limit\' and \'offset\' instead';
-				throw new \OC\DatabaseException($message);
-			}
-			$stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
-		}
-		if (is_array($stmt)) {
-			// convert to prepared statement
-			if ( ! array_key_exists('sql', $stmt) ) {
-				$message = 'statement array must at least contain key \'sql\'';
-				throw new \OC\DatabaseException($message);
-			}
-			if ( ! array_key_exists('limit', $stmt) ) {
-				$stmt['limit'] = null;
-			}
-			if ( ! array_key_exists('limit', $stmt) ) {
-				$stmt['offset'] = null;
-			}
-			$stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
-		}
-		self::raiseExceptionOnError($stmt, 'Could not prepare statement');
-		if ($stmt instanceof OC_DB_StatementWrapper) {
-			$result = $stmt->execute($parameters);
-			self::raiseExceptionOnError($result, 'Could not execute statement');
-		} else {
-			if (is_object($stmt)) {
-				$message = 'Expected a prepared statement or array got ' . get_class($stmt);
-			} else {
-				$message = 'Expected a prepared statement or array got ' . gettype($stmt);
-			}
-			throw new \OC\DatabaseException($message);
-		}
-		return $result;
-	}
+    /**
+     * execute a prepared statement, on error write log and throw exception
+     * @param mixed $stmt OC_DB_StatementWrapper,
+     *					  an array with 'sql' and optionally 'limit' and 'offset' keys
+     *					.. or a simple sql query string
+     * @param array $parameters
+     * @return OC_DB_StatementWrapper
+     * @throws \OC\DatabaseException
+     */
+    static public function executeAudited( $stmt, array $parameters = []) {
+        if (is_string($stmt)) {
+            // convert to an array with 'sql'
+            if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
+                // TODO try to convert LIMIT OFFSET notation to parameters
+                $message = 'LIMIT and OFFSET are forbidden for portability reasons,'
+                            . ' pass an array with \'limit\' and \'offset\' instead';
+                throw new \OC\DatabaseException($message);
+            }
+            $stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
+        }
+        if (is_array($stmt)) {
+            // convert to prepared statement
+            if ( ! array_key_exists('sql', $stmt) ) {
+                $message = 'statement array must at least contain key \'sql\'';
+                throw new \OC\DatabaseException($message);
+            }
+            if ( ! array_key_exists('limit', $stmt) ) {
+                $stmt['limit'] = null;
+            }
+            if ( ! array_key_exists('limit', $stmt) ) {
+                $stmt['offset'] = null;
+            }
+            $stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
+        }
+        self::raiseExceptionOnError($stmt, 'Could not prepare statement');
+        if ($stmt instanceof OC_DB_StatementWrapper) {
+            $result = $stmt->execute($parameters);
+            self::raiseExceptionOnError($result, 'Could not execute statement');
+        } else {
+            if (is_object($stmt)) {
+                $message = 'Expected a prepared statement or array got ' . get_class($stmt);
+            } else {
+                $message = 'Expected a prepared statement or array got ' . gettype($stmt);
+            }
+            throw new \OC\DatabaseException($message);
+        }
+        return $result;
+    }
 
-	/**
-	 * saves database schema to xml file
-	 * @param string $file name of file
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public static function getDbStructure($file) {
-		$schemaManager = self::getMDB2SchemaManager();
-		return $schemaManager->getDbStructure($file);
-	}
+    /**
+     * saves database schema to xml file
+     * @param string $file name of file
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public static function getDbStructure($file) {
+        $schemaManager = self::getMDB2SchemaManager();
+        return $schemaManager->getDbStructure($file);
+    }
 
-	/**
-	 * Creates tables from XML file
-	 * @param string $file file to read structure from
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public static function createDbFromStructure( $file ) {
-		$schemaManager = self::getMDB2SchemaManager();
-		return $schemaManager->createDbFromStructure($file);
-	}
+    /**
+     * Creates tables from XML file
+     * @param string $file file to read structure from
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public static function createDbFromStructure( $file ) {
+        $schemaManager = self::getMDB2SchemaManager();
+        return $schemaManager->createDbFromStructure($file);
+    }
 
-	/**
-	 * update the database schema
-	 * @param string $file file to read structure from
-	 * @throws Exception
-	 * @return string|boolean
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function updateDbFromStructure($file) {
-		$schemaManager = self::getMDB2SchemaManager();
-		try {
-			$result = $schemaManager->updateDbFromStructure($file);
-		} catch (Exception $e) {
-			\OCP\Util::writeLog('core', 'Failed to update database structure ('.$e.')', ILogger::FATAL);
-			throw $e;
-		}
-		return $result;
-	}
+    /**
+     * update the database schema
+     * @param string $file file to read structure from
+     * @throws Exception
+     * @return string|boolean
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function updateDbFromStructure($file) {
+        $schemaManager = self::getMDB2SchemaManager();
+        try {
+            $result = $schemaManager->updateDbFromStructure($file);
+        } catch (Exception $e) {
+            \OCP\Util::writeLog('core', 'Failed to update database structure ('.$e.')', ILogger::FATAL);
+            throw $e;
+        }
+        return $result;
+    }
 
-	/**
-	 * remove all tables defined in a database structure xml file
-	 * @param string $file the xml file describing the tables
-	 */
-	public static function removeDBStructure($file) {
-		$schemaManager = self::getMDB2SchemaManager();
-		$schemaManager->removeDBStructure($file);
-	}
+    /**
+     * remove all tables defined in a database structure xml file
+     * @param string $file the xml file describing the tables
+     */
+    public static function removeDBStructure($file) {
+        $schemaManager = self::getMDB2SchemaManager();
+        $schemaManager->removeDBStructure($file);
+    }
 
-	/**
-	 * check if a result is an error and throws an exception, works with \Doctrine\DBAL\DBALException
-	 * @param mixed $result
-	 * @param string $message
-	 * @return void
-	 * @throws \OC\DatabaseException
-	 */
-	public static function raiseExceptionOnError($result, $message = null) {
-		if($result === false) {
-			if ($message === null) {
-				$message = self::getErrorMessage();
-			} else {
-				$message .= ', Root cause:' . self::getErrorMessage();
-			}
-			throw new \OC\DatabaseException($message);
-		}
-	}
+    /**
+     * check if a result is an error and throws an exception, works with \Doctrine\DBAL\DBALException
+     * @param mixed $result
+     * @param string $message
+     * @return void
+     * @throws \OC\DatabaseException
+     */
+    public static function raiseExceptionOnError($result, $message = null) {
+        if($result === false) {
+            if ($message === null) {
+                $message = self::getErrorMessage();
+            } else {
+                $message .= ', Root cause:' . self::getErrorMessage();
+            }
+            throw new \OC\DatabaseException($message);
+        }
+    }
 
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public static function getErrorMessage() {
-		$connection = \OC::$server->getDatabaseConnection();
-		return $connection->getError();
-	}
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public static function getErrorMessage() {
+        $connection = \OC::$server->getDatabaseConnection();
+        return $connection->getError();
+    }
 
-	/**
-	 * Checks if a table exists in the database - the database prefix will be prepended
-	 *
-	 * @param string $table
-	 * @return bool
-	 * @throws \OC\DatabaseException
-	 */
-	public static function tableExists($table) {
-		$connection = \OC::$server->getDatabaseConnection();
-		return $connection->tableExists($table);
-	}
+    /**
+     * Checks if a table exists in the database - the database prefix will be prepended
+     *
+     * @param string $table
+     * @return bool
+     * @throws \OC\DatabaseException
+     */
+    public static function tableExists($table) {
+        $connection = \OC::$server->getDatabaseConnection();
+        return $connection->tableExists($table);
+    }
 }

lib/private/legacy/files.php

Indentation +430 added lines, -430 removed lines

@@ -49,438 +49,438 @@
  *
  */
 class OC_Files {
-	const FILE = 1;
-	const ZIP_FILES = 2;
-	const ZIP_DIR = 3;
-
-	const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB
-
-
-	private static $multipartBoundary = '';
-
-	/**
-	 * @return string
-	 */
-	private static function getBoundary() {
-		if (empty(self::$multipartBoundary)) {
-			self::$multipartBoundary = md5(mt_rand());
-		}
-		return self::$multipartBoundary;
-	}
-
-	/**
-	 * @param string $filename
-	 * @param string $name
-	 * @param array $rangeArray ('from'=>int,'to'=>int), ...
-	 */
-	private static function sendHeaders($filename, $name, array $rangeArray) {
-		OC_Response::setContentDispositionHeader($name, 'attachment');
-		header('Content-Transfer-Encoding: binary', true);
-		header('Pragma: public');// enable caching in IE
-		header('Expires: 0');
-		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-		$fileSize = \OC\Files\Filesystem::filesize($filename);
-		$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
-		if ($fileSize > -1) {
-			if (!empty($rangeArray)) {
-			    header('HTTP/1.1 206 Partial Content', true);
-			    header('Accept-Ranges: bytes', true);
-			    if (count($rangeArray) > 1) {
-				$type = 'multipart/byteranges; boundary='.self::getBoundary();
-				// no Content-Length header here
-			    }
-			    else {
-				header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
-				OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);
-			    }
-			}
-			else {
-			    OC_Response::setContentLengthHeader($fileSize);
-			}
-		}
-		header('Content-Type: '.$type, true);
-	}
-
-	/**
-	 * return the content of a file or return a zip file containing multiple files
-	 *
-	 * @param string $dir
-	 * @param string $files ; separated list of files to download
-	 * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
-	 */
-	public static function get($dir, $files, $params = null) {
-
-		$view = \OC\Files\Filesystem::getView();
-		$getType = self::FILE;
-		$filename = $dir;
-		try {
-
-			if (is_array($files) && count($files) === 1) {
-				$files = $files[0];
-			}
-
-			if (!is_array($files)) {
-				$filename = $dir . '/' . $files;
-				if (!$view->is_dir($filename)) {
-					self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params);
-					return;
-				}
-			}
-
-			$name = 'download';
-			if (is_array($files)) {
-				$getType = self::ZIP_FILES;
-				$basename = basename($dir);
-				if ($basename) {
-					$name = $basename;
-				}
-
-				$filename = $dir . '/' . $name;
-			} else {
-				$filename = $dir . '/' . $files;
-				$getType = self::ZIP_DIR;
-				// downloading root ?
-				if ($files !== '') {
-					$name = $files;
-				}
-			}
-
-			self::lockFiles($view, $dir, $files);
-
-			/* Calculate filesize and number of files */
-			if ($getType === self::ZIP_FILES) {
-				$fileInfos = array();
-				$fileSize = 0;
-				foreach ($files as $file) {
-					$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $file);
-					$fileSize += $fileInfo->getSize();
-					$fileInfos[] = $fileInfo;
-				}
-				$numberOfFiles = self::getNumberOfFiles($fileInfos);
-			} elseif ($getType === self::ZIP_DIR) {
-				$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $files);
-				$fileSize = $fileInfo->getSize();
-				$numberOfFiles = self::getNumberOfFiles(array($fileInfo));
-			}
-
-			$streamer = new Streamer(\OC::$server->getRequest(), $fileSize, $numberOfFiles);
-			OC_Util::obEnd();
-
-			$streamer->sendHeaders($name);
-			$executionTime = (int)OC::$server->getIniWrapper()->getNumeric('max_execution_time');
-			if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-				@set_time_limit(0);
-			}
-			ignore_user_abort(true);
-
-			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					if (\OC\Files\Filesystem::is_file($file)) {
-						$fileSize = \OC\Files\Filesystem::filesize($file);
-						$fileTime = \OC\Files\Filesystem::filemtime($file);
-						$fh = \OC\Files\Filesystem::fopen($file, 'r');
-						$streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
-						fclose($fh);
-					} elseif (\OC\Files\Filesystem::is_dir($file)) {
-						$streamer->addDirRecursive($file);
-					}
-				}
-			} elseif ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$streamer->addDirRecursive($file);
-			}
-			$streamer->finalize();
-			set_time_limit($executionTime);
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-		} catch (\OCP\Lock\LockedException $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-			\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
-		} catch (\OCP\Files\ForbiddenException $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			\OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage());
-		} catch (\Exception $ex) {
-			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
-			OC::$server->getLogger()->logException($ex);
-			$l = \OC::$server->getL10N('core');
-			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-			\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
-		}
-	}
-
-	/**
-	 * @param string $rangeHeaderPos
-	 * @param int $fileSize
-	 * @return array $rangeArray ('from'=>int,'to'=>int), ...
-	 */
-	private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
-		$rArray=explode(',', $rangeHeaderPos);
-		$minOffset = 0;
-		$ind = 0;
-
-		$rangeArray = array();
-
-		foreach ($rArray as $value) {
-			$ranges = explode('-', $value);
-			if (is_numeric($ranges[0])) {
-				if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999
-					$ranges[0] = $minOffset;
-				}
-				if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999
-					$ind--;
-					$ranges[0] = $rangeArray[$ind]['from'];
-				}
-			}
-
-			if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) {
-				// case: x-x
-				if ($ranges[1] >= $fileSize) {
-					$ranges[1] = $fileSize-1;
-				}
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize );
-				$minOffset = $ranges[1] + 1;
-				if ($minOffset >= $fileSize) {
-					break;
-				}
-			}
-			elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
-				// case: x-
-				$rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
-				break;
-			}
-			elseif (is_numeric($ranges[1])) {
-				// case: -x
-				if ($ranges[1] > $fileSize) {
-					$ranges[1] = $fileSize;
-				}
-				$rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize );
-				break;
-			}
-		}
-		return $rangeArray;
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $name
-	 * @param string $dir
-	 * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
-	 */
-	private static function getSingleFile($view, $dir, $name, $params) {
-		$filename = $dir . '/' . $name;
-		OC_Util::obEnd();
-		$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
+    const FILE = 1;
+    const ZIP_FILES = 2;
+    const ZIP_DIR = 3;
+
+    const UPLOAD_MIN_LIMIT_BYTES = 1048576; // 1 MiB
+
+
+    private static $multipartBoundary = '';
+
+    /**
+     * @return string
+     */
+    private static function getBoundary() {
+        if (empty(self::$multipartBoundary)) {
+            self::$multipartBoundary = md5(mt_rand());
+        }
+        return self::$multipartBoundary;
+    }
+
+    /**
+     * @param string $filename
+     * @param string $name
+     * @param array $rangeArray ('from'=>int,'to'=>int), ...
+     */
+    private static function sendHeaders($filename, $name, array $rangeArray) {
+        OC_Response::setContentDispositionHeader($name, 'attachment');
+        header('Content-Transfer-Encoding: binary', true);
+        header('Pragma: public');// enable caching in IE
+        header('Expires: 0');
+        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+        $fileSize = \OC\Files\Filesystem::filesize($filename);
+        $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+        if ($fileSize > -1) {
+            if (!empty($rangeArray)) {
+                header('HTTP/1.1 206 Partial Content', true);
+                header('Accept-Ranges: bytes', true);
+                if (count($rangeArray) > 1) {
+                $type = 'multipart/byteranges; boundary='.self::getBoundary();
+                // no Content-Length header here
+                }
+                else {
+                header(sprintf('Content-Range: bytes %d-%d/%d', $rangeArray[0]['from'], $rangeArray[0]['to'], $fileSize), true);
+                OC_Response::setContentLengthHeader($rangeArray[0]['to'] - $rangeArray[0]['from'] + 1);
+                }
+            }
+            else {
+                OC_Response::setContentLengthHeader($fileSize);
+            }
+        }
+        header('Content-Type: '.$type, true);
+    }
+
+    /**
+     * return the content of a file or return a zip file containing multiple files
+     *
+     * @param string $dir
+     * @param string $files ; separated list of files to download
+     * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
+     */
+    public static function get($dir, $files, $params = null) {
+
+        $view = \OC\Files\Filesystem::getView();
+        $getType = self::FILE;
+        $filename = $dir;
+        try {
+
+            if (is_array($files) && count($files) === 1) {
+                $files = $files[0];
+            }
+
+            if (!is_array($files)) {
+                $filename = $dir . '/' . $files;
+                if (!$view->is_dir($filename)) {
+                    self::getSingleFile($view, $dir, $files, is_null($params) ? array() : $params);
+                    return;
+                }
+            }
+
+            $name = 'download';
+            if (is_array($files)) {
+                $getType = self::ZIP_FILES;
+                $basename = basename($dir);
+                if ($basename) {
+                    $name = $basename;
+                }
+
+                $filename = $dir . '/' . $name;
+            } else {
+                $filename = $dir . '/' . $files;
+                $getType = self::ZIP_DIR;
+                // downloading root ?
+                if ($files !== '') {
+                    $name = $files;
+                }
+            }
+
+            self::lockFiles($view, $dir, $files);
+
+            /* Calculate filesize and number of files */
+            if ($getType === self::ZIP_FILES) {
+                $fileInfos = array();
+                $fileSize = 0;
+                foreach ($files as $file) {
+                    $fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $file);
+                    $fileSize += $fileInfo->getSize();
+                    $fileInfos[] = $fileInfo;
+                }
+                $numberOfFiles = self::getNumberOfFiles($fileInfos);
+            } elseif ($getType === self::ZIP_DIR) {
+                $fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $files);
+                $fileSize = $fileInfo->getSize();
+                $numberOfFiles = self::getNumberOfFiles(array($fileInfo));
+            }
+
+            $streamer = new Streamer(\OC::$server->getRequest(), $fileSize, $numberOfFiles);
+            OC_Util::obEnd();
+
+            $streamer->sendHeaders($name);
+            $executionTime = (int)OC::$server->getIniWrapper()->getNumeric('max_execution_time');
+            if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+                @set_time_limit(0);
+            }
+            ignore_user_abort(true);
+
+            if ($getType === self::ZIP_FILES) {
+                foreach ($files as $file) {
+                    $file = $dir . '/' . $file;
+                    if (\OC\Files\Filesystem::is_file($file)) {
+                        $fileSize = \OC\Files\Filesystem::filesize($file);
+                        $fileTime = \OC\Files\Filesystem::filemtime($file);
+                        $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                        $streamer->addFileFromStream($fh, basename($file), $fileSize, $fileTime);
+                        fclose($fh);
+                    } elseif (\OC\Files\Filesystem::is_dir($file)) {
+                        $streamer->addDirRecursive($file);
+                    }
+                }
+            } elseif ($getType === self::ZIP_DIR) {
+                $file = $dir . '/' . $files;
+                $streamer->addDirRecursive($file);
+            }
+            $streamer->finalize();
+            set_time_limit($executionTime);
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+        } catch (\OCP\Lock\LockedException $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
+            \OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
+        } catch (\OCP\Files\ForbiddenException $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            \OC_Template::printErrorPage($l->t('Can\'t read file'), $ex->getMessage());
+        } catch (\Exception $ex) {
+            self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
+            OC::$server->getLogger()->logException($ex);
+            $l = \OC::$server->getL10N('core');
+            $hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
+            \OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
+        }
+    }
+
+    /**
+     * @param string $rangeHeaderPos
+     * @param int $fileSize
+     * @return array $rangeArray ('from'=>int,'to'=>int), ...
+     */
+    private static function parseHttpRangeHeader($rangeHeaderPos, $fileSize) {
+        $rArray=explode(',', $rangeHeaderPos);
+        $minOffset = 0;
+        $ind = 0;
+
+        $rangeArray = array();
+
+        foreach ($rArray as $value) {
+            $ranges = explode('-', $value);
+            if (is_numeric($ranges[0])) {
+                if ($ranges[0] < $minOffset) { // case: bytes=500-700,601-999
+                    $ranges[0] = $minOffset;
+                }
+                if ($ind > 0 && $rangeArray[$ind-1]['to']+1 == $ranges[0]) { // case: bytes=500-600,601-999
+                    $ind--;
+                    $ranges[0] = $rangeArray[$ind]['from'];
+                }
+            }
+
+            if (is_numeric($ranges[0]) && is_numeric($ranges[1]) && $ranges[0] < $fileSize && $ranges[0] <= $ranges[1]) {
+                // case: x-x
+                if ($ranges[1] >= $fileSize) {
+                    $ranges[1] = $fileSize-1;
+                }
+                $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $ranges[1], 'size' => $fileSize );
+                $minOffset = $ranges[1] + 1;
+                if ($minOffset >= $fileSize) {
+                    break;
+                }
+            }
+            elseif (is_numeric($ranges[0]) && $ranges[0] < $fileSize) {
+                // case: x-
+                $rangeArray[$ind++] = array( 'from' => $ranges[0], 'to' => $fileSize-1, 'size' => $fileSize );
+                break;
+            }
+            elseif (is_numeric($ranges[1])) {
+                // case: -x
+                if ($ranges[1] > $fileSize) {
+                    $ranges[1] = $fileSize;
+                }
+                $rangeArray[$ind++] = array( 'from' => $fileSize-$ranges[1], 'to' => $fileSize-1, 'size' => $fileSize );
+                break;
+            }
+        }
+        return $rangeArray;
+    }
+
+    /**
+     * @param View $view
+     * @param string $name
+     * @param string $dir
+     * @param array $params ; 'head' boolean to only send header of the request ; 'range' http range header
+     */
+    private static function getSingleFile($view, $dir, $name, $params) {
+        $filename = $dir . '/' . $name;
+        OC_Util::obEnd();
+        $view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 		
-		$rangeArray = array();
+        $rangeArray = array();
 
-		if (isset($params['range']) && substr($params['range'], 0, 6) === 'bytes=') {
-			$rangeArray = self::parseHttpRangeHeader(substr($params['range'], 6), 
-								 \OC\Files\Filesystem::filesize($filename));
-		}
+        if (isset($params['range']) && substr($params['range'], 0, 6) === 'bytes=') {
+            $rangeArray = self::parseHttpRangeHeader(substr($params['range'], 6), 
+                                    \OC\Files\Filesystem::filesize($filename));
+        }
 		
-		if (\OC\Files\Filesystem::isReadable($filename)) {
-			self::sendHeaders($filename, $name, $rangeArray);
-		} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
-			header("HTTP/1.1 404 Not Found");
-			$tmpl = new OC_Template('', '404', 'guest');
-			$tmpl->printPage();
-			exit();
-		} else {
-			header("HTTP/1.1 403 Forbidden");
-			die('403 Forbidden');
-		}
-		if (isset($params['head']) && $params['head']) {
-			return;
-		}
-		if (!empty($rangeArray)) {
-			try {
-			    if (count($rangeArray) == 1) {
-				$view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']);
-			    }
-			    else {
-				// check if file is seekable (if not throw UnseekableException)
-				// we have to check it before body contents
-				$view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
-
-				$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
-
-				foreach ($rangeArray as $range) {
-				    echo "\r\n--".self::getBoundary()."\r\n".
-				         "Content-type: ".$type."\r\n".
-				         "Content-range: bytes ".$range['from']."-".$range['to']."/".$range['size']."\r\n\r\n";
-				    $view->readfilePart($filename, $range['from'], $range['to']);
-				}
-				echo "\r\n--".self::getBoundary()."--\r\n";
-			    }
-			} catch (\OCP\Files\UnseekableException $ex) {
-			    // file is unseekable
-			    header_remove('Accept-Ranges');
-			    header_remove('Content-Range');
-			    header("HTTP/1.1 200 OK");
-			    self::sendHeaders($filename, $name, array());
-			    $view->readfile($filename);
-			}
-		}
-		else {
-		    $view->readfile($filename);
-		}
-	}
-
-	/**
-	 * Returns the total (recursive) number of files and folders in the given
-	 * FileInfos.
-	 *
-	 * @param \OCP\Files\FileInfo[] $fileInfos the FileInfos to count
-	 * @return int the total number of files and folders
-	 */
-	private static function getNumberOfFiles($fileInfos) {
-		$numberOfFiles = 0;
-
-		$view = new View();
-
-		while ($fileInfo = array_pop($fileInfos)) {
-			$numberOfFiles++;
-
-			if ($fileInfo->getType() === \OCP\Files\FileInfo::TYPE_FOLDER) {
-				$fileInfos = array_merge($fileInfos, $view->getDirectoryContent($fileInfo->getPath()));
-			}
-		}
-
-		return $numberOfFiles;
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $dir
-	 * @param string[]|string $files
-	 */
-	public static function lockFiles($view, $dir, $files) {
-		if (!is_array($files)) {
-			$file = $dir . '/' . $files;
-			$files = [$file];
-		}
-		foreach ($files as $file) {
-			$file = $dir . '/' . $file;
-			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
-			if ($view->is_dir($file)) {
-				$contents = $view->getDirectoryContent($file);
-				$contents = array_map(function($fileInfo) use ($file) {
-					/** @var \OCP\Files\FileInfo $fileInfo */
-					return $file . '/' . $fileInfo->getName();
-				}, $contents);
-				self::lockFiles($view, $dir, $contents);
-			}
-		}
-	}
-
-	/**
-	 * set the maximum upload size limit for apache hosts using .htaccess
-	 *
-	 * @param int $size file size in bytes
-	 * @param array $files override '.htaccess' and '.user.ini' locations
-	 * @return bool|int false on failure, size on success
-	 */
-	public static function setUploadLimit($size, $files = []) {
-		//don't allow user to break his config
-		$size = (int)$size;
-		if ($size < self::UPLOAD_MIN_LIMIT_BYTES) {
-			return false;
-		}
-		$size = OC_Helper::phpFileSize($size);
-
-		$phpValueKeys = array(
-			'upload_max_filesize',
-			'post_max_size'
-		);
-
-		// default locations if not overridden by $files
-		$files = array_merge([
-			'.htaccess' => OC::$SERVERROOT . '/.htaccess',
-			'.user.ini' => OC::$SERVERROOT . '/.user.ini'
-		], $files);
-
-		$updateFiles = [
-			$files['.htaccess'] => [
-				'pattern' => '/php_value %1$s (\S)*/',
-				'setting' => 'php_value %1$s %2$s'
-			],
-			$files['.user.ini'] => [
-				'pattern' => '/%1$s=(\S)*/',
-				'setting' => '%1$s=%2$s'
-			]
-		];
-
-		$success = true;
-
-		foreach ($updateFiles as $filename => $patternMap) {
-			// suppress warnings from fopen()
-			$handle = @fopen($filename, 'r+');
-			if (!$handle) {
-				\OCP\Util::writeLog('files',
-					'Can\'t write upload limit to ' . $filename . '. Please check the file permissions',
-					ILogger::WARN);
-				$success = false;
-				continue; // try to update as many files as possible
-			}
-
-			$content = '';
-			while (!feof($handle)) {
-				$content .= fread($handle, 1000);
-			}
-
-			foreach ($phpValueKeys as $key) {
-				$pattern = vsprintf($patternMap['pattern'], [$key]);
-				$setting = vsprintf($patternMap['setting'], [$key, $size]);
-				$hasReplaced = 0;
-				$newContent = preg_replace($pattern, $setting, $content, 2, $hasReplaced);
-				if ($newContent !== null) {
-					$content = $newContent;
-				}
-				if ($hasReplaced === 0) {
-					$content .= "\n" . $setting;
-				}
-			}
-
-			// write file back
-			ftruncate($handle, 0);
-			rewind($handle);
-			fwrite($handle, $content);
-
-			fclose($handle);
-		}
-
-		if ($success) {
-			return OC_Helper::computerFileSize($size);
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $dir
-	 * @param $files
-	 * @param integer $getType
-	 * @param View $view
-	 * @param string $filename
-	 */
-	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
-		if ($getType === self::FILE) {
-			$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
-		}
-		if ($getType === self::ZIP_FILES) {
-			foreach ($files as $file) {
-				$file = $dir . '/' . $file;
-				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-			}
-		}
-		if ($getType === self::ZIP_DIR) {
-			$file = $dir . '/' . $files;
-			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-		}
-	}
+        if (\OC\Files\Filesystem::isReadable($filename)) {
+            self::sendHeaders($filename, $name, $rangeArray);
+        } elseif (!\OC\Files\Filesystem::file_exists($filename)) {
+            header("HTTP/1.1 404 Not Found");
+            $tmpl = new OC_Template('', '404', 'guest');
+            $tmpl->printPage();
+            exit();
+        } else {
+            header("HTTP/1.1 403 Forbidden");
+            die('403 Forbidden');
+        }
+        if (isset($params['head']) && $params['head']) {
+            return;
+        }
+        if (!empty($rangeArray)) {
+            try {
+                if (count($rangeArray) == 1) {
+                $view->readfilePart($filename, $rangeArray[0]['from'], $rangeArray[0]['to']);
+                }
+                else {
+                // check if file is seekable (if not throw UnseekableException)
+                // we have to check it before body contents
+                $view->readfilePart($filename, $rangeArray[0]['size'], $rangeArray[0]['size']);
+
+                $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+
+                foreach ($rangeArray as $range) {
+                    echo "\r\n--".self::getBoundary()."\r\n".
+                            "Content-type: ".$type."\r\n".
+                            "Content-range: bytes ".$range['from']."-".$range['to']."/".$range['size']."\r\n\r\n";
+                    $view->readfilePart($filename, $range['from'], $range['to']);
+                }
+                echo "\r\n--".self::getBoundary()."--\r\n";
+                }
+            } catch (\OCP\Files\UnseekableException $ex) {
+                // file is unseekable
+                header_remove('Accept-Ranges');
+                header_remove('Content-Range');
+                header("HTTP/1.1 200 OK");
+                self::sendHeaders($filename, $name, array());
+                $view->readfile($filename);
+            }
+        }
+        else {
+            $view->readfile($filename);
+        }
+    }
+
+    /**
+     * Returns the total (recursive) number of files and folders in the given
+     * FileInfos.
+     *
+     * @param \OCP\Files\FileInfo[] $fileInfos the FileInfos to count
+     * @return int the total number of files and folders
+     */
+    private static function getNumberOfFiles($fileInfos) {
+        $numberOfFiles = 0;
+
+        $view = new View();
+
+        while ($fileInfo = array_pop($fileInfos)) {
+            $numberOfFiles++;
+
+            if ($fileInfo->getType() === \OCP\Files\FileInfo::TYPE_FOLDER) {
+                $fileInfos = array_merge($fileInfos, $view->getDirectoryContent($fileInfo->getPath()));
+            }
+        }
+
+        return $numberOfFiles;
+    }
+
+    /**
+     * @param View $view
+     * @param string $dir
+     * @param string[]|string $files
+     */
+    public static function lockFiles($view, $dir, $files) {
+        if (!is_array($files)) {
+            $file = $dir . '/' . $files;
+            $files = [$file];
+        }
+        foreach ($files as $file) {
+            $file = $dir . '/' . $file;
+            $view->lockFile($file, ILockingProvider::LOCK_SHARED);
+            if ($view->is_dir($file)) {
+                $contents = $view->getDirectoryContent($file);
+                $contents = array_map(function($fileInfo) use ($file) {
+                    /** @var \OCP\Files\FileInfo $fileInfo */
+                    return $file . '/' . $fileInfo->getName();
+                }, $contents);
+                self::lockFiles($view, $dir, $contents);
+            }
+        }
+    }
+
+    /**
+     * set the maximum upload size limit for apache hosts using .htaccess
+     *
+     * @param int $size file size in bytes
+     * @param array $files override '.htaccess' and '.user.ini' locations
+     * @return bool|int false on failure, size on success
+     */
+    public static function setUploadLimit($size, $files = []) {
+        //don't allow user to break his config
+        $size = (int)$size;
+        if ($size < self::UPLOAD_MIN_LIMIT_BYTES) {
+            return false;
+        }
+        $size = OC_Helper::phpFileSize($size);
+
+        $phpValueKeys = array(
+            'upload_max_filesize',
+            'post_max_size'
+        );
+
+        // default locations if not overridden by $files
+        $files = array_merge([
+            '.htaccess' => OC::$SERVERROOT . '/.htaccess',
+            '.user.ini' => OC::$SERVERROOT . '/.user.ini'
+        ], $files);
+
+        $updateFiles = [
+            $files['.htaccess'] => [
+                'pattern' => '/php_value %1$s (\S)*/',
+                'setting' => 'php_value %1$s %2$s'
+            ],
+            $files['.user.ini'] => [
+                'pattern' => '/%1$s=(\S)*/',
+                'setting' => '%1$s=%2$s'
+            ]
+        ];
+
+        $success = true;
+
+        foreach ($updateFiles as $filename => $patternMap) {
+            // suppress warnings from fopen()
+            $handle = @fopen($filename, 'r+');
+            if (!$handle) {
+                \OCP\Util::writeLog('files',
+                    'Can\'t write upload limit to ' . $filename . '. Please check the file permissions',
+                    ILogger::WARN);
+                $success = false;
+                continue; // try to update as many files as possible
+            }
+
+            $content = '';
+            while (!feof($handle)) {
+                $content .= fread($handle, 1000);
+            }
+
+            foreach ($phpValueKeys as $key) {
+                $pattern = vsprintf($patternMap['pattern'], [$key]);
+                $setting = vsprintf($patternMap['setting'], [$key, $size]);
+                $hasReplaced = 0;
+                $newContent = preg_replace($pattern, $setting, $content, 2, $hasReplaced);
+                if ($newContent !== null) {
+                    $content = $newContent;
+                }
+                if ($hasReplaced === 0) {
+                    $content .= "\n" . $setting;
+                }
+            }
+
+            // write file back
+            ftruncate($handle, 0);
+            rewind($handle);
+            fwrite($handle, $content);
+
+            fclose($handle);
+        }
+
+        if ($success) {
+            return OC_Helper::computerFileSize($size);
+        }
+        return false;
+    }
+
+    /**
+     * @param string $dir
+     * @param $files
+     * @param integer $getType
+     * @param View $view
+     * @param string $filename
+     */
+    private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
+        if ($getType === self::FILE) {
+            $view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
+        }
+        if ($getType === self::ZIP_FILES) {
+            foreach ($files as $file) {
+                $file = $dir . '/' . $file;
+                $view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+            }
+        }
+        if ($getType === self::ZIP_DIR) {
+            $file = $dir . '/' . $files;
+            $view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+        }
+    }
 
 }

lib/private/legacy/util.php

Indentation +1432 added lines, -1432 removed lines

@@ -66,1440 +66,1440 @@
 use OCP\IUser;
 
 class OC_Util {
-	public static $scripts = array();
-	public static $styles = array();
-	public static $headers = array();
-	private static $rootMounted = false;
-	private static $fsSetup = false;
-
-	/** @var array Local cache of version.php */
-	private static $versionCache = null;
-
-	protected static function getAppManager() {
-		return \OC::$server->getAppManager();
-	}
-
-	private static function initLocalStorageRootFS() {
-		// mount local file backend as root
-		$configDataDirectory = \OC::$server->getSystemConfig()->getValue("datadirectory", OC::$SERVERROOT . "/data");
-		//first set up the local "root" storage
-		\OC\Files\Filesystem::initMountManager();
-		if (!self::$rootMounted) {
-			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $configDataDirectory), '/');
-			self::$rootMounted = true;
-		}
-	}
-
-	/**
-	 * mounting an object storage as the root fs will in essence remove the
-	 * necessity of a data folder being present.
-	 * TODO make home storage aware of this and use the object storage instead of local disk access
-	 *
-	 * @param array $config containing 'class' and optional 'arguments'
-	 * @suppress PhanDeprecatedFunction
-	 */
-	private static function initObjectStoreRootFS($config) {
-		// check misconfiguration
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = array();
-		}
-
-		// instantiate object store implementation
-		$name = $config['class'];
-		if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
-			$segments = explode('\\', $name);
-			OC_App::loadApp(strtolower($segments[1]));
-		}
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
-		// mount with plain / root object store implementation
-		$config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';
-
-		// mount object storage as root
-		\OC\Files\Filesystem::initMountManager();
-		if (!self::$rootMounted) {
-			\OC\Files\Filesystem::mount($config['class'], $config['arguments'], '/');
-			self::$rootMounted = true;
-		}
-	}
-
-	/**
-	 * mounting an object storage as the root fs will in essence remove the
-	 * necessity of a data folder being present.
-	 *
-	 * @param array $config containing 'class' and optional 'arguments'
-	 * @suppress PhanDeprecatedFunction
-	 */
-	private static function initObjectStoreMultibucketRootFS($config) {
-		// check misconfiguration
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = array();
-		}
-
-		// instantiate object store implementation
-		$name = $config['class'];
-		if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
-			$segments = explode('\\', $name);
-			OC_App::loadApp(strtolower($segments[1]));
-		}
-
-		if (!isset($config['arguments']['bucket'])) {
-			$config['arguments']['bucket'] = '';
-		}
-		// put the root FS always in first bucket for multibucket configuration
-		$config['arguments']['bucket'] .= '0';
-
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
-		// mount with plain / root object store implementation
-		$config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';
-
-		// mount object storage as root
-		\OC\Files\Filesystem::initMountManager();
-		if (!self::$rootMounted) {
-			\OC\Files\Filesystem::mount($config['class'], $config['arguments'], '/');
-			self::$rootMounted = true;
-		}
-	}
-
-	/**
-	 * Can be set up
-	 *
-	 * @param string $user
-	 * @return boolean
-	 * @description configure the initial filesystem based on the configuration
-	 * @suppress PhanDeprecatedFunction
-	 * @suppress PhanAccessMethodInternal
-	 */
-	public static function setupFS($user = '') {
-		//setting up the filesystem twice can only lead to trouble
-		if (self::$fsSetup) {
-			return false;
-		}
-
-		\OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
-
-		// If we are not forced to load a specific user we load the one that is logged in
-		if ($user === null) {
-			$user = '';
-		} else if ($user == "" && \OC::$server->getUserSession()->isLoggedIn()) {
-			$user = OC_User::getUser();
-		}
-
-		// load all filesystem apps before, so no setup-hook gets lost
-		OC_App::loadApps(array('filesystem'));
-
-		// the filesystem will finish when $user is not empty,
-		// mark fs setup here to avoid doing the setup from loading
-		// OC_Filesystem
-		if ($user != '') {
-			self::$fsSetup = true;
-		}
-
-		\OC\Files\Filesystem::initMountManager();
-
-		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) {
-				/** @var \OC\Files\Storage\Common $storage */
-				$storage->setMountOptions($mount->getOptions());
-			}
-			return $storage;
-		});
-
-		\OC\Files\Filesystem::addStorageWrapper('enable_sharing', function ($mountPoint, \OCP\Files\Storage\IStorage $storage, \OCP\Files\Mount\IMountPoint $mount) {
-			if (!$mount->getOption('enable_sharing', true)) {
-				return new \OC\Files\Storage\Wrapper\PermissionsMask([
-					'storage' => $storage,
-					'mask' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE
-				]);
-			}
-			return $storage;
-		});
-
-		// install storage availability wrapper, before most other wrappers
-		\OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, \OCP\Files\Storage\IStorage $storage) {
-			if (!$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
-				return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]);
-			}
-			return $storage;
-		});
-
-		\OC\Files\Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
-			if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
-				return new \OC\Files\Storage\Wrapper\Encoding(['storage' => $storage]);
-			}
-			return $storage;
-		});
-
-		\OC\Files\Filesystem::addStorageWrapper('oc_quota', function ($mountPoint, $storage) {
-			// set up quota for home storages, even for other users
-			// which can happen when using sharing
-
-			/**
-			 * @var \OC\Files\Storage\Storage $storage
-			 */
-			if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
-				|| $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
-			) {
-				/** @var \OC\Files\Storage\Home $storage */
-				if (is_object($storage->getUser())) {
-					$user = $storage->getUser()->getUID();
-					$quota = OC_Util::getUserQuota($user);
-					if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-						return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files'));
-					}
-				}
-			}
-
-			return $storage;
-		});
-
-		OC_Hook::emit('OC_Filesystem', 'preSetup', array('user' => $user));
-		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(true);
-
-		//check if we are using an object storage
-		$objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null);
-		$objectStoreMultibucket = \OC::$server->getSystemConfig()->getValue('objectstore_multibucket', null);
-
-		// use the same order as in ObjectHomeMountProvider
-		if (isset($objectStoreMultibucket)) {
-			self::initObjectStoreMultibucketRootFS($objectStoreMultibucket);
-		} elseif (isset($objectStore)) {
-			self::initObjectStoreRootFS($objectStore);
-		} else {
-			self::initLocalStorageRootFS();
-		}
-
-		if ($user != '' && !\OC::$server->getUserManager()->userExists($user)) {
-			\OC::$server->getEventLogger()->end('setup_fs');
-			return false;
-		}
-
-		//if we aren't logged in, there is no use to set up the filesystem
-		if ($user != "") {
-
-			$userDir = '/' . $user . '/files';
-
-			//jail the user into his "home" directory
-			\OC\Files\Filesystem::init($user, $userDir);
-
-			OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
-		}
-		\OC::$server->getEventLogger()->end('setup_fs');
-		return true;
-	}
-
-	/**
-	 * check if a password is required for each public link
-	 *
-	 * @return boolean
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function isPublicLinkPasswordRequired() {
-		$enforcePassword = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_links_password', 'no');
-		return $enforcePassword === 'yes';
-	}
-
-	/**
-	 * check if sharing is disabled for the current user
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IUser|null $user
-	 * @return bool
-	 */
-	public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
-		if ($config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
-			$groupsList = $config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-			$excludedGroups = json_decode($groupsList);
-			if (is_null($excludedGroups)) {
-				$excludedGroups = explode(',', $groupsList);
-				$newValue = json_encode($excludedGroups);
-				$config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
-			}
-			$usersGroups = $groupManager->getUserGroupIds($user);
-			if (!empty($usersGroups)) {
-				$remainingGroups = array_diff($usersGroups, $excludedGroups);
-				// if the user is only in groups which are disabled for sharing then
-				// sharing is also disabled for the user
-				if (empty($remainingGroups)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * check if share API enforces a default expire date
-	 *
-	 * @return boolean
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function isDefaultExpireDateEnforced() {
-		$isDefaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no');
-		$enforceDefaultExpireDate = false;
-		if ($isDefaultExpireDateEnabled === 'yes') {
-			$value = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-			$enforceDefaultExpireDate = $value === 'yes';
-		}
-
-		return $enforceDefaultExpireDate;
-	}
-
-	/**
-	 * Get the quota of a user
-	 *
-	 * @param string $userId
-	 * @return float Quota bytes
-	 */
-	public static function getUserQuota($userId) {
-		$user = \OC::$server->getUserManager()->get($userId);
-		if (is_null($user)) {
-			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		}
-		$userQuota = $user->getQuota();
-		if($userQuota === 'none') {
-			return \OCP\Files\FileInfo::SPACE_UNLIMITED;
-		}
-		return OC_Helper::computerFileSize($userQuota);
-	}
-
-	/**
-	 * copies the skeleton to the users /files
-	 *
-	 * @param String $userId
-	 * @param \OCP\Files\Folder $userDirectory
-	 * @throws \RuntimeException
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
-
-		$plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
-		$userLang = \OC::$server->getL10NFactory()->findLanguage();
-		$skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
-
-		if (!file_exists($skeletonDirectory)) {
-			$dialectStart = strpos($userLang, '_');
-			if ($dialectStart !== false) {
-				$skeletonDirectory = str_replace('{lang}', substr($userLang, 0, $dialectStart), $plainSkeletonDirectory);
-			}
-			if ($dialectStart === false || !file_exists($skeletonDirectory)) {
-				$skeletonDirectory = str_replace('{lang}', 'default', $plainSkeletonDirectory);
-			}
-			if (!file_exists($skeletonDirectory)) {
-				$skeletonDirectory = '';
-			}
-		}
-
-		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
-
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-		$appdata = 'appdata_' . $instanceId;
-		if ($userId === $appdata) {
-			throw new \RuntimeException('username is reserved name: ' . $appdata);
-		}
-
-		if (!empty($skeletonDirectory)) {
-			\OCP\Util::writeLog(
-				'files_skeleton',
-				'copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'),
-				ILogger::DEBUG
-			);
-			self::copyr($skeletonDirectory, $userDirectory);
-			// update the file cache
-			$userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
-		}
-	}
-
-	/**
-	 * copies a directory recursively by using streams
-	 *
-	 * @param string $source
-	 * @param \OCP\Files\Folder $target
-	 * @return void
-	 */
-	public static function copyr($source, \OCP\Files\Folder $target) {
-		$logger = \OC::$server->getLogger();
-
-		// Verify if folder exists
-		$dir = opendir($source);
-		if($dir === false) {
-			$logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
-			return;
-		}
-
-		// Copy the files
-		while (false !== ($file = readdir($dir))) {
-			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-				if (is_dir($source . '/' . $file)) {
-					$child = $target->newFolder($file);
-					self::copyr($source . '/' . $file, $child);
-				} else {
-					$child = $target->newFile($file);
-					$sourceStream = fopen($source . '/' . $file, 'r');
-					if($sourceStream === false) {
-						$logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
-						closedir($dir);
-						return;
-					}
-					stream_copy_to_stream($sourceStream, $child->fopen('w'));
-				}
-			}
-		}
-		closedir($dir);
-	}
-
-	/**
-	 * @return void
-	 * @suppress PhanUndeclaredMethod
-	 */
-	public static function tearDownFS() {
-		\OC\Files\Filesystem::tearDown();
-		\OC::$server->getRootFolder()->clearCache();
-		self::$fsSetup = false;
-		self::$rootMounted = false;
-	}
-
-	/**
-	 * get the current installed version of ownCloud
-	 *
-	 * @return array
-	 */
-	public static function getVersion() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_Version'];
-	}
-
-	/**
-	 * get the current installed version string of ownCloud
-	 *
-	 * @return string
-	 */
-	public static function getVersionString() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_VersionString'];
-	}
-
-	/**
-	 * @deprecated the value is of no use anymore
-	 * @return string
-	 */
-	public static function getEditionString() {
-		return '';
-	}
-
-	/**
-	 * @description get the update channel of the current installed of ownCloud.
-	 * @return string
-	 */
-	public static function getChannel() {
-		OC_Util::loadVersion();
-		return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
-	}
-
-	/**
-	 * @description get the build number of the current installed of ownCloud.
-	 * @return string
-	 */
-	public static function getBuild() {
-		OC_Util::loadVersion();
-		return self::$versionCache['OC_Build'];
-	}
-
-	/**
-	 * @description load the version.php into the session as cache
-	 * @suppress PhanUndeclaredVariable
-	 */
-	private static function loadVersion() {
-		if (self::$versionCache !== null) {
-			return;
-		}
-
-		$timestamp = filemtime(OC::$SERVERROOT . '/version.php');
-		require OC::$SERVERROOT . '/version.php';
-		/** @var $timestamp int */
-		self::$versionCache['OC_Version_Timestamp'] = $timestamp;
-		/** @var $OC_Version string */
-		self::$versionCache['OC_Version'] = $OC_Version;
-		/** @var $OC_VersionString string */
-		self::$versionCache['OC_VersionString'] = $OC_VersionString;
-		/** @var $OC_Build string */
-		self::$versionCache['OC_Build'] = $OC_Build;
-
-		/** @var $OC_Channel string */
-		self::$versionCache['OC_Channel'] = $OC_Channel;
-	}
-
-	/**
-	 * generates a path for JS/CSS files. If no application is provided it will create the path for core.
-	 *
-	 * @param string $application application to get the files from
-	 * @param string $directory directory within this application (css, js, vendor, etc)
-	 * @param string $file the file inside of the above folder
-	 * @return string the path
-	 */
-	private static function generatePath($application, $directory, $file) {
-		if (is_null($file)) {
-			$file = $application;
-			$application = "";
-		}
-		if (!empty($application)) {
-			return "$application/$directory/$file";
-		} else {
-			return "$directory/$file";
-		}
-	}
-
-	/**
-	 * add a javascript file
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Script to the beginning of the list
-	 * @return void
-	 */
-	public static function addScript($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'js', $file);
-
-		// core js files need separate handling
-		if ($application !== 'core' && $file !== null) {
-			self::addTranslations ( $application );
-		}
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a javascript file from the vendor sub folder
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Script to the beginning of the list
-	 * @return void
-	 */
-	public static function addVendorScript($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'vendor', $file);
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a translation JS file
-	 *
-	 * @param string $application application id
-	 * @param string|null $languageCode language code, defaults to the current language
-	 * @param bool|null $prepend prepend the Script to the beginning of the list
-	 */
-	public static function addTranslations($application, $languageCode = null, $prepend = false) {
-		if (is_null($languageCode)) {
-			$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
-		}
-		if (!empty($application)) {
-			$path = "$application/l10n/$languageCode";
-		} else {
-			$path = "l10n/$languageCode";
-		}
-		self::addExternalResource($application, $prepend, $path, "script");
-	}
-
-	/**
-	 * add a css file
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Style to the beginning of the list
-	 * @return void
-	 */
-	public static function addStyle($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'css', $file);
-		self::addExternalResource($application, $prepend, $path, "style");
-	}
-
-	/**
-	 * add a css file from the vendor sub folder
-	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @param bool $prepend prepend the Style to the beginning of the list
-	 * @return void
-	 */
-	public static function addVendorStyle($application, $file = null, $prepend = false) {
-		$path = OC_Util::generatePath($application, 'vendor', $file);
-		self::addExternalResource($application, $prepend, $path, "style");
-	}
-
-	/**
-	 * add an external resource css/js file
-	 *
-	 * @param string $application application id
-	 * @param bool $prepend prepend the file to the beginning of the list
-	 * @param string $path
-	 * @param string $type (script or style)
-	 * @return void
-	 */
-	private static function addExternalResource($application, $prepend, $path, $type = "script") {
-
-		if ($type === "style") {
-			if (!in_array($path, self::$styles)) {
-				if ($prepend === true) {
-					array_unshift ( self::$styles, $path );
-				} else {
-					self::$styles[] = $path;
-				}
-			}
-		} elseif ($type === "script") {
-			if (!in_array($path, self::$scripts)) {
-				if ($prepend === true) {
-					array_unshift ( self::$scripts, $path );
-				} else {
-					self::$scripts [] = $path;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * If $text is null then the element will be written as empty element.
-	 * So use "" to get a closing tag.
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
-	 */
-	public static function addHeader($tag, $attributes, $text=null) {
-		self::$headers[] = array(
-			'tag' => $tag,
-			'attributes' => $attributes,
-			'text' => $text
-		);
-	}
-
-	/**
-	 * check if the current server configuration is suitable for ownCloud
-	 *
-	 * @param \OC\SystemConfig $config
-	 * @return array arrays with error messages and hints
-	 */
-	public static function checkServer(\OC\SystemConfig $config) {
-		$l = \OC::$server->getL10N('lib');
-		$errors = array();
-		$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
-
-		if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
-			// this check needs to be done every time
-			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
-		}
-
-		// Assume that if checkServer() succeeded before in this session, then all is fine.
-		if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
-			return $errors;
-		}
-
-		$webServerRestart = false;
-		$setup = new \OC\Setup(
-			$config,
-			\OC::$server->getIniWrapper(),
-			\OC::$server->getL10N('lib'),
-			\OC::$server->query(\OCP\Defaults::class),
-			\OC::$server->getLogger(),
-			\OC::$server->getSecureRandom(),
-			\OC::$server->query(\OC\Installer::class)
-		);
-
-		$urlGenerator = \OC::$server->getURLGenerator();
-
-		$availableDatabases = $setup->getSupportedDatabases();
-		if (empty($availableDatabases)) {
-			$errors[] = array(
-				'error' => $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
-				'hint' => '' //TODO: sane hint
-			);
-			$webServerRestart = true;
-		}
-
-		// Check if config folder is writable.
-		if(!OC_Helper::isReadOnlyConfigEnabled()) {
-			if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
-				$errors[] = array(
-					'error' => $l->t('Cannot write into "config" directory'),
-					'hint' => $l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
-						[$urlGenerator->linkToDocs('admin-dir_permissions')])
-				);
-			}
-		}
-
-		// Check if there is a writable install folder.
-		if ($config->getValue('appstoreenabled', true)) {
-			if (OC_App::getInstallPath() === null
-				|| !is_writable(OC_App::getInstallPath())
-				|| !is_readable(OC_App::getInstallPath())
-			) {
-				$errors[] = array(
-					'error' => $l->t('Cannot write into "apps" directory'),
-					'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory'
-						. ' or disabling the appstore in the config file. See %s',
-						[$urlGenerator->linkToDocs('admin-dir_permissions')])
-				);
-			}
-		}
-		// Create root dir.
-		if ($config->getValue('installed', false)) {
-			if (!is_dir($CONFIG_DATADIRECTORY)) {
-				$success = @mkdir($CONFIG_DATADIRECTORY);
-				if ($success) {
-					$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
-				} else {
-					$errors[] = [
-						'error' => $l->t('Cannot create "data" directory'),
-						'hint' => $l->t('This can usually be fixed by giving the webserver write access to the root directory. See %s',
-							[$urlGenerator->linkToDocs('admin-dir_permissions')])
-					];
-				}
-			} else if (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
-				//common hint for all file permissions error messages
-				$permissionsHint = $l->t('Permissions can usually be fixed by giving the webserver write access to the root directory. See %s.',
-					[$urlGenerator->linkToDocs('admin-dir_permissions')]);
-				$errors[] = [
-					'error' => 'Your data directory is not writable',
-					'hint' => $permissionsHint
-				];
-			} else {
-				$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
-			}
-		}
-
-		if (!OC_Util::isSetLocaleWorking()) {
-			$errors[] = array(
-				'error' => $l->t('Setting locale to %s failed',
-					array('en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/'
-						. 'pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8')),
-				'hint' => $l->t('Please install one of these locales on your system and restart your webserver.')
-			);
-		}
-
-		// Contains the dependencies that should be checked against
-		// classes = class_exists
-		// functions = function_exists
-		// defined = defined
-		// ini = ini_get
-		// If the dependency is not found the missing module name is shown to the EndUser
-		// When adding new checks always verify that they pass on Travis as well
-		// for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini
-		$dependencies = array(
-			'classes' => array(
-				'ZipArchive' => 'zip',
-				'DOMDocument' => 'dom',
-				'XMLWriter' => 'XMLWriter',
-				'XMLReader' => 'XMLReader',
-			),
-			'functions' => [
-				'xml_parser_create' => 'libxml',
-				'mb_strcut' => 'mb multibyte',
-				'ctype_digit' => 'ctype',
-				'json_encode' => 'JSON',
-				'gd_info' => 'GD',
-				'gzencode' => 'zlib',
-				'iconv' => 'iconv',
-				'simplexml_load_string' => 'SimpleXML',
-				'hash' => 'HASH Message Digest Framework',
-				'curl_init' => 'cURL',
-				'openssl_verify' => 'OpenSSL',
-			],
-			'defined' => array(
-				'PDO::ATTR_DRIVER_NAME' => 'PDO'
-			),
-			'ini' => [
-				'default_charset' => 'UTF-8',
-			],
-		);
-		$missingDependencies = array();
-		$invalidIniSettings = [];
-		$moduleHint = $l->t('Please ask your server administrator to install the module.');
-
-		/**
-		 * FIXME: The dependency check does not work properly on HHVM on the moment
-		 *        and prevents installation. Once HHVM is more compatible with our
-		 *        approach to check for these values we should re-enable those
-		 *        checks.
-		 */
-		$iniWrapper = \OC::$server->getIniWrapper();
-		if (!self::runningOnHhvm()) {
-			foreach ($dependencies['classes'] as $class => $module) {
-				if (!class_exists($class)) {
-					$missingDependencies[] = $module;
-				}
-			}
-			foreach ($dependencies['functions'] as $function => $module) {
-				if (!function_exists($function)) {
-					$missingDependencies[] = $module;
-				}
-			}
-			foreach ($dependencies['defined'] as $defined => $module) {
-				if (!defined($defined)) {
-					$missingDependencies[] = $module;
-				}
-			}
-			foreach ($dependencies['ini'] as $setting => $expected) {
-				if (is_bool($expected)) {
-					if ($iniWrapper->getBool($setting) !== $expected) {
-						$invalidIniSettings[] = [$setting, $expected];
-					}
-				}
-				if (is_int($expected)) {
-					if ($iniWrapper->getNumeric($setting) !== $expected) {
-						$invalidIniSettings[] = [$setting, $expected];
-					}
-				}
-				if (is_string($expected)) {
-					if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
-						$invalidIniSettings[] = [$setting, $expected];
-					}
-				}
-			}
-		}
-
-		foreach($missingDependencies as $missingDependency) {
-			$errors[] = array(
-				'error' => $l->t('PHP module %s not installed.', array($missingDependency)),
-				'hint' => $moduleHint
-			);
-			$webServerRestart = true;
-		}
-		foreach($invalidIniSettings as $setting) {
-			if(is_bool($setting[1])) {
-				$setting[1] = $setting[1] ? 'on' : 'off';
-			}
-			$errors[] = [
-				'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
-				'hint' =>  $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
-			];
-			$webServerRestart = true;
-		}
-
-		/**
-		 * The mbstring.func_overload check can only be performed if the mbstring
-		 * module is installed as it will return null if the checking setting is
-		 * not available and thus a check on the boolean value fails.
-		 *
-		 * TODO: Should probably be implemented in the above generic dependency
-		 *       check somehow in the long-term.
-		 */
-		if($iniWrapper->getBool('mbstring.func_overload') !== null &&
-			$iniWrapper->getBool('mbstring.func_overload') === true) {
-			$errors[] = array(
-				'error' => $l->t('mbstring.func_overload is set to "%s" instead of the expected value "0"', [$iniWrapper->getString('mbstring.func_overload')]),
-				'hint' => $l->t('To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini')
-			);
-		}
-
-		if(function_exists('xml_parser_create') &&
-			LIBXML_LOADED_VERSION < 20700 ) {
-			$version = LIBXML_LOADED_VERSION;
-			$major = floor($version/10000);
-			$version -= ($major * 10000);
-			$minor = floor($version/100);
-			$version -= ($minor * 100);
-			$patch = $version;
-			$errors[] = array(
-				'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
-				'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
-			);
-		}
-
-		if (!self::isAnnotationsWorking()) {
-			$errors[] = array(
-				'error' => $l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.'),
-				'hint' => $l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')
-			);
-		}
-
-		if (!\OC::$CLI && $webServerRestart) {
-			$errors[] = array(
-				'error' => $l->t('PHP modules have been installed, but they are still listed as missing?'),
-				'hint' => $l->t('Please ask your server administrator to restart the web server.')
-			);
-		}
-
-		$errors = array_merge($errors, self::checkDatabaseVersion());
-
-		// Cache the result of this function
-		\OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
-
-		return $errors;
-	}
-
-	/**
-	 * Check the database version
-	 *
-	 * @return array errors array
-	 */
-	public static function checkDatabaseVersion() {
-		$l = \OC::$server->getL10N('lib');
-		$errors = array();
-		$dbType = \OC::$server->getSystemConfig()->getValue('dbtype', 'sqlite');
-		if ($dbType === 'pgsql') {
-			// check PostgreSQL version
-			try {
-				$result = \OC_DB::executeAudited('SHOW SERVER_VERSION');
-				$data = $result->fetchRow();
-				if (isset($data['server_version'])) {
-					$version = $data['server_version'];
-					if (version_compare($version, '9.0.0', '<')) {
-						$errors[] = array(
-							'error' => $l->t('PostgreSQL >= 9 required'),
-							'hint' => $l->t('Please upgrade your database version')
-						);
-					}
-				}
-			} catch (\Doctrine\DBAL\DBALException $e) {
-				$logger = \OC::$server->getLogger();
-				$logger->warning('Error occurred while checking PostgreSQL version, assuming >= 9');
-				$logger->logException($e);
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * Check for correct file permissions of data directory
-	 *
-	 * @param string $dataDirectory
-	 * @return array arrays with error messages and hints
-	 */
-	public static function checkDataDirectoryPermissions($dataDirectory) {
-		if(\OC::$server->getConfig()->getSystemValue('check_data_directory_permissions', true) === false) {
-			return  [];
-		}
-		$l = \OC::$server->getL10N('lib');
-		$errors = [];
-		$permissionsModHint = $l->t('Please change the permissions to 0770 so that the directory'
-			. ' cannot be listed by other users.');
-		$perms = substr(decoct(@fileperms($dataDirectory)), -3);
-		if (substr($perms, -1) !== '0') {
-			chmod($dataDirectory, 0770);
-			clearstatcache();
-			$perms = substr(decoct(@fileperms($dataDirectory)), -3);
-			if ($perms[2] !== '0') {
-				$errors[] = [
-					'error' => $l->t('Your data directory is readable by other users'),
-					'hint' => $permissionsModHint
-				];
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * Check that the data directory exists and is valid by
-	 * checking the existence of the ".ocdata" file.
-	 *
-	 * @param string $dataDirectory data directory path
-	 * @return array errors found
-	 */
-	public static function checkDataDirectoryValidity($dataDirectory) {
-		$l = \OC::$server->getL10N('lib');
-		$errors = [];
-		if ($dataDirectory[0] !== '/') {
-			$errors[] = [
-				'error' => $l->t('Your data directory must be an absolute path'),
-				'hint' => $l->t('Check the value of "datadirectory" in your configuration')
-			];
-		}
-		if (!file_exists($dataDirectory . '/.ocdata')) {
-			$errors[] = [
-				'error' => $l->t('Your data directory is invalid'),
-				'hint' => $l->t('Ensure there is a file called ".ocdata"' .
-					' in the root of the data directory.')
-			];
-		}
-		return $errors;
-	}
-
-	/**
-	 * Check if the user is logged in, redirects to home if not. With
-	 * redirect URL parameter to the request URI.
-	 *
-	 * @return void
-	 */
-	public static function checkLoggedIn() {
-		// Check if we are a user
-		if (!\OC::$server->getUserSession()->isLoggedIn()) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
-						'core.login.showLoginForm',
-						[
-							'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
-						]
-					)
-			);
-			exit();
-		}
-		// Redirect to 2FA challenge selection if 2FA challenge was not solved yet
-		if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-			exit();
-		}
-	}
-
-	/**
-	 * Check if the user is a admin, redirects to home if not
-	 *
-	 * @return void
-	 */
-	public static function checkAdminUser() {
-		OC_Util::checkLoggedIn();
-		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
-			exit();
-		}
-	}
-
-	/**
-	 * Check if the user is a subadmin, redirects to home if not
-	 *
-	 * @return null|boolean $groups where the current user is subadmin
-	 */
-	public static function checkSubAdminUser() {
-		OC_Util::checkLoggedIn();
-		$userObject = \OC::$server->getUserSession()->getUser();
-		$isSubAdmin = false;
-		if($userObject !== null) {
-			$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
-		}
-
-		if (!$isSubAdmin) {
-			header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
-			exit();
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the URL of the default page
-	 * based on the system configuration and
-	 * the apps visible for the current user
-	 *
-	 * @return string URL
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function getDefaultPageUrl() {
-		$urlGenerator = \OC::$server->getURLGenerator();
-		// Deny the redirect if the URL contains a @
-		// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-		if (isset($_REQUEST['redirect_url']) && strpos($_REQUEST['redirect_url'], '@') === false) {
-			$location = $urlGenerator->getAbsoluteURL(urldecode($_REQUEST['redirect_url']));
-		} else {
-			$defaultPage = \OC::$server->getConfig()->getAppValue('core', 'defaultpage');
-			if ($defaultPage) {
-				$location = $urlGenerator->getAbsoluteURL($defaultPage);
-			} else {
-				$appId = 'files';
-				$config = \OC::$server->getConfig();
-				$defaultApps = explode(',', $config->getSystemValue('defaultapp', 'files'));
-				// find the first app that is enabled for the current user
-				foreach ($defaultApps as $defaultApp) {
-					$defaultApp = OC_App::cleanAppId(strip_tags($defaultApp));
-					if (static::getAppManager()->isEnabledForUser($defaultApp)) {
-						$appId = $defaultApp;
-						break;
-					}
-				}
-
-				if($config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') {
-					$location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
-				} else {
-					$location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
-				}
-			}
-		}
-		return $location;
-	}
-
-	/**
-	 * Redirect to the user default page
-	 *
-	 * @return void
-	 */
-	public static function redirectToDefaultPage() {
-		$location = self::getDefaultPageUrl();
-		header('Location: ' . $location);
-		exit();
-	}
-
-	/**
-	 * get an id unique for this instance
-	 *
-	 * @return string
-	 */
-	public static function getInstanceId() {
-		$id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
-		if (is_null($id)) {
-			// We need to guarantee at least one letter in instanceid so it can be used as the session_name
-			$id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
-			\OC::$server->getSystemConfig()->setValue('instanceid', $id);
-		}
-		return $id;
-	}
-
-	/**
-	 * Public function to sanitize HTML
-	 *
-	 * This function is used to sanitize HTML and should be applied on any
-	 * string or array of strings before displaying it on a web page.
-	 *
-	 * @param string|array $value
-	 * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
-	 */
-	public static function sanitizeHTML($value) {
-		if (is_array($value)) {
-			$value = array_map(function($value) {
-				return self::sanitizeHTML($value);
-			}, $value);
-		} else {
-			// Specify encoding for PHP<5.4
-			$value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
-		}
-		return $value;
-	}
-
-	/**
-	 * Public function to encode url parameters
-	 *
-	 * This function is used to encode path to file before output.
-	 * Encoding is done according to RFC 3986 with one exception:
-	 * Character '/' is preserved as is.
-	 *
-	 * @param string $component part of URI to encode
-	 * @return string
-	 */
-	public static function encodePath($component) {
-		$encoded = rawurlencode($component);
-		$encoded = str_replace('%2F', '/', $encoded);
-		return $encoded;
-	}
-
-
-	public function createHtaccessTestFile(\OCP\IConfig $config) {
-		// php dev server does not support htaccess
-		if (php_sapi_name() === 'cli-server') {
-			return false;
-		}
-
-		// testdata
-		$fileName = '/htaccesstest.txt';
-		$testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
-
-		// creating a test file
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
-
-		if (file_exists($testFile)) {// already running this test, possible recursive call
-			return false;
-		}
-
-		$fp = @fopen($testFile, 'w');
-		if (!$fp) {
-			throw new OC\HintException('Can\'t create test file to check for working .htaccess file.',
-				'Make sure it is possible for the webserver to write to ' . $testFile);
-		}
-		fwrite($fp, $testContent);
-		fclose($fp);
-
-		return $testContent;
-	}
-
-	/**
-	 * Check if the .htaccess file is working
-	 * @param \OCP\IConfig $config
-	 * @return bool
-	 * @throws Exception
-	 * @throws \OC\HintException If the test file can't get written.
-	 */
-	public function isHtaccessWorking(\OCP\IConfig $config) {
-
-		if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
-			return true;
-		}
-
-		$testContent = $this->createHtaccessTestFile($config);
-		if ($testContent === false) {
-			return false;
-		}
-
-		$fileName = '/htaccesstest.txt';
-		$testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
-
-		// accessing the file via http
-		$url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
-		try {
-			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
-		} catch (\Exception $e) {
-			$content = false;
-		}
-
-		// cleanup
-		@unlink($testFile);
-
-		/*
+    public static $scripts = array();
+    public static $styles = array();
+    public static $headers = array();
+    private static $rootMounted = false;
+    private static $fsSetup = false;
+
+    /** @var array Local cache of version.php */
+    private static $versionCache = null;
+
+    protected static function getAppManager() {
+        return \OC::$server->getAppManager();
+    }
+
+    private static function initLocalStorageRootFS() {
+        // mount local file backend as root
+        $configDataDirectory = \OC::$server->getSystemConfig()->getValue("datadirectory", OC::$SERVERROOT . "/data");
+        //first set up the local "root" storage
+        \OC\Files\Filesystem::initMountManager();
+        if (!self::$rootMounted) {
+            \OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $configDataDirectory), '/');
+            self::$rootMounted = true;
+        }
+    }
+
+    /**
+     * mounting an object storage as the root fs will in essence remove the
+     * necessity of a data folder being present.
+     * TODO make home storage aware of this and use the object storage instead of local disk access
+     *
+     * @param array $config containing 'class' and optional 'arguments'
+     * @suppress PhanDeprecatedFunction
+     */
+    private static function initObjectStoreRootFS($config) {
+        // check misconfiguration
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = array();
+        }
+
+        // instantiate object store implementation
+        $name = $config['class'];
+        if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
+            $segments = explode('\\', $name);
+            OC_App::loadApp(strtolower($segments[1]));
+        }
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+        // mount with plain / root object store implementation
+        $config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';
+
+        // mount object storage as root
+        \OC\Files\Filesystem::initMountManager();
+        if (!self::$rootMounted) {
+            \OC\Files\Filesystem::mount($config['class'], $config['arguments'], '/');
+            self::$rootMounted = true;
+        }
+    }
+
+    /**
+     * mounting an object storage as the root fs will in essence remove the
+     * necessity of a data folder being present.
+     *
+     * @param array $config containing 'class' and optional 'arguments'
+     * @suppress PhanDeprecatedFunction
+     */
+    private static function initObjectStoreMultibucketRootFS($config) {
+        // check misconfiguration
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = array();
+        }
+
+        // instantiate object store implementation
+        $name = $config['class'];
+        if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
+            $segments = explode('\\', $name);
+            OC_App::loadApp(strtolower($segments[1]));
+        }
+
+        if (!isset($config['arguments']['bucket'])) {
+            $config['arguments']['bucket'] = '';
+        }
+        // put the root FS always in first bucket for multibucket configuration
+        $config['arguments']['bucket'] .= '0';
+
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+        // mount with plain / root object store implementation
+        $config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';
+
+        // mount object storage as root
+        \OC\Files\Filesystem::initMountManager();
+        if (!self::$rootMounted) {
+            \OC\Files\Filesystem::mount($config['class'], $config['arguments'], '/');
+            self::$rootMounted = true;
+        }
+    }
+
+    /**
+     * Can be set up
+     *
+     * @param string $user
+     * @return boolean
+     * @description configure the initial filesystem based on the configuration
+     * @suppress PhanDeprecatedFunction
+     * @suppress PhanAccessMethodInternal
+     */
+    public static function setupFS($user = '') {
+        //setting up the filesystem twice can only lead to trouble
+        if (self::$fsSetup) {
+            return false;
+        }
+
+        \OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
+
+        // If we are not forced to load a specific user we load the one that is logged in
+        if ($user === null) {
+            $user = '';
+        } else if ($user == "" && \OC::$server->getUserSession()->isLoggedIn()) {
+            $user = OC_User::getUser();
+        }
+
+        // load all filesystem apps before, so no setup-hook gets lost
+        OC_App::loadApps(array('filesystem'));
+
+        // the filesystem will finish when $user is not empty,
+        // mark fs setup here to avoid doing the setup from loading
+        // OC_Filesystem
+        if ($user != '') {
+            self::$fsSetup = true;
+        }
+
+        \OC\Files\Filesystem::initMountManager();
+
+        \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+        \OC\Files\Filesystem::addStorageWrapper('mount_options', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Common')) {
+                /** @var \OC\Files\Storage\Common $storage */
+                $storage->setMountOptions($mount->getOptions());
+            }
+            return $storage;
+        });
+
+        \OC\Files\Filesystem::addStorageWrapper('enable_sharing', function ($mountPoint, \OCP\Files\Storage\IStorage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+            if (!$mount->getOption('enable_sharing', true)) {
+                return new \OC\Files\Storage\Wrapper\PermissionsMask([
+                    'storage' => $storage,
+                    'mask' => \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE
+                ]);
+            }
+            return $storage;
+        });
+
+        // install storage availability wrapper, before most other wrappers
+        \OC\Files\Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, \OCP\Files\Storage\IStorage $storage) {
+            if (!$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
+                return new \OC\Files\Storage\Wrapper\Availability(['storage' => $storage]);
+            }
+            return $storage;
+        });
+
+        \OC\Files\Filesystem::addStorageWrapper('oc_encoding', function ($mountPoint, \OCP\Files\Storage $storage, \OCP\Files\Mount\IMountPoint $mount) {
+            if ($mount->getOption('encoding_compatibility', false) && !$storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage') && !$storage->isLocal()) {
+                return new \OC\Files\Storage\Wrapper\Encoding(['storage' => $storage]);
+            }
+            return $storage;
+        });
+
+        \OC\Files\Filesystem::addStorageWrapper('oc_quota', function ($mountPoint, $storage) {
+            // set up quota for home storages, even for other users
+            // which can happen when using sharing
+
+            /**
+             * @var \OC\Files\Storage\Storage $storage
+             */
+            if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
+                || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
+            ) {
+                /** @var \OC\Files\Storage\Home $storage */
+                if (is_object($storage->getUser())) {
+                    $user = $storage->getUser()->getUID();
+                    $quota = OC_Util::getUserQuota($user);
+                    if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                        return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files'));
+                    }
+                }
+            }
+
+            return $storage;
+        });
+
+        OC_Hook::emit('OC_Filesystem', 'preSetup', array('user' => $user));
+        \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(true);
+
+        //check if we are using an object storage
+        $objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null);
+        $objectStoreMultibucket = \OC::$server->getSystemConfig()->getValue('objectstore_multibucket', null);
+
+        // use the same order as in ObjectHomeMountProvider
+        if (isset($objectStoreMultibucket)) {
+            self::initObjectStoreMultibucketRootFS($objectStoreMultibucket);
+        } elseif (isset($objectStore)) {
+            self::initObjectStoreRootFS($objectStore);
+        } else {
+            self::initLocalStorageRootFS();
+        }
+
+        if ($user != '' && !\OC::$server->getUserManager()->userExists($user)) {
+            \OC::$server->getEventLogger()->end('setup_fs');
+            return false;
+        }
+
+        //if we aren't logged in, there is no use to set up the filesystem
+        if ($user != "") {
+
+            $userDir = '/' . $user . '/files';
+
+            //jail the user into his "home" directory
+            \OC\Files\Filesystem::init($user, $userDir);
+
+            OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
+        }
+        \OC::$server->getEventLogger()->end('setup_fs');
+        return true;
+    }
+
+    /**
+     * check if a password is required for each public link
+     *
+     * @return boolean
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function isPublicLinkPasswordRequired() {
+        $enforcePassword = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_links_password', 'no');
+        return $enforcePassword === 'yes';
+    }
+
+    /**
+     * check if sharing is disabled for the current user
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IUser|null $user
+     * @return bool
+     */
+    public static function isSharingDisabledForUser(IConfig $config, IGroupManager $groupManager, $user) {
+        if ($config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
+            $groupsList = $config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+            $excludedGroups = json_decode($groupsList);
+            if (is_null($excludedGroups)) {
+                $excludedGroups = explode(',', $groupsList);
+                $newValue = json_encode($excludedGroups);
+                $config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
+            }
+            $usersGroups = $groupManager->getUserGroupIds($user);
+            if (!empty($usersGroups)) {
+                $remainingGroups = array_diff($usersGroups, $excludedGroups);
+                // if the user is only in groups which are disabled for sharing then
+                // sharing is also disabled for the user
+                if (empty($remainingGroups)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * check if share API enforces a default expire date
+     *
+     * @return boolean
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function isDefaultExpireDateEnforced() {
+        $isDefaultExpireDateEnabled = \OC::$server->getConfig()->getAppValue('core', 'shareapi_default_expire_date', 'no');
+        $enforceDefaultExpireDate = false;
+        if ($isDefaultExpireDateEnabled === 'yes') {
+            $value = \OC::$server->getConfig()->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+            $enforceDefaultExpireDate = $value === 'yes';
+        }
+
+        return $enforceDefaultExpireDate;
+    }
+
+    /**
+     * Get the quota of a user
+     *
+     * @param string $userId
+     * @return float Quota bytes
+     */
+    public static function getUserQuota($userId) {
+        $user = \OC::$server->getUserManager()->get($userId);
+        if (is_null($user)) {
+            return \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        }
+        $userQuota = $user->getQuota();
+        if($userQuota === 'none') {
+            return \OCP\Files\FileInfo::SPACE_UNLIMITED;
+        }
+        return OC_Helper::computerFileSize($userQuota);
+    }
+
+    /**
+     * copies the skeleton to the users /files
+     *
+     * @param String $userId
+     * @param \OCP\Files\Folder $userDirectory
+     * @throws \RuntimeException
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) {
+
+        $plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+        $userLang = \OC::$server->getL10NFactory()->findLanguage();
+        $skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory);
+
+        if (!file_exists($skeletonDirectory)) {
+            $dialectStart = strpos($userLang, '_');
+            if ($dialectStart !== false) {
+                $skeletonDirectory = str_replace('{lang}', substr($userLang, 0, $dialectStart), $plainSkeletonDirectory);
+            }
+            if ($dialectStart === false || !file_exists($skeletonDirectory)) {
+                $skeletonDirectory = str_replace('{lang}', 'default', $plainSkeletonDirectory);
+            }
+            if (!file_exists($skeletonDirectory)) {
+                $skeletonDirectory = '';
+            }
+        }
+
+        $instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', '');
+
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+        $appdata = 'appdata_' . $instanceId;
+        if ($userId === $appdata) {
+            throw new \RuntimeException('username is reserved name: ' . $appdata);
+        }
+
+        if (!empty($skeletonDirectory)) {
+            \OCP\Util::writeLog(
+                'files_skeleton',
+                'copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'),
+                ILogger::DEBUG
+            );
+            self::copyr($skeletonDirectory, $userDirectory);
+            // update the file cache
+            $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
+        }
+    }
+
+    /**
+     * copies a directory recursively by using streams
+     *
+     * @param string $source
+     * @param \OCP\Files\Folder $target
+     * @return void
+     */
+    public static function copyr($source, \OCP\Files\Folder $target) {
+        $logger = \OC::$server->getLogger();
+
+        // Verify if folder exists
+        $dir = opendir($source);
+        if($dir === false) {
+            $logger->error(sprintf('Could not opendir "%s"', $source), ['app' => 'core']);
+            return;
+        }
+
+        // Copy the files
+        while (false !== ($file = readdir($dir))) {
+            if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+                if (is_dir($source . '/' . $file)) {
+                    $child = $target->newFolder($file);
+                    self::copyr($source . '/' . $file, $child);
+                } else {
+                    $child = $target->newFile($file);
+                    $sourceStream = fopen($source . '/' . $file, 'r');
+                    if($sourceStream === false) {
+                        $logger->error(sprintf('Could not fopen "%s"', $source . '/' . $file), ['app' => 'core']);
+                        closedir($dir);
+                        return;
+                    }
+                    stream_copy_to_stream($sourceStream, $child->fopen('w'));
+                }
+            }
+        }
+        closedir($dir);
+    }
+
+    /**
+     * @return void
+     * @suppress PhanUndeclaredMethod
+     */
+    public static function tearDownFS() {
+        \OC\Files\Filesystem::tearDown();
+        \OC::$server->getRootFolder()->clearCache();
+        self::$fsSetup = false;
+        self::$rootMounted = false;
+    }
+
+    /**
+     * get the current installed version of ownCloud
+     *
+     * @return array
+     */
+    public static function getVersion() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_Version'];
+    }
+
+    /**
+     * get the current installed version string of ownCloud
+     *
+     * @return string
+     */
+    public static function getVersionString() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_VersionString'];
+    }
+
+    /**
+     * @deprecated the value is of no use anymore
+     * @return string
+     */
+    public static function getEditionString() {
+        return '';
+    }
+
+    /**
+     * @description get the update channel of the current installed of ownCloud.
+     * @return string
+     */
+    public static function getChannel() {
+        OC_Util::loadVersion();
+        return \OC::$server->getConfig()->getSystemValue('updater.release.channel', self::$versionCache['OC_Channel']);
+    }
+
+    /**
+     * @description get the build number of the current installed of ownCloud.
+     * @return string
+     */
+    public static function getBuild() {
+        OC_Util::loadVersion();
+        return self::$versionCache['OC_Build'];
+    }
+
+    /**
+     * @description load the version.php into the session as cache
+     * @suppress PhanUndeclaredVariable
+     */
+    private static function loadVersion() {
+        if (self::$versionCache !== null) {
+            return;
+        }
+
+        $timestamp = filemtime(OC::$SERVERROOT . '/version.php');
+        require OC::$SERVERROOT . '/version.php';
+        /** @var $timestamp int */
+        self::$versionCache['OC_Version_Timestamp'] = $timestamp;
+        /** @var $OC_Version string */
+        self::$versionCache['OC_Version'] = $OC_Version;
+        /** @var $OC_VersionString string */
+        self::$versionCache['OC_VersionString'] = $OC_VersionString;
+        /** @var $OC_Build string */
+        self::$versionCache['OC_Build'] = $OC_Build;
+
+        /** @var $OC_Channel string */
+        self::$versionCache['OC_Channel'] = $OC_Channel;
+    }
+
+    /**
+     * generates a path for JS/CSS files. If no application is provided it will create the path for core.
+     *
+     * @param string $application application to get the files from
+     * @param string $directory directory within this application (css, js, vendor, etc)
+     * @param string $file the file inside of the above folder
+     * @return string the path
+     */
+    private static function generatePath($application, $directory, $file) {
+        if (is_null($file)) {
+            $file = $application;
+            $application = "";
+        }
+        if (!empty($application)) {
+            return "$application/$directory/$file";
+        } else {
+            return "$directory/$file";
+        }
+    }
+
+    /**
+     * add a javascript file
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Script to the beginning of the list
+     * @return void
+     */
+    public static function addScript($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'js', $file);
+
+        // core js files need separate handling
+        if ($application !== 'core' && $file !== null) {
+            self::addTranslations ( $application );
+        }
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a javascript file from the vendor sub folder
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Script to the beginning of the list
+     * @return void
+     */
+    public static function addVendorScript($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'vendor', $file);
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a translation JS file
+     *
+     * @param string $application application id
+     * @param string|null $languageCode language code, defaults to the current language
+     * @param bool|null $prepend prepend the Script to the beginning of the list
+     */
+    public static function addTranslations($application, $languageCode = null, $prepend = false) {
+        if (is_null($languageCode)) {
+            $languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
+        }
+        if (!empty($application)) {
+            $path = "$application/l10n/$languageCode";
+        } else {
+            $path = "l10n/$languageCode";
+        }
+        self::addExternalResource($application, $prepend, $path, "script");
+    }
+
+    /**
+     * add a css file
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Style to the beginning of the list
+     * @return void
+     */
+    public static function addStyle($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'css', $file);
+        self::addExternalResource($application, $prepend, $path, "style");
+    }
+
+    /**
+     * add a css file from the vendor sub folder
+     *
+     * @param string $application application id
+     * @param string|null $file filename
+     * @param bool $prepend prepend the Style to the beginning of the list
+     * @return void
+     */
+    public static function addVendorStyle($application, $file = null, $prepend = false) {
+        $path = OC_Util::generatePath($application, 'vendor', $file);
+        self::addExternalResource($application, $prepend, $path, "style");
+    }
+
+    /**
+     * add an external resource css/js file
+     *
+     * @param string $application application id
+     * @param bool $prepend prepend the file to the beginning of the list
+     * @param string $path
+     * @param string $type (script or style)
+     * @return void
+     */
+    private static function addExternalResource($application, $prepend, $path, $type = "script") {
+
+        if ($type === "style") {
+            if (!in_array($path, self::$styles)) {
+                if ($prepend === true) {
+                    array_unshift ( self::$styles, $path );
+                } else {
+                    self::$styles[] = $path;
+                }
+            }
+        } elseif ($type === "script") {
+            if (!in_array($path, self::$scripts)) {
+                if ($prepend === true) {
+                    array_unshift ( self::$scripts, $path );
+                } else {
+                    self::$scripts [] = $path;
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a custom element to the header
+     * If $text is null then the element will be written as empty element.
+     * So use "" to get a closing tag.
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element
+     */
+    public static function addHeader($tag, $attributes, $text=null) {
+        self::$headers[] = array(
+            'tag' => $tag,
+            'attributes' => $attributes,
+            'text' => $text
+        );
+    }
+
+    /**
+     * check if the current server configuration is suitable for ownCloud
+     *
+     * @param \OC\SystemConfig $config
+     * @return array arrays with error messages and hints
+     */
+    public static function checkServer(\OC\SystemConfig $config) {
+        $l = \OC::$server->getL10N('lib');
+        $errors = array();
+        $CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');
+
+        if (!self::needUpgrade($config) && $config->getValue('installed', false)) {
+            // this check needs to be done every time
+            $errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
+        }
+
+        // Assume that if checkServer() succeeded before in this session, then all is fine.
+        if (\OC::$server->getSession()->exists('checkServer_succeeded') && \OC::$server->getSession()->get('checkServer_succeeded')) {
+            return $errors;
+        }
+
+        $webServerRestart = false;
+        $setup = new \OC\Setup(
+            $config,
+            \OC::$server->getIniWrapper(),
+            \OC::$server->getL10N('lib'),
+            \OC::$server->query(\OCP\Defaults::class),
+            \OC::$server->getLogger(),
+            \OC::$server->getSecureRandom(),
+            \OC::$server->query(\OC\Installer::class)
+        );
+
+        $urlGenerator = \OC::$server->getURLGenerator();
+
+        $availableDatabases = $setup->getSupportedDatabases();
+        if (empty($availableDatabases)) {
+            $errors[] = array(
+                'error' => $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
+                'hint' => '' //TODO: sane hint
+            );
+            $webServerRestart = true;
+        }
+
+        // Check if config folder is writable.
+        if(!OC_Helper::isReadOnlyConfigEnabled()) {
+            if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
+                $errors[] = array(
+                    'error' => $l->t('Cannot write into "config" directory'),
+                    'hint' => $l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
+                        [$urlGenerator->linkToDocs('admin-dir_permissions')])
+                );
+            }
+        }
+
+        // Check if there is a writable install folder.
+        if ($config->getValue('appstoreenabled', true)) {
+            if (OC_App::getInstallPath() === null
+                || !is_writable(OC_App::getInstallPath())
+                || !is_readable(OC_App::getInstallPath())
+            ) {
+                $errors[] = array(
+                    'error' => $l->t('Cannot write into "apps" directory'),
+                    'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory'
+                        . ' or disabling the appstore in the config file. See %s',
+                        [$urlGenerator->linkToDocs('admin-dir_permissions')])
+                );
+            }
+        }
+        // Create root dir.
+        if ($config->getValue('installed', false)) {
+            if (!is_dir($CONFIG_DATADIRECTORY)) {
+                $success = @mkdir($CONFIG_DATADIRECTORY);
+                if ($success) {
+                    $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
+                } else {
+                    $errors[] = [
+                        'error' => $l->t('Cannot create "data" directory'),
+                        'hint' => $l->t('This can usually be fixed by giving the webserver write access to the root directory. See %s',
+                            [$urlGenerator->linkToDocs('admin-dir_permissions')])
+                    ];
+                }
+            } else if (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
+                //common hint for all file permissions error messages
+                $permissionsHint = $l->t('Permissions can usually be fixed by giving the webserver write access to the root directory. See %s.',
+                    [$urlGenerator->linkToDocs('admin-dir_permissions')]);
+                $errors[] = [
+                    'error' => 'Your data directory is not writable',
+                    'hint' => $permissionsHint
+                ];
+            } else {
+                $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
+            }
+        }
+
+        if (!OC_Util::isSetLocaleWorking()) {
+            $errors[] = array(
+                'error' => $l->t('Setting locale to %s failed',
+                    array('en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/'
+                        . 'pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8')),
+                'hint' => $l->t('Please install one of these locales on your system and restart your webserver.')
+            );
+        }
+
+        // Contains the dependencies that should be checked against
+        // classes = class_exists
+        // functions = function_exists
+        // defined = defined
+        // ini = ini_get
+        // If the dependency is not found the missing module name is shown to the EndUser
+        // When adding new checks always verify that they pass on Travis as well
+        // for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini
+        $dependencies = array(
+            'classes' => array(
+                'ZipArchive' => 'zip',
+                'DOMDocument' => 'dom',
+                'XMLWriter' => 'XMLWriter',
+                'XMLReader' => 'XMLReader',
+            ),
+            'functions' => [
+                'xml_parser_create' => 'libxml',
+                'mb_strcut' => 'mb multibyte',
+                'ctype_digit' => 'ctype',
+                'json_encode' => 'JSON',
+                'gd_info' => 'GD',
+                'gzencode' => 'zlib',
+                'iconv' => 'iconv',
+                'simplexml_load_string' => 'SimpleXML',
+                'hash' => 'HASH Message Digest Framework',
+                'curl_init' => 'cURL',
+                'openssl_verify' => 'OpenSSL',
+            ],
+            'defined' => array(
+                'PDO::ATTR_DRIVER_NAME' => 'PDO'
+            ),
+            'ini' => [
+                'default_charset' => 'UTF-8',
+            ],
+        );
+        $missingDependencies = array();
+        $invalidIniSettings = [];
+        $moduleHint = $l->t('Please ask your server administrator to install the module.');
+
+        /**
+         * FIXME: The dependency check does not work properly on HHVM on the moment
+         *        and prevents installation. Once HHVM is more compatible with our
+         *        approach to check for these values we should re-enable those
+         *        checks.
+         */
+        $iniWrapper = \OC::$server->getIniWrapper();
+        if (!self::runningOnHhvm()) {
+            foreach ($dependencies['classes'] as $class => $module) {
+                if (!class_exists($class)) {
+                    $missingDependencies[] = $module;
+                }
+            }
+            foreach ($dependencies['functions'] as $function => $module) {
+                if (!function_exists($function)) {
+                    $missingDependencies[] = $module;
+                }
+            }
+            foreach ($dependencies['defined'] as $defined => $module) {
+                if (!defined($defined)) {
+                    $missingDependencies[] = $module;
+                }
+            }
+            foreach ($dependencies['ini'] as $setting => $expected) {
+                if (is_bool($expected)) {
+                    if ($iniWrapper->getBool($setting) !== $expected) {
+                        $invalidIniSettings[] = [$setting, $expected];
+                    }
+                }
+                if (is_int($expected)) {
+                    if ($iniWrapper->getNumeric($setting) !== $expected) {
+                        $invalidIniSettings[] = [$setting, $expected];
+                    }
+                }
+                if (is_string($expected)) {
+                    if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
+                        $invalidIniSettings[] = [$setting, $expected];
+                    }
+                }
+            }
+        }
+
+        foreach($missingDependencies as $missingDependency) {
+            $errors[] = array(
+                'error' => $l->t('PHP module %s not installed.', array($missingDependency)),
+                'hint' => $moduleHint
+            );
+            $webServerRestart = true;
+        }
+        foreach($invalidIniSettings as $setting) {
+            if(is_bool($setting[1])) {
+                $setting[1] = $setting[1] ? 'on' : 'off';
+            }
+            $errors[] = [
+                'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
+                'hint' =>  $l->t('Adjusting this setting in php.ini will make Nextcloud run again')
+            ];
+            $webServerRestart = true;
+        }
+
+        /**
+         * The mbstring.func_overload check can only be performed if the mbstring
+         * module is installed as it will return null if the checking setting is
+         * not available and thus a check on the boolean value fails.
+         *
+         * TODO: Should probably be implemented in the above generic dependency
+         *       check somehow in the long-term.
+         */
+        if($iniWrapper->getBool('mbstring.func_overload') !== null &&
+            $iniWrapper->getBool('mbstring.func_overload') === true) {
+            $errors[] = array(
+                'error' => $l->t('mbstring.func_overload is set to "%s" instead of the expected value "0"', [$iniWrapper->getString('mbstring.func_overload')]),
+                'hint' => $l->t('To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini')
+            );
+        }
+
+        if(function_exists('xml_parser_create') &&
+            LIBXML_LOADED_VERSION < 20700 ) {
+            $version = LIBXML_LOADED_VERSION;
+            $major = floor($version/10000);
+            $version -= ($major * 10000);
+            $minor = floor($version/100);
+            $version -= ($minor * 100);
+            $patch = $version;
+            $errors[] = array(
+                'error' => $l->t('libxml2 2.7.0 is at least required. Currently %s is installed.', [$major . '.' . $minor . '.' . $patch]),
+                'hint' => $l->t('To fix this issue update your libxml2 version and restart your web server.')
+            );
+        }
+
+        if (!self::isAnnotationsWorking()) {
+            $errors[] = array(
+                'error' => $l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.'),
+                'hint' => $l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')
+            );
+        }
+
+        if (!\OC::$CLI && $webServerRestart) {
+            $errors[] = array(
+                'error' => $l->t('PHP modules have been installed, but they are still listed as missing?'),
+                'hint' => $l->t('Please ask your server administrator to restart the web server.')
+            );
+        }
+
+        $errors = array_merge($errors, self::checkDatabaseVersion());
+
+        // Cache the result of this function
+        \OC::$server->getSession()->set('checkServer_succeeded', count($errors) == 0);
+
+        return $errors;
+    }
+
+    /**
+     * Check the database version
+     *
+     * @return array errors array
+     */
+    public static function checkDatabaseVersion() {
+        $l = \OC::$server->getL10N('lib');
+        $errors = array();
+        $dbType = \OC::$server->getSystemConfig()->getValue('dbtype', 'sqlite');
+        if ($dbType === 'pgsql') {
+            // check PostgreSQL version
+            try {
+                $result = \OC_DB::executeAudited('SHOW SERVER_VERSION');
+                $data = $result->fetchRow();
+                if (isset($data['server_version'])) {
+                    $version = $data['server_version'];
+                    if (version_compare($version, '9.0.0', '<')) {
+                        $errors[] = array(
+                            'error' => $l->t('PostgreSQL >= 9 required'),
+                            'hint' => $l->t('Please upgrade your database version')
+                        );
+                    }
+                }
+            } catch (\Doctrine\DBAL\DBALException $e) {
+                $logger = \OC::$server->getLogger();
+                $logger->warning('Error occurred while checking PostgreSQL version, assuming >= 9');
+                $logger->logException($e);
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check for correct file permissions of data directory
+     *
+     * @param string $dataDirectory
+     * @return array arrays with error messages and hints
+     */
+    public static function checkDataDirectoryPermissions($dataDirectory) {
+        if(\OC::$server->getConfig()->getSystemValue('check_data_directory_permissions', true) === false) {
+            return  [];
+        }
+        $l = \OC::$server->getL10N('lib');
+        $errors = [];
+        $permissionsModHint = $l->t('Please change the permissions to 0770 so that the directory'
+            . ' cannot be listed by other users.');
+        $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+        if (substr($perms, -1) !== '0') {
+            chmod($dataDirectory, 0770);
+            clearstatcache();
+            $perms = substr(decoct(@fileperms($dataDirectory)), -3);
+            if ($perms[2] !== '0') {
+                $errors[] = [
+                    'error' => $l->t('Your data directory is readable by other users'),
+                    'hint' => $permissionsModHint
+                ];
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check that the data directory exists and is valid by
+     * checking the existence of the ".ocdata" file.
+     *
+     * @param string $dataDirectory data directory path
+     * @return array errors found
+     */
+    public static function checkDataDirectoryValidity($dataDirectory) {
+        $l = \OC::$server->getL10N('lib');
+        $errors = [];
+        if ($dataDirectory[0] !== '/') {
+            $errors[] = [
+                'error' => $l->t('Your data directory must be an absolute path'),
+                'hint' => $l->t('Check the value of "datadirectory" in your configuration')
+            ];
+        }
+        if (!file_exists($dataDirectory . '/.ocdata')) {
+            $errors[] = [
+                'error' => $l->t('Your data directory is invalid'),
+                'hint' => $l->t('Ensure there is a file called ".ocdata"' .
+                    ' in the root of the data directory.')
+            ];
+        }
+        return $errors;
+    }
+
+    /**
+     * Check if the user is logged in, redirects to home if not. With
+     * redirect URL parameter to the request URI.
+     *
+     * @return void
+     */
+    public static function checkLoggedIn() {
+        // Check if we are a user
+        if (!\OC::$server->getUserSession()->isLoggedIn()) {
+            header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute(
+                        'core.login.showLoginForm',
+                        [
+                            'redirect_url' => \OC::$server->getRequest()->getRequestUri(),
+                        ]
+                    )
+            );
+            exit();
+        }
+        // Redirect to 2FA challenge selection if 2FA challenge was not solved yet
+        if (\OC::$server->getTwoFactorAuthManager()->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
+            header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+            exit();
+        }
+    }
+
+    /**
+     * Check if the user is a admin, redirects to home if not
+     *
+     * @return void
+     */
+    public static function checkAdminUser() {
+        OC_Util::checkLoggedIn();
+        if (!OC_User::isAdminUser(OC_User::getUser())) {
+            header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+            exit();
+        }
+    }
+
+    /**
+     * Check if the user is a subadmin, redirects to home if not
+     *
+     * @return null|boolean $groups where the current user is subadmin
+     */
+    public static function checkSubAdminUser() {
+        OC_Util::checkLoggedIn();
+        $userObject = \OC::$server->getUserSession()->getUser();
+        $isSubAdmin = false;
+        if($userObject !== null) {
+            $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
+        }
+
+        if (!$isSubAdmin) {
+            header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
+            exit();
+        }
+        return true;
+    }
+
+    /**
+     * Returns the URL of the default page
+     * based on the system configuration and
+     * the apps visible for the current user
+     *
+     * @return string URL
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function getDefaultPageUrl() {
+        $urlGenerator = \OC::$server->getURLGenerator();
+        // Deny the redirect if the URL contains a @
+        // This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+        if (isset($_REQUEST['redirect_url']) && strpos($_REQUEST['redirect_url'], '@') === false) {
+            $location = $urlGenerator->getAbsoluteURL(urldecode($_REQUEST['redirect_url']));
+        } else {
+            $defaultPage = \OC::$server->getConfig()->getAppValue('core', 'defaultpage');
+            if ($defaultPage) {
+                $location = $urlGenerator->getAbsoluteURL($defaultPage);
+            } else {
+                $appId = 'files';
+                $config = \OC::$server->getConfig();
+                $defaultApps = explode(',', $config->getSystemValue('defaultapp', 'files'));
+                // find the first app that is enabled for the current user
+                foreach ($defaultApps as $defaultApp) {
+                    $defaultApp = OC_App::cleanAppId(strip_tags($defaultApp));
+                    if (static::getAppManager()->isEnabledForUser($defaultApp)) {
+                        $appId = $defaultApp;
+                        break;
+                    }
+                }
+
+                if($config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true') {
+                    $location = $urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+                } else {
+                    $location = $urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+                }
+            }
+        }
+        return $location;
+    }
+
+    /**
+     * Redirect to the user default page
+     *
+     * @return void
+     */
+    public static function redirectToDefaultPage() {
+        $location = self::getDefaultPageUrl();
+        header('Location: ' . $location);
+        exit();
+    }
+
+    /**
+     * get an id unique for this instance
+     *
+     * @return string
+     */
+    public static function getInstanceId() {
+        $id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
+        if (is_null($id)) {
+            // We need to guarantee at least one letter in instanceid so it can be used as the session_name
+            $id = 'oc' . \OC::$server->getSecureRandom()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
+            \OC::$server->getSystemConfig()->setValue('instanceid', $id);
+        }
+        return $id;
+    }
+
+    /**
+     * Public function to sanitize HTML
+     *
+     * This function is used to sanitize HTML and should be applied on any
+     * string or array of strings before displaying it on a web page.
+     *
+     * @param string|array $value
+     * @return string|array an array of sanitized strings or a single sanitized string, depends on the input parameter.
+     */
+    public static function sanitizeHTML($value) {
+        if (is_array($value)) {
+            $value = array_map(function($value) {
+                return self::sanitizeHTML($value);
+            }, $value);
+        } else {
+            // Specify encoding for PHP<5.4
+            $value = htmlspecialchars((string)$value, ENT_QUOTES, 'UTF-8');
+        }
+        return $value;
+    }
+
+    /**
+     * Public function to encode url parameters
+     *
+     * This function is used to encode path to file before output.
+     * Encoding is done according to RFC 3986 with one exception:
+     * Character '/' is preserved as is.
+     *
+     * @param string $component part of URI to encode
+     * @return string
+     */
+    public static function encodePath($component) {
+        $encoded = rawurlencode($component);
+        $encoded = str_replace('%2F', '/', $encoded);
+        return $encoded;
+    }
+
+
+    public function createHtaccessTestFile(\OCP\IConfig $config) {
+        // php dev server does not support htaccess
+        if (php_sapi_name() === 'cli-server') {
+            return false;
+        }
+
+        // testdata
+        $fileName = '/htaccesstest.txt';
+        $testContent = 'This is used for testing whether htaccess is properly enabled to disallow access from the outside. This file can be safely removed.';
+
+        // creating a test file
+        $testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+
+        if (file_exists($testFile)) {// already running this test, possible recursive call
+            return false;
+        }
+
+        $fp = @fopen($testFile, 'w');
+        if (!$fp) {
+            throw new OC\HintException('Can\'t create test file to check for working .htaccess file.',
+                'Make sure it is possible for the webserver to write to ' . $testFile);
+        }
+        fwrite($fp, $testContent);
+        fclose($fp);
+
+        return $testContent;
+    }
+
+    /**
+     * Check if the .htaccess file is working
+     * @param \OCP\IConfig $config
+     * @return bool
+     * @throws Exception
+     * @throws \OC\HintException If the test file can't get written.
+     */
+    public function isHtaccessWorking(\OCP\IConfig $config) {
+
+        if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
+            return true;
+        }
+
+        $testContent = $this->createHtaccessTestFile($config);
+        if ($testContent === false) {
+            return false;
+        }
+
+        $fileName = '/htaccesstest.txt';
+        $testFile = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $fileName;
+
+        // accessing the file via http
+        $url = \OC::$server->getURLGenerator()->getAbsoluteURL(OC::$WEBROOT . '/data' . $fileName);
+        try {
+            $content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+        } catch (\Exception $e) {
+            $content = false;
+        }
+
+        // cleanup
+        @unlink($testFile);
+
+        /*
 		 * If the content is not equal to test content our .htaccess
 		 * is working as required
 		 */
-		return $content !== $testContent;
-	}
-
-	/**
-	 * Check if the setlocal call does not work. This can happen if the right
-	 * local packages are not available on the server.
-	 *
-	 * @return bool
-	 */
-	public static function isSetLocaleWorking() {
-		\Patchwork\Utf8\Bootup::initLocale();
-		if ('' === basename('§')) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check if it's possible to get the inline annotations
-	 *
-	 * @return bool
-	 */
-	public static function isAnnotationsWorking() {
-		$reflection = new \ReflectionMethod(__METHOD__);
-		$docs = $reflection->getDocComment();
-
-		return (is_string($docs) && strlen($docs) > 50);
-	}
-
-	/**
-	 * Check if the PHP module fileinfo is loaded.
-	 *
-	 * @return bool
-	 */
-	public static function fileInfoLoaded() {
-		return function_exists('finfo_open');
-	}
-
-	/**
-	 * clear all levels of output buffering
-	 *
-	 * @return void
-	 */
-	public static function obEnd() {
-		while (ob_get_level()) {
-			ob_end_clean();
-		}
-	}
-
-	/**
-	 * Checks whether the server is running on Mac OS X
-	 *
-	 * @return bool true if running on Mac OS X, false otherwise
-	 */
-	public static function runningOnMac() {
-		return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
-	}
-
-	/**
-	 * Checks whether server is running on HHVM
-	 *
-	 * @return bool True if running on HHVM, false otherwise
-	 */
-	public static function runningOnHhvm() {
-		return defined('HHVM_VERSION');
-	}
-
-	/**
-	 * Handles the case that there may not be a theme, then check if a "default"
-	 * theme exists and take that one
-	 *
-	 * @return string the theme
-	 */
-	public static function getTheme() {
-		$theme = \OC::$server->getSystemConfig()->getValue("theme", '');
-
-		if ($theme === '') {
-			if (is_dir(OC::$SERVERROOT . '/themes/default')) {
-				$theme = 'default';
-			}
-		}
-
-		return $theme;
-	}
-
-	/**
-	 * Clear a single file from the opcode cache
-	 * This is useful for writing to the config file
-	 * in case the opcode cache does not re-validate files
-	 * Returns true if successful, false if unsuccessful:
-	 * caller should fall back on clearing the entire cache
-	 * with clearOpcodeCache() if unsuccessful
-	 *
-	 * @param string $path the path of the file to clear from the cache
-	 * @return bool true if underlying function returns true, otherwise false
-	 */
-	public static function deleteFromOpcodeCache($path) {
-		$ret = false;
-		if ($path) {
-			// APC >= 3.1.1
-			if (function_exists('apc_delete_file')) {
-				$ret = @apc_delete_file($path);
-			}
-			// Zend OpCache >= 7.0.0, PHP >= 5.5.0
-			if (function_exists('opcache_invalidate')) {
-				$ret = opcache_invalidate($path);
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Clear the opcode cache if one exists
-	 * This is necessary for writing to the config file
-	 * in case the opcode cache does not re-validate files
-	 *
-	 * @return void
-	 * @suppress PhanDeprecatedFunction
-	 * @suppress PhanUndeclaredConstant
-	 */
-	public static function clearOpcodeCache() {
-		// APC
-		if (function_exists('apc_clear_cache')) {
-			apc_clear_cache();
-		}
-		// Zend Opcache
-		if (function_exists('accelerator_reset')) {
-			accelerator_reset();
-		}
-		// XCache
-		if (function_exists('xcache_clear_cache')) {
-			if (\OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
-				\OCP\Util::writeLog('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', ILogger::WARN);
-			} else {
-				@xcache_clear_cache(XC_TYPE_PHP, 0);
-			}
-		}
-		// Opcache (PHP >= 5.5)
-		if (function_exists('opcache_reset')) {
-			opcache_reset();
-		}
-	}
-
-	/**
-	 * Normalize a unicode string
-	 *
-	 * @param string $value a not normalized string
-	 * @return bool|string
-	 */
-	public static function normalizeUnicode($value) {
-		if(Normalizer::isNormalized($value)) {
-			return $value;
-		}
-
-		$normalizedValue = Normalizer::normalize($value);
-		if ($normalizedValue === null || $normalizedValue === false) {
-			\OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
-			return $value;
-		}
-
-		return $normalizedValue;
-	}
-
-	/**
-	 * A human readable string is generated based on version and build number
-	 *
-	 * @return string
-	 */
-	public static function getHumanVersion() {
-		$version = OC_Util::getVersionString();
-		$build = OC_Util::getBuild();
-		if (!empty($build) and OC_Util::getChannel() === 'daily') {
-			$version .= ' Build:' . $build;
-		}
-		return $version;
-	}
-
-	/**
-	 * Returns whether the given file name is valid
-	 *
-	 * @param string $file file name to check
-	 * @return bool true if the file name is valid, false otherwise
-	 * @deprecated use \OC\Files\View::verifyPath()
-	 */
-	public static function isValidFileName($file) {
-		$trimmed = trim($file);
-		if ($trimmed === '') {
-			return false;
-		}
-		if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
-			return false;
-		}
-
-		// detect part files
-		if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
-			return false;
-		}
-
-		foreach (str_split($trimmed) as $char) {
-			if (strpos(\OCP\Constants::FILENAME_INVALID_CHARS, $char) !== false) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Check whether the instance needs to perform an upgrade,
-	 * either when the core version is higher or any app requires
-	 * an upgrade.
-	 *
-	 * @param \OC\SystemConfig $config
-	 * @return bool whether the core or any app needs an upgrade
-	 * @throws \OC\HintException When the upgrade from the given version is not allowed
-	 */
-	public static function needUpgrade(\OC\SystemConfig $config) {
-		if ($config->getValue('installed', false)) {
-			$installedVersion = $config->getValue('version', '0.0.0');
-			$currentVersion = implode('.', \OCP\Util::getVersion());
-			$versionDiff = version_compare($currentVersion, $installedVersion);
-			if ($versionDiff > 0) {
-				return true;
-			} else if ($config->getValue('debug', false) && $versionDiff < 0) {
-				// downgrade with debug
-				$installedMajor = explode('.', $installedVersion);
-				$installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
-				$currentMajor = explode('.', $currentVersion);
-				$currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
-				if ($installedMajor === $currentMajor) {
-					// Same major, allow downgrade for developers
-					return true;
-				} else {
-					// downgrade attempt, throw exception
-					throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
-				}
-			} else if ($versionDiff < 0) {
-				// downgrade attempt, throw exception
-				throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
-			}
-
-			// also check for upgrades for apps (independently from the user)
-			$apps = \OC_App::getEnabledApps(false, true);
-			$shouldUpgrade = false;
-			foreach ($apps as $app) {
-				if (\OC_App::shouldUpgrade($app)) {
-					$shouldUpgrade = true;
-					break;
-				}
-			}
-			return $shouldUpgrade;
-		} else {
-			return false;
-		}
-	}
+        return $content !== $testContent;
+    }
+
+    /**
+     * Check if the setlocal call does not work. This can happen if the right
+     * local packages are not available on the server.
+     *
+     * @return bool
+     */
+    public static function isSetLocaleWorking() {
+        \Patchwork\Utf8\Bootup::initLocale();
+        if ('' === basename('§')) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Check if it's possible to get the inline annotations
+     *
+     * @return bool
+     */
+    public static function isAnnotationsWorking() {
+        $reflection = new \ReflectionMethod(__METHOD__);
+        $docs = $reflection->getDocComment();
+
+        return (is_string($docs) && strlen($docs) > 50);
+    }
+
+    /**
+     * Check if the PHP module fileinfo is loaded.
+     *
+     * @return bool
+     */
+    public static function fileInfoLoaded() {
+        return function_exists('finfo_open');
+    }
+
+    /**
+     * clear all levels of output buffering
+     *
+     * @return void
+     */
+    public static function obEnd() {
+        while (ob_get_level()) {
+            ob_end_clean();
+        }
+    }
+
+    /**
+     * Checks whether the server is running on Mac OS X
+     *
+     * @return bool true if running on Mac OS X, false otherwise
+     */
+    public static function runningOnMac() {
+        return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
+    }
+
+    /**
+     * Checks whether server is running on HHVM
+     *
+     * @return bool True if running on HHVM, false otherwise
+     */
+    public static function runningOnHhvm() {
+        return defined('HHVM_VERSION');
+    }
+
+    /**
+     * Handles the case that there may not be a theme, then check if a "default"
+     * theme exists and take that one
+     *
+     * @return string the theme
+     */
+    public static function getTheme() {
+        $theme = \OC::$server->getSystemConfig()->getValue("theme", '');
+
+        if ($theme === '') {
+            if (is_dir(OC::$SERVERROOT . '/themes/default')) {
+                $theme = 'default';
+            }
+        }
+
+        return $theme;
+    }
+
+    /**
+     * Clear a single file from the opcode cache
+     * This is useful for writing to the config file
+     * in case the opcode cache does not re-validate files
+     * Returns true if successful, false if unsuccessful:
+     * caller should fall back on clearing the entire cache
+     * with clearOpcodeCache() if unsuccessful
+     *
+     * @param string $path the path of the file to clear from the cache
+     * @return bool true if underlying function returns true, otherwise false
+     */
+    public static function deleteFromOpcodeCache($path) {
+        $ret = false;
+        if ($path) {
+            // APC >= 3.1.1
+            if (function_exists('apc_delete_file')) {
+                $ret = @apc_delete_file($path);
+            }
+            // Zend OpCache >= 7.0.0, PHP >= 5.5.0
+            if (function_exists('opcache_invalidate')) {
+                $ret = opcache_invalidate($path);
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Clear the opcode cache if one exists
+     * This is necessary for writing to the config file
+     * in case the opcode cache does not re-validate files
+     *
+     * @return void
+     * @suppress PhanDeprecatedFunction
+     * @suppress PhanUndeclaredConstant
+     */
+    public static function clearOpcodeCache() {
+        // APC
+        if (function_exists('apc_clear_cache')) {
+            apc_clear_cache();
+        }
+        // Zend Opcache
+        if (function_exists('accelerator_reset')) {
+            accelerator_reset();
+        }
+        // XCache
+        if (function_exists('xcache_clear_cache')) {
+            if (\OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
+                \OCP\Util::writeLog('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', ILogger::WARN);
+            } else {
+                @xcache_clear_cache(XC_TYPE_PHP, 0);
+            }
+        }
+        // Opcache (PHP >= 5.5)
+        if (function_exists('opcache_reset')) {
+            opcache_reset();
+        }
+    }
+
+    /**
+     * Normalize a unicode string
+     *
+     * @param string $value a not normalized string
+     * @return bool|string
+     */
+    public static function normalizeUnicode($value) {
+        if(Normalizer::isNormalized($value)) {
+            return $value;
+        }
+
+        $normalizedValue = Normalizer::normalize($value);
+        if ($normalizedValue === null || $normalizedValue === false) {
+            \OC::$server->getLogger()->warning('normalizing failed for "' . $value . '"', ['app' => 'core']);
+            return $value;
+        }
+
+        return $normalizedValue;
+    }
+
+    /**
+     * A human readable string is generated based on version and build number
+     *
+     * @return string
+     */
+    public static function getHumanVersion() {
+        $version = OC_Util::getVersionString();
+        $build = OC_Util::getBuild();
+        if (!empty($build) and OC_Util::getChannel() === 'daily') {
+            $version .= ' Build:' . $build;
+        }
+        return $version;
+    }
+
+    /**
+     * Returns whether the given file name is valid
+     *
+     * @param string $file file name to check
+     * @return bool true if the file name is valid, false otherwise
+     * @deprecated use \OC\Files\View::verifyPath()
+     */
+    public static function isValidFileName($file) {
+        $trimmed = trim($file);
+        if ($trimmed === '') {
+            return false;
+        }
+        if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
+            return false;
+        }
+
+        // detect part files
+        if (preg_match('/' . \OCP\Files\FileInfo::BLACKLIST_FILES_REGEX . '/', $trimmed) !== 0) {
+            return false;
+        }
+
+        foreach (str_split($trimmed) as $char) {
+            if (strpos(\OCP\Constants::FILENAME_INVALID_CHARS, $char) !== false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check whether the instance needs to perform an upgrade,
+     * either when the core version is higher or any app requires
+     * an upgrade.
+     *
+     * @param \OC\SystemConfig $config
+     * @return bool whether the core or any app needs an upgrade
+     * @throws \OC\HintException When the upgrade from the given version is not allowed
+     */
+    public static function needUpgrade(\OC\SystemConfig $config) {
+        if ($config->getValue('installed', false)) {
+            $installedVersion = $config->getValue('version', '0.0.0');
+            $currentVersion = implode('.', \OCP\Util::getVersion());
+            $versionDiff = version_compare($currentVersion, $installedVersion);
+            if ($versionDiff > 0) {
+                return true;
+            } else if ($config->getValue('debug', false) && $versionDiff < 0) {
+                // downgrade with debug
+                $installedMajor = explode('.', $installedVersion);
+                $installedMajor = $installedMajor[0] . '.' . $installedMajor[1];
+                $currentMajor = explode('.', $currentVersion);
+                $currentMajor = $currentMajor[0] . '.' . $currentMajor[1];
+                if ($installedMajor === $currentMajor) {
+                    // Same major, allow downgrade for developers
+                    return true;
+                } else {
+                    // downgrade attempt, throw exception
+                    throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+                }
+            } else if ($versionDiff < 0) {
+                // downgrade attempt, throw exception
+                throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
+            }
+
+            // also check for upgrades for apps (independently from the user)
+            $apps = \OC_App::getEnabledApps(false, true);
+            $shouldUpgrade = false;
+            foreach ($apps as $app) {
+                if (\OC_App::shouldUpgrade($app)) {
+                    $shouldUpgrade = true;
+                    break;
+                }
+            }
+            return $shouldUpgrade;
+        } else {
+            return false;
+        }
+    }
 
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

Indentation +158 added lines, -158 removed lines

@@ -39,162 +39,162 @@
 use OCP\Util;
 
 abstract class Fetcher {
-	const INVALIDATE_AFTER_SECONDS = 300;
-
-	/** @var IAppData */
-	protected $appData;
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IConfig */
-	protected $config;
-	/** @var Ilogger */
-	protected $logger;
-	/** @var string */
-	protected $fileName;
-	/** @var string */
-	protected $endpointUrl;
-	/** @var string */
-	protected $version;
-
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								ILogger $logger) {
-		$this->appData = $appDataFactory->get('appstore');
-		$this->clientService = $clientService;
-		$this->timeFactory = $timeFactory;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Fetches the response from the server
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-
-		if (!$appstoreenabled) {
-			return [];
-		}
-
-		$options = [
-			'timeout' => 10,
-		];
-
-		if ($ETag !== '') {
-			$options['headers'] = [
-				'If-None-Match' => $ETag,
-			];
-		}
-
-		$client = $this->clientService->newClient();
-		$response = $client->get($this->endpointUrl, $options);
-
-		$responseJson = [];
-		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
-			$responseJson['data'] = json_decode($content, true);
-		} else {
-			$responseJson['data'] = json_decode($response->getBody(), true);
-			$ETag = $response->getHeader('ETag');
-		}
-
-		$responseJson['timestamp'] = $this->timeFactory->getTime();
-		$responseJson['ncversion'] = $this->getVersion();
-		if ($ETag !== '') {
-			$responseJson['ETag'] = $ETag;
-		}
-
-		return $responseJson;
-	}
-
-	/**
-	 * Returns the array with the categories on the appstore server
-	 *
-	 * @return array
-	 */
-	public function get() {
-		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
-		$internetavailable = $this->config->getSystemValue('has_internet_connection', true);
-
-		if (!$appstoreenabled || !$internetavailable) {
-			return [];
-		}
-
-		$rootFolder = $this->appData->getFolder('/');
-
-		$ETag = '';
-		$content = '';
-
-		try {
-			// File does already exists
-			$file = $rootFolder->getFile($this->fileName);
-			$jsonBlob = json_decode($file->getContent(), true);
-			if (is_array($jsonBlob)) {
-
-				// No caching when the version has been updated
-				if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
-
-					// If the timestamp is older than 300 seconds request the files new
-					if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
-						return $jsonBlob['data'];
-					}
-
-					if (isset($jsonBlob['ETag'])) {
-						$ETag = $jsonBlob['ETag'];
-						$content = json_encode($jsonBlob['data']);
-					}
-				}
-			}
-		} catch (NotFoundException $e) {
-			// File does not already exists
-			$file = $rootFolder->newFile($this->fileName);
-		}
-
-		// Refresh the file content
-		try {
-			$responseJson = $this->fetch($ETag, $content);
-			$file->putContent(json_encode($responseJson));
-			return json_decode($file->getContent(), true)['data'];
-		} catch (ConnectException $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
-			return [];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
-			return [];
-		}
-	}
-
-	/**
-	 * Get the currently Nextcloud version
-	 * @return string
-	 */
-	protected function getVersion() {
-		if ($this->version === null) {
-			$this->version = $this->config->getSystemValue('version', '0.0.0');
-		}
-		return $this->version;
-	}
-
-	/**
-	 * Set the current Nextcloud version
-	 * @param string $version
-	 */
-	public function setVersion(string $version) {
-		$this->version = $version;
-	}
+    const INVALIDATE_AFTER_SECONDS = 300;
+
+    /** @var IAppData */
+    protected $appData;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var Ilogger */
+    protected $logger;
+    /** @var string */
+    protected $fileName;
+    /** @var string */
+    protected $endpointUrl;
+    /** @var string */
+    protected $version;
+
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                ILogger $logger) {
+        $this->appData = $appDataFactory->get('appstore');
+        $this->clientService = $clientService;
+        $this->timeFactory = $timeFactory;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Fetches the response from the server
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+
+        if (!$appstoreenabled) {
+            return [];
+        }
+
+        $options = [
+            'timeout' => 10,
+        ];
+
+        if ($ETag !== '') {
+            $options['headers'] = [
+                'If-None-Match' => $ETag,
+            ];
+        }
+
+        $client = $this->clientService->newClient();
+        $response = $client->get($this->endpointUrl, $options);
+
+        $responseJson = [];
+        if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
+            $responseJson['data'] = json_decode($content, true);
+        } else {
+            $responseJson['data'] = json_decode($response->getBody(), true);
+            $ETag = $response->getHeader('ETag');
+        }
+
+        $responseJson['timestamp'] = $this->timeFactory->getTime();
+        $responseJson['ncversion'] = $this->getVersion();
+        if ($ETag !== '') {
+            $responseJson['ETag'] = $ETag;
+        }
+
+        return $responseJson;
+    }
+
+    /**
+     * Returns the array with the categories on the appstore server
+     *
+     * @return array
+     */
+    public function get() {
+        $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+        $internetavailable = $this->config->getSystemValue('has_internet_connection', true);
+
+        if (!$appstoreenabled || !$internetavailable) {
+            return [];
+        }
+
+        $rootFolder = $this->appData->getFolder('/');
+
+        $ETag = '';
+        $content = '';
+
+        try {
+            // File does already exists
+            $file = $rootFolder->getFile($this->fileName);
+            $jsonBlob = json_decode($file->getContent(), true);
+            if (is_array($jsonBlob)) {
+
+                // No caching when the version has been updated
+                if (isset($jsonBlob['ncversion']) && $jsonBlob['ncversion'] === $this->getVersion()) {
+
+                    // If the timestamp is older than 300 seconds request the files new
+                    if ((int)$jsonBlob['timestamp'] > ($this->timeFactory->getTime() - self::INVALIDATE_AFTER_SECONDS)) {
+                        return $jsonBlob['data'];
+                    }
+
+                    if (isset($jsonBlob['ETag'])) {
+                        $ETag = $jsonBlob['ETag'];
+                        $content = json_encode($jsonBlob['data']);
+                    }
+                }
+            }
+        } catch (NotFoundException $e) {
+            // File does not already exists
+            $file = $rootFolder->newFile($this->fileName);
+        }
+
+        // Refresh the file content
+        try {
+            $responseJson = $this->fetch($ETag, $content);
+            $file->putContent(json_encode($responseJson));
+            return json_decode($file->getContent(), true)['data'];
+        } catch (ConnectException $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO, 'message' => 'Could not connect to appstore']);
+            return [];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::INFO]);
+            return [];
+        }
+    }
+
+    /**
+     * Get the currently Nextcloud version
+     * @return string
+     */
+    protected function getVersion() {
+        if ($this->version === null) {
+            $this->version = $this->config->getSystemValue('version', '0.0.0');
+        }
+        return $this->version;
+    }
+
+    /**
+     * Set the current Nextcloud version
+     * @param string $version
+     */
+    public function setVersion(string $version) {
+        $this->version = $version;
+    }
 }

lib/private/App/AppStore/Fetcher/AppFetcher.php

Indentation +106 added lines, -106 removed lines

@@ -37,119 +37,119 @@
 
 class AppFetcher extends Fetcher {
 
-	/** @var CompareVersion */
-	private $compareVersion;
+    /** @var CompareVersion */
+    private $compareVersion;
 
-	/**
-	 * @param Factory $appDataFactory
-	 * @param IClientService $clientService
-	 * @param ITimeFactory $timeFactory
-	 * @param IConfig $config
-	 * @param CompareVersion $compareVersion
-	 * @param ILogger $logger
-	 */
-	public function __construct(Factory $appDataFactory,
-								IClientService $clientService,
-								ITimeFactory $timeFactory,
-								IConfig $config,
-								CompareVersion $compareVersion,
-								ILogger $logger) {
-		parent::__construct(
-			$appDataFactory,
-			$clientService,
-			$timeFactory,
-			$config,
-			$logger
-		);
+    /**
+     * @param Factory $appDataFactory
+     * @param IClientService $clientService
+     * @param ITimeFactory $timeFactory
+     * @param IConfig $config
+     * @param CompareVersion $compareVersion
+     * @param ILogger $logger
+     */
+    public function __construct(Factory $appDataFactory,
+                                IClientService $clientService,
+                                ITimeFactory $timeFactory,
+                                IConfig $config,
+                                CompareVersion $compareVersion,
+                                ILogger $logger) {
+        parent::__construct(
+            $appDataFactory,
+            $clientService,
+            $timeFactory,
+            $config,
+            $logger
+        );
 
-		$this->fileName = 'apps.json';
-		$this->setEndpoint();
-		$this->compareVersion = $compareVersion;
-	}
+        $this->fileName = 'apps.json';
+        $this->setEndpoint();
+        $this->compareVersion = $compareVersion;
+    }
 
-	/**
-	 * Only returns the latest compatible app release in the releases array
-	 *
-	 * @param string $ETag
-	 * @param string $content
-	 *
-	 * @return array
-	 */
-	protected function fetch($ETag, $content) {
-		/** @var mixed[] $response */
-		$response = parent::fetch($ETag, $content);
+    /**
+     * Only returns the latest compatible app release in the releases array
+     *
+     * @param string $ETag
+     * @param string $content
+     *
+     * @return array
+     */
+    protected function fetch($ETag, $content) {
+        /** @var mixed[] $response */
+        $response = parent::fetch($ETag, $content);
 
-		foreach($response['data'] as $dataKey => $app) {
-			$releases = [];
+        foreach($response['data'] as $dataKey => $app) {
+            $releases = [];
 
-			// Filter all compatible releases
-			foreach($app['releases'] as $release) {
-				// Exclude all nightly and pre-releases
-				if($release['isNightly'] === false
-					&& strpos($release['version'], '-') === false) {
-					// Exclude all versions not compatible with the current version
-					try {
-						$versionParser = new VersionParser();
-						$version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
-						$ncVersion = $this->getVersion();
-						$min = $version->getMinimumVersion();
-						$max = $version->getMaximumVersion();
-						$minFulfilled = $this->compareVersion->isCompatible($ncVersion, $min, '>=');
-						$maxFulfilled = $max !== '' &&
-							$this->compareVersion->isCompatible($ncVersion, $max, '<=');
-						if ($minFulfilled && $maxFulfilled) {
-							$releases[] = $release;
-						}
-					} catch (\InvalidArgumentException $e) {
-						$this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
-					}
-				}
-			}
+            // Filter all compatible releases
+            foreach($app['releases'] as $release) {
+                // Exclude all nightly and pre-releases
+                if($release['isNightly'] === false
+                    && strpos($release['version'], '-') === false) {
+                    // Exclude all versions not compatible with the current version
+                    try {
+                        $versionParser = new VersionParser();
+                        $version = $versionParser->getVersion($release['rawPlatformVersionSpec']);
+                        $ncVersion = $this->getVersion();
+                        $min = $version->getMinimumVersion();
+                        $max = $version->getMaximumVersion();
+                        $minFulfilled = $this->compareVersion->isCompatible($ncVersion, $min, '>=');
+                        $maxFulfilled = $max !== '' &&
+                            $this->compareVersion->isCompatible($ncVersion, $max, '<=');
+                        if ($minFulfilled && $maxFulfilled) {
+                            $releases[] = $release;
+                        }
+                    } catch (\InvalidArgumentException $e) {
+                        $this->logger->logException($e, ['app' => 'appstoreFetcher', 'level' => ILogger::WARN]);
+                    }
+                }
+            }
 
-			// Get the highest version
-			$versions = [];
-			foreach($releases as $release) {
-				$versions[] = $release['version'];
-			}
-			usort($versions, 'version_compare');
-			$versions = array_reverse($versions);
-			$compatible = false;
-			if(isset($versions[0])) {
-				$highestVersion = $versions[0];
-				foreach ($releases as $release) {
-					if ((string)$release['version'] === (string)$highestVersion) {
-						$compatible = true;
-						$response['data'][$dataKey]['releases'] = [$release];
-						break;
-					}
-				}
-			}
-			if(!$compatible) {
-				unset($response['data'][$dataKey]);
-			}
-		}
+            // Get the highest version
+            $versions = [];
+            foreach($releases as $release) {
+                $versions[] = $release['version'];
+            }
+            usort($versions, 'version_compare');
+            $versions = array_reverse($versions);
+            $compatible = false;
+            if(isset($versions[0])) {
+                $highestVersion = $versions[0];
+                foreach ($releases as $release) {
+                    if ((string)$release['version'] === (string)$highestVersion) {
+                        $compatible = true;
+                        $response['data'][$dataKey]['releases'] = [$release];
+                        break;
+                    }
+                }
+            }
+            if(!$compatible) {
+                unset($response['data'][$dataKey]);
+            }
+        }
 
-		$response['data'] = array_values($response['data']);
-		return $response;
-	}
+        $response['data'] = array_values($response['data']);
+        return $response;
+    }
 
-	private function setEndpoint() {
-		$versionArray = explode('.', $this->getVersion());
-		$this->endpointUrl = sprintf(
-			'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
-			$versionArray[0],
-			$versionArray[1],
-			$versionArray[2]
-		);
-	}
+    private function setEndpoint() {
+        $versionArray = explode('.', $this->getVersion());
+        $this->endpointUrl = sprintf(
+            'https://apps.nextcloud.com/api/v1/platform/%d.%d.%d/apps.json',
+            $versionArray[0],
+            $versionArray[1],
+            $versionArray[2]
+        );
+    }
 
-	/**
-	 * @param string $version
-	 * @param string $fileName
-	 */
-	public function setVersion(string $version, string $fileName = 'apps.json') {
-		parent::setVersion($version);
-		$this->fileName = $fileName;
-		$this->setEndpoint();
-	}
+    /**
+     * @param string $version
+     * @param string $fileName
+     */
+    public function setVersion(string $version, string $fileName = 'apps.json') {
+        parent::setVersion($version);
+        $this->fileName = $fileName;
+        $this->setEndpoint();
+    }
 }

lib/private/Settings/Manager.php

Indentation +352 added lines, -352 removed lines

@@ -49,356 +49,356 @@
 use OCP\Util;
 
 class Manager implements IManager {
-	/** @var ILogger */
-	private $log;
-	/** @var IDBConnection */
-	private $dbc;
-	/** @var IL10N */
-	private $l;
-	/** @var IConfig */
-	private $config;
-	/** @var EncryptionManager */
-	private $encryptionManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IRequest */
-	private $request;
-	/** @var IURLGenerator */
-	private $url;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * @param ILogger $log
-	 * @param IDBConnection $dbc
-	 * @param IL10N $l
-	 * @param IConfig $config
-	 * @param EncryptionManager $encryptionManager
-	 * @param IUserManager $userManager
-	 * @param ILockingProvider $lockingProvider
-	 * @param IRequest $request
-	 * @param IURLGenerator $url
-	 * @param AccountManager $accountManager
-	 * @param IGroupManager $groupManager
-	 * @param IFactory $l10nFactory
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		ILogger $log,
-		IDBConnection $dbc,
-		IL10N $l,
-		IConfig $config,
-		EncryptionManager $encryptionManager,
-		IUserManager $userManager,
-		ILockingProvider $lockingProvider,
-		IRequest $request,
-		IURLGenerator $url,
-		AccountManager $accountManager,
-		IGroupManager $groupManager,
-		IFactory $l10nFactory,
-		IAppManager $appManager
-	) {
-		$this->log = $log;
-		$this->dbc = $dbc;
-		$this->l = $l;
-		$this->config = $config;
-		$this->encryptionManager = $encryptionManager;
-		$this->userManager = $userManager;
-		$this->lockingProvider = $lockingProvider;
-		$this->request = $request;
-		$this->url = $url;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->appManager = $appManager;
-	}
-
-	/** @var array */
-	protected $sectionClasses = [];
-
-	/** @var array */
-	protected $sections = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section Class must implement OCP\Settings\ISection
-	 * @return void
-	 */
-	public function registerSection(string $type, string $section) {
-		$this->sectionClasses[$section] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @return ISection[]
-	 */
-	protected function getSections(string $type): array {
-		if (!isset($this->sections[$type])) {
-			$this->sections[$type] = [];
-		}
-
-		foreach ($this->sectionClasses as $class => $sectionType) {
-			try {
-				/** @var ISection $section */
-				$section = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$section instanceof ISection) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			$this->sections[$sectionType][$section->getID()] = $section;
-
-			unset($this->sectionClasses[$class]);
-		}
-
-		return $this->sections[$type];
-	}
-
-	/** @var array */
-	protected $settingClasses = [];
-
-	/** @var array */
-	protected $settings = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $setting Class must implement OCP\Settings\ISetting
-	 * @return void
-	 */
-	public function registerSetting(string $type, string $setting) {
-		$this->settingClasses[$setting] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section
-	 * @return ISettings[]
-	 */
-	protected function getSettings(string $type, string $section): array {
-		if (!isset($this->settings[$type])) {
-			$this->settings[$type] = [];
-		}
-		if (!isset($this->settings[$type][$section])) {
-			$this->settings[$type][$section] = [];
-		}
-
-		foreach ($this->settingClasses as $class => $settingsType) {
-			try {
-				/** @var ISettings $setting */
-				$setting = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$setting instanceof ISettings) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!isset($this->settings[$settingsType][$setting->getSection()])) {
-				$this->settings[$settingsType][$setting->getSection()] = [];
-			}
-			$this->settings[$settingsType][$setting->getSection()][] = $setting;
-
-			unset($this->settingClasses[$class]);
-		}
-
-		return $this->settings[$type][$section];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections(): array {
-		// built-in sections
-		$sections = [
-			0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
-			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
-			10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
-		];
-
-		$appSections = $this->getSections('admin');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInAdminSettings($section): array {
-		$forms = [];
-
-		if ($section === 'server') {
-			/** @var ISettings $form */
-			$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
-			$forms[$form->getPriority()] = [$form];
-			$form = new Admin\ServerDevNotice();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'encryption') {
-			/** @var ISettings $form */
-			$form = new Admin\Encryption($this->encryptionManager, $this->userManager);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'sharing') {
-			/** @var ISettings $form */
-			$form = new Admin\Sharing($this->config, $this->l);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Admin\Additional($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'tips-tricks') {
-			/** @var ISettings $form */
-			$form = new Admin\TipsTricks($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @param string $section
-	 * @return ISection[]
-	 */
-	private function getBuiltInPersonalSettings($section): array {
-		$forms = [];
-
-		if ($section === 'personal-info') {
-			/** @var ISettings $form */
-			$form = new Personal\PersonalInfo(
-				$this->config,
-				$this->userManager,
-				$this->groupManager,
-				$this->accountManager,
-				$this->appManager,
-				$this->l10nFactory,
-				$this->l
-			);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if($section === 'security') {
-			/** @var ISettings $form */
-			$form = new Personal\Security();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Personal\Additional();
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings($section): array {
-		$settings = $this->getBuiltInAdminSettings($section);
-		$appSettings = $this->getSettings('admin', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections(): array {
-		$sections = [
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
-			5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
-			15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
-		];
-
-		$legacyForms = \OC_App::getForms('personal');
-		if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
-			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
-		}
-
-		$appSections = $this->getSections('personal');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string[] $forms
-	 * @return bool
-	 */
-	private function hasLegacyPersonalSettingsToRender(array $forms): bool {
-		foreach ($forms as $form) {
-			if(trim($form) !== '') {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings($section): array {
-		$settings = $this->getBuiltInPersonalSettings($section);
-		$appSettings = $this->getSettings('personal', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
+    /** @var ILogger */
+    private $log;
+    /** @var IDBConnection */
+    private $dbc;
+    /** @var IL10N */
+    private $l;
+    /** @var IConfig */
+    private $config;
+    /** @var EncryptionManager */
+    private $encryptionManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IRequest */
+    private $request;
+    /** @var IURLGenerator */
+    private $url;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * @param ILogger $log
+     * @param IDBConnection $dbc
+     * @param IL10N $l
+     * @param IConfig $config
+     * @param EncryptionManager $encryptionManager
+     * @param IUserManager $userManager
+     * @param ILockingProvider $lockingProvider
+     * @param IRequest $request
+     * @param IURLGenerator $url
+     * @param AccountManager $accountManager
+     * @param IGroupManager $groupManager
+     * @param IFactory $l10nFactory
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        ILogger $log,
+        IDBConnection $dbc,
+        IL10N $l,
+        IConfig $config,
+        EncryptionManager $encryptionManager,
+        IUserManager $userManager,
+        ILockingProvider $lockingProvider,
+        IRequest $request,
+        IURLGenerator $url,
+        AccountManager $accountManager,
+        IGroupManager $groupManager,
+        IFactory $l10nFactory,
+        IAppManager $appManager
+    ) {
+        $this->log = $log;
+        $this->dbc = $dbc;
+        $this->l = $l;
+        $this->config = $config;
+        $this->encryptionManager = $encryptionManager;
+        $this->userManager = $userManager;
+        $this->lockingProvider = $lockingProvider;
+        $this->request = $request;
+        $this->url = $url;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->appManager = $appManager;
+    }
+
+    /** @var array */
+    protected $sectionClasses = [];
+
+    /** @var array */
+    protected $sections = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section Class must implement OCP\Settings\ISection
+     * @return void
+     */
+    public function registerSection(string $type, string $section) {
+        $this->sectionClasses[$section] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @return ISection[]
+     */
+    protected function getSections(string $type): array {
+        if (!isset($this->sections[$type])) {
+            $this->sections[$type] = [];
+        }
+
+        foreach ($this->sectionClasses as $class => $sectionType) {
+            try {
+                /** @var ISection $section */
+                $section = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$section instanceof ISection) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            $this->sections[$sectionType][$section->getID()] = $section;
+
+            unset($this->sectionClasses[$class]);
+        }
+
+        return $this->sections[$type];
+    }
+
+    /** @var array */
+    protected $settingClasses = [];
+
+    /** @var array */
+    protected $settings = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $setting Class must implement OCP\Settings\ISetting
+     * @return void
+     */
+    public function registerSetting(string $type, string $setting) {
+        $this->settingClasses[$setting] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section
+     * @return ISettings[]
+     */
+    protected function getSettings(string $type, string $section): array {
+        if (!isset($this->settings[$type])) {
+            $this->settings[$type] = [];
+        }
+        if (!isset($this->settings[$type][$section])) {
+            $this->settings[$type][$section] = [];
+        }
+
+        foreach ($this->settingClasses as $class => $settingsType) {
+            try {
+                /** @var ISettings $setting */
+                $setting = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$setting instanceof ISettings) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!isset($this->settings[$settingsType][$setting->getSection()])) {
+                $this->settings[$settingsType][$setting->getSection()] = [];
+            }
+            $this->settings[$settingsType][$setting->getSection()][] = $setting;
+
+            unset($this->settingClasses[$class]);
+        }
+
+        return $this->settings[$type][$section];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections(): array {
+        // built-in sections
+        $sections = [
+            0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+            5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
+            10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+            99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
+        ];
+
+        $appSections = $this->getSections('admin');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInAdminSettings($section): array {
+        $forms = [];
+
+        if ($section === 'server') {
+            /** @var ISettings $form */
+            $form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
+            $forms[$form->getPriority()] = [$form];
+            $form = new Admin\ServerDevNotice();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'encryption') {
+            /** @var ISettings $form */
+            $form = new Admin\Encryption($this->encryptionManager, $this->userManager);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'sharing') {
+            /** @var ISettings $form */
+            $form = new Admin\Sharing($this->config, $this->l);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = new Admin\Additional($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'tips-tricks') {
+            /** @var ISettings $form */
+            $form = new Admin\TipsTricks($this->config);
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @param string $section
+     * @return ISection[]
+     */
+    private function getBuiltInPersonalSettings($section): array {
+        $forms = [];
+
+        if ($section === 'personal-info') {
+            /** @var ISettings $form */
+            $form = new Personal\PersonalInfo(
+                $this->config,
+                $this->userManager,
+                $this->groupManager,
+                $this->accountManager,
+                $this->appManager,
+                $this->l10nFactory,
+                $this->l
+            );
+            $forms[$form->getPriority()] = [$form];
+        }
+        if($section === 'security') {
+            /** @var ISettings $form */
+            $form = new Personal\Security();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = new Personal\Additional();
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings($section): array {
+        $settings = $this->getBuiltInAdminSettings($section);
+        $appSettings = $this->getSettings('admin', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections(): array {
+        $sections = [
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
+            5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
+            15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
+        ];
+
+        $legacyForms = \OC_App::getForms('personal');
+        if(!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+            $sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
+        }
+
+        $appSections = $this->getSections('personal');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string[] $forms
+     * @return bool
+     */
+    private function hasLegacyPersonalSettingsToRender(array $forms): bool {
+        foreach ($forms as $form) {
+            if(trim($form) !== '') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings($section): array {
+        $settings = $this->getBuiltInPersonalSettings($section);
+        $appSettings = $this->getSettings('personal', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
 }

lib/private/CapabilitiesManager.php

Indentation +47 added lines, -47 removed lines

@@ -32,58 +32,58 @@
 
 class CapabilitiesManager {
 
-	/** @var \Closure[] */
-	private $capabilities = array();
+    /** @var \Closure[] */
+    private $capabilities = array();
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Get an array of al the capabilities that are registered at this manager
+    /**
+     * Get an array of al the capabilities that are registered at this manager
      *
-	 * @param bool $public get public capabilities only
-	 * @throws \InvalidArgumentException
-	 * @return array
-	 */
-	public function getCapabilities(bool $public = false) : array {
-		$capabilities = [];
-		foreach($this->capabilities as $capability) {
-			try {
-				$c = $capability();
-			} catch (QueryException $e) {
-				$this->logger->logException($e, [
-					'message' => 'CapabilitiesManager',
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-				continue;
-			}
+     * @param bool $public get public capabilities only
+     * @throws \InvalidArgumentException
+     * @return array
+     */
+    public function getCapabilities(bool $public = false) : array {
+        $capabilities = [];
+        foreach($this->capabilities as $capability) {
+            try {
+                $c = $capability();
+            } catch (QueryException $e) {
+                $this->logger->logException($e, [
+                    'message' => 'CapabilitiesManager',
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+                continue;
+            }
 
-			if ($c instanceof ICapability) {
-				if(!$public || $c instanceof IPublicCapability) {
-					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
-				}
-			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
-			}
-		}
+            if ($c instanceof ICapability) {
+                if(!$public || $c instanceof IPublicCapability) {
+                    $capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
+                }
+            } else {
+                throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+            }
+        }
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * capabilities are actually requested
-	 *
-	 * $callable has to return an instance of OCP\Capabilities\ICapability
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerCapability(\Closure $callable) {
-		$this->capabilities[] = $callable;
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * capabilities are actually requested
+     *
+     * $callable has to return an instance of OCP\Capabilities\ICapability
+     *
+     * @param \Closure $callable
+     */
+    public function registerCapability(\Closure $callable) {
+        $this->capabilities[] = $callable;
+    }
 }

lib/private/Files/ObjectStore/S3ConnectionTrait.php

Indentation +112 added lines, -112 removed lines

@@ -30,116 +30,116 @@
 use OCP\ILogger;
 
 trait S3ConnectionTrait {
-	/** @var array */
-	protected $params;
-
-	/** @var S3Client */
-	protected $connection;
-
-	/** @var string */
-	protected $id;
-
-	/** @var string */
-	protected $bucket;
-
-	/** @var int */
-	protected $timeout;
-
-	protected $test;
-
-	protected function parseParams($params) {
-		if (empty($params['key']) || empty($params['secret']) || empty($params['bucket'])) {
-			throw new \Exception("Access Key, Secret and Bucket have to be configured.");
-		}
-
-		$this->id = 'amazon::' . $params['bucket'];
-
-		$this->test = isset($params['test']);
-		$this->bucket = $params['bucket'];
-		$this->timeout = !isset($params['timeout']) ? 15 : $params['timeout'];
-		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
-		$params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
-		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
-		}
-		$this->params = $params;
-	}
-
-
-	/**
-	 * Returns the connection
-	 *
-	 * @return S3Client connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	protected function getConnection() {
-		if (!is_null($this->connection)) {
-			return $this->connection;
-		}
-
-		$scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
-		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
-
-		$options = [
-			'version' => isset($this->params['version']) ? $this->params['version'] : 'latest',
-			'credentials' => [
-				'key' => $this->params['key'],
-				'secret' => $this->params['secret'],
-			],
-			'endpoint' => $base_url,
-			'region' => $this->params['region'],
-			'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
-			'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())
-		];
-		if (isset($this->params['proxy'])) {
-			$options['request.options'] = ['proxy' => $this->params['proxy']];
-		}
-		if (isset($this->params['legacy_auth']) && $this->params['legacy_auth']) {
-			$options['signature_version'] = 'v2';
-		}
-		$this->connection = new S3Client($options);
-
-		if (!$this->connection->isBucketDnsCompatible($this->bucket)) {
-			throw new \Exception("The configured bucket name is invalid: " . $this->bucket);
-		}
-
-		if (!$this->connection->doesBucketExist($this->bucket)) {
-			$logger = \OC::$server->getLogger();
-			try {
-				$logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
-				$this->connection->createBucket(array(
-					'Bucket' => $this->bucket
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				$logger->logException($e, [
-					'message' => 'Invalid remote storage.',
-					'level' => ILogger::DEBUG,
-					'app' => 'objectstore',
-				]);
-				throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
-			}
-		}
-
-		return $this->connection;
-	}
-
-	/**
-	 * when running the tests wait to let the buckets catch up
-	 */
-	private function testTimeout() {
-		if ($this->test) {
-			sleep($this->timeout);
-		}
-	}
-
-	public static function legacySignatureProvider($version, $service, $region) {
-		switch ($version) {
-			case 'v2':
-			case 's3':
-				return new S3Signature();
-			default:
-				return null;
-		}
-	}
+    /** @var array */
+    protected $params;
+
+    /** @var S3Client */
+    protected $connection;
+
+    /** @var string */
+    protected $id;
+
+    /** @var string */
+    protected $bucket;
+
+    /** @var int */
+    protected $timeout;
+
+    protected $test;
+
+    protected function parseParams($params) {
+        if (empty($params['key']) || empty($params['secret']) || empty($params['bucket'])) {
+            throw new \Exception("Access Key, Secret and Bucket have to be configured.");
+        }
+
+        $this->id = 'amazon::' . $params['bucket'];
+
+        $this->test = isset($params['test']);
+        $this->bucket = $params['bucket'];
+        $this->timeout = !isset($params['timeout']) ? 15 : $params['timeout'];
+        $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
+        $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname'];
+        if (!isset($params['port']) || $params['port'] === '') {
+            $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443;
+        }
+        $this->params = $params;
+    }
+
+
+    /**
+     * Returns the connection
+     *
+     * @return S3Client connected client
+     * @throws \Exception if connection could not be made
+     */
+    protected function getConnection() {
+        if (!is_null($this->connection)) {
+            return $this->connection;
+        }
+
+        $scheme = (isset($this->params['use_ssl']) && $this->params['use_ssl'] === false) ? 'http' : 'https';
+        $base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+
+        $options = [
+            'version' => isset($this->params['version']) ? $this->params['version'] : 'latest',
+            'credentials' => [
+                'key' => $this->params['key'],
+                'secret' => $this->params['secret'],
+            ],
+            'endpoint' => $base_url,
+            'region' => $this->params['region'],
+            'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
+            'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider())
+        ];
+        if (isset($this->params['proxy'])) {
+            $options['request.options'] = ['proxy' => $this->params['proxy']];
+        }
+        if (isset($this->params['legacy_auth']) && $this->params['legacy_auth']) {
+            $options['signature_version'] = 'v2';
+        }
+        $this->connection = new S3Client($options);
+
+        if (!$this->connection->isBucketDnsCompatible($this->bucket)) {
+            throw new \Exception("The configured bucket name is invalid: " . $this->bucket);
+        }
+
+        if (!$this->connection->doesBucketExist($this->bucket)) {
+            $logger = \OC::$server->getLogger();
+            try {
+                $logger->info('Bucket "' . $this->bucket . '" does not exist - creating it.', ['app' => 'objectstore']);
+                $this->connection->createBucket(array(
+                    'Bucket' => $this->bucket
+                ));
+                $this->testTimeout();
+            } catch (S3Exception $e) {
+                $logger->logException($e, [
+                    'message' => 'Invalid remote storage.',
+                    'level' => ILogger::DEBUG,
+                    'app' => 'objectstore',
+                ]);
+                throw new \Exception('Creation of bucket "' . $this->bucket . '" failed. ' . $e->getMessage());
+            }
+        }
+
+        return $this->connection;
+    }
+
+    /**
+     * when running the tests wait to let the buckets catch up
+     */
+    private function testTimeout() {
+        if ($this->test) {
+            sleep($this->timeout);
+        }
+    }
+
+    public static function legacySignatureProvider($version, $service, $region) {
+        switch ($version) {
+            case 'v2':
+            case 's3':
+                return new S3Signature();
+            default:
+                return null;
+        }
+    }
 }