Skip to content

Commit

Permalink
Merge pull request #197 from JSoko/master
Browse files Browse the repository at this point in the history
changed to nextcloud
  • Loading branch information
MorrisJobke committed Jun 22, 2016
2 parents ce923d7 + fa19e4c commit 4d4e579
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion core/doc/admin/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Here goes the admin documentation.
In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
In the meantime go to <a href="https://nextcloud.com/support/" target="_blank">nextcloud.com/support/</a>
2 changes: 1 addition & 1 deletion core/doc/user/index.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Here goes the user documentation
In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
In the meantime go to <a href="https://nextcloud.com/support/" target="_blank">nextcloud.com/support/</a>
26 changes: 13 additions & 13 deletions lib/base.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;

Expand Down Expand Up @@ -168,7 +168,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 @@ -198,15 +198,15 @@ public static function initPaths() {
}

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']));
}
}
Expand Down Expand Up @@ -357,7 +357,7 @@ private static function printUpgradePage() {

// 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);

Expand Down Expand Up @@ -397,7 +397,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 @@ -462,7 +462,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 @@ -808,7 +808,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

0 comments on commit 4d4e579

Please sign in to comment.