Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable9] some text-changes to nextcloud #200

Merged
merged 1 commit into from
Jun 22, 2016
Merged

[stable9] some text-changes to nextcloud #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,27 @@ 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 of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
* The installation path of the 3rdparty folder on the server (e.g. /srv/http/nextcloud/3rdparty)
*/
public static $THIRDPARTYROOT = '';
/**
* the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
* the root path of the 3rdparty folder for http requests (e.g. nextcloud/3rdparty)
*/
public static $THIRDPARTYWEBROOT = '';
/**
* 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();
Expand All @@ -99,7 +99,7 @@ class OC {
public static $REQUESTEDAPP = '';

/**
* check if ownCloud runs in cli mode
* check if Nextcloud runs in cli mode
*/
public static $CLI = false;

Expand Down Expand Up @@ -174,7 +174,7 @@ public static function initPaths() {
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) !== '/') {
Expand Down Expand Up @@ -408,7 +408,7 @@ public static function initSession() {
// 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);

Expand Down Expand Up @@ -473,7 +473,7 @@ public static function loadAppClassPaths() {
}

/**
* 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');
Expand Down Expand Up @@ -890,7 +890,7 @@ public static function handleRequest() {
// 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(),
Expand Down