some text-changes to nextcloud
This commit is contained in:
parent
a83cbee717
commit
fa19e4c2eb
1 changed files with 13 additions and 13 deletions
26
lib/base.php
26
lib/base.php
|
@ -62,19 +62,19 @@ class OC {
|
|||
*/
|
||||
public static $CLASSPATH = array();
|
||||
/**
|
||||
* The installation path for owncloud on the server (e.g. /srv/http/owncloud)
|
||||
* The installation path for Nextcloud on the server (e.g. /srv/http/nextcloud)
|
||||
*/
|
||||
public static $SERVERROOT = '';
|
||||
/**
|
||||
* the current request path relative to the owncloud root (e.g. files/index.php)
|
||||
* the current request path relative to the Nextcloud root (e.g. files/index.php)
|
||||
*/
|
||||
private static $SUBURI = '';
|
||||
/**
|
||||
* the owncloud root path for http requests (e.g. owncloud/)
|
||||
* the Nextcloud root path for http requests (e.g. nextcloud/)
|
||||
*/
|
||||
public static $WEBROOT = '';
|
||||
/**
|
||||
* The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
|
||||
* The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
|
||||
* web path in 'url'
|
||||
*/
|
||||
public static $APPSROOTS = array();
|
||||
|
@ -90,7 +90,7 @@ class OC {
|
|||
public static $REQUESTEDAPP = '';
|
||||
|
||||
/**
|
||||
* check if ownCloud runs in cli mode
|
||||
* check if Nextcloud runs in cli mode
|
||||
*/
|
||||
public static $CLI = false;
|
||||
|
||||
|
@ -168,7 +168,7 @@ class OC {
|
|||
OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
|
||||
}
|
||||
|
||||
// Resolve /owncloud to /owncloud/ to ensure to always have a trailing
|
||||
// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
|
||||
// slash which is required by URL generation.
|
||||
if($_SERVER['REQUEST_URI'] === \OC::$WEBROOT &&
|
||||
substr($_SERVER['REQUEST_URI'], -1) !== '/') {
|
||||
|
@ -198,15 +198,15 @@ class OC {
|
|||
}
|
||||
|
||||
if (empty(OC::$APPSROOTS)) {
|
||||
throw new \RuntimeException('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
|
||||
throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
|
||||
. ' or the folder above. You can also configure the location in the config.php file.');
|
||||
}
|
||||
$paths = array();
|
||||
foreach (OC::$APPSROOTS as $path) {
|
||||
$paths[] = $path['path'];
|
||||
if (!is_dir($path['path'])) {
|
||||
throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the ownCloud apps folder in the'
|
||||
. ' ownCloud folder or the folder above. You can also configure the location in the'
|
||||
throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
|
||||
. ' Nextcloud folder or the folder above. You can also configure the location in the'
|
||||
. ' config.php file.', $path['path']));
|
||||
}
|
||||
}
|
||||
|
@ -357,7 +357,7 @@ class OC {
|
|||
|
||||
// render error page
|
||||
$template = new OC_Template('', 'update.use-cli', 'guest');
|
||||
$template->assign('productName', 'ownCloud'); // for now
|
||||
$template->assign('productName', 'owncloud'); // for now
|
||||
$template->assign('version', OC_Util::getVersionString());
|
||||
$template->assign('tooBig', $tooBig);
|
||||
|
||||
|
@ -397,7 +397,7 @@ class OC {
|
|||
// prevents javascript from accessing php session cookies
|
||||
ini_set('session.cookie_httponly', true);
|
||||
|
||||
// set the cookie path to the ownCloud directory
|
||||
// set the cookie path to the Nextcloud directory
|
||||
$cookie_path = OC::$WEBROOT ? : '/';
|
||||
ini_set('session.cookie_path', $cookie_path);
|
||||
|
||||
|
@ -462,7 +462,7 @@ class OC {
|
|||
}
|
||||
|
||||
/**
|
||||
* Try to set some values to the required ownCloud default
|
||||
* Try to set some values to the required Nextcloud default
|
||||
*/
|
||||
public static function setRequiredIniValues() {
|
||||
@ini_set('default_charset', 'UTF-8');
|
||||
|
@ -808,7 +808,7 @@ class OC {
|
|||
// in the routing files of each app
|
||||
OC::loadAppClassPaths();
|
||||
|
||||
// Check if ownCloud is installed or in maintenance (update) mode
|
||||
// Check if Nextcloud is installed or in maintenance (update) mode
|
||||
if (!$systemConfig->getValue('installed', false)) {
|
||||
\OC::$server->getSession()->clear();
|
||||
$setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(),
|
||||
|
|
Loading…
Reference in a new issue