aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-11 23:16:27 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-04-11 23:16:27 -0500
commit1729e4471f41e560f78f6b7269bcdb73e24602d5 (patch)
treed9850ee89a893efd8f746c4bbc71b8c9eae9a55b /apps/files_external
parent6bd1c50dc32ccc208723ef08af72b8bfe99b58bb (diff)
downloadnextcloud-server-1729e4471f41e560f78f6b7269bcdb73e24602d5.tar.gz
nextcloud-server-1729e4471f41e560f78f6b7269bcdb73e24602d5.zip
Update comments to Nextcloud
* based on PR by @Ardinis * see #4311 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/files_external')
-rw-r--r--apps/files_external/appinfo/info.xml2
-rw-r--r--apps/files_external/lib/Lib/Storage/Google.php4
-rw-r--r--apps/files_external/lib/Lib/Storage/OwnCloud.php4
-rw-r--r--apps/files_external/tests/README.md2
-rw-r--r--apps/files_external/tests/Storage/OwncloudTest.php2
-rwxr-xr-xapps/files_external/tests/env/start-webdav-apache.sh4
-rwxr-xr-xapps/files_external/tests/env/start-webdav-ownCloud.sh6
7 files changed, 12 insertions, 12 deletions
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 3f6a48d2e22..74ad050d30e 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -3,7 +3,7 @@
<id>files_external</id>
<name>External storage support</name>
<description>
-This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
+This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
</description>
diff --git a/apps/files_external/lib/Lib/Storage/Google.php b/apps/files_external/lib/Lib/Storage/Google.php
index b22b0c29263..2211686055e 100644
--- a/apps/files_external/lib/Lib/Storage/Google.php
+++ b/apps/files_external/lib/Lib/Storage/Google.php
@@ -126,7 +126,7 @@ class Google extends \OC\Files\Storage\Common {
$q = "title='" . str_replace("'","\\'", $name) . "' and '" . str_replace("'","\\'", $parentId) . "' in parents and trashed = false";
$result = $this->service->files->listFiles(array('q' => $q))->getItems();
if (!empty($result)) {
- // Google Drive allows files with the same name, ownCloud doesn't
+ // Google Drive allows files with the same name, Nextcloud doesn't
if (count($result) > 1) {
$this->onDuplicateFileDetected($path);
return false;
@@ -294,7 +294,7 @@ class Google extends \OC\Files\Storage\Common {
} else {
$filepath = $path.'/'.$name;
}
- // Google Drive allows files with the same name, ownCloud doesn't
+ // Google Drive allows files with the same name, Nextcloud doesn't
// Prevent opendir() from returning any duplicate files
$key = array_search($name, $files);
if ($key !== false || isset($duplicates[$filepath])) {
diff --git a/apps/files_external/lib/Lib/Storage/OwnCloud.php b/apps/files_external/lib/Lib/Storage/OwnCloud.php
index 427b55a4a54..9669b5f3dad 100644
--- a/apps/files_external/lib/Lib/Storage/OwnCloud.php
+++ b/apps/files_external/lib/Lib/Storage/OwnCloud.php
@@ -26,9 +26,9 @@ namespace OCA\Files_External\Lib\Storage;
use Sabre\DAV\Client;
/**
- * ownCloud backend for external storage based on DAV backend.
+ * Nextcloud backend for external storage based on DAV backend.
*
- * The ownCloud URL consists of three parts:
+ * The Nextcloud URL consists of three parts:
* http://%host/%context/remote.php/webdav/%root
*
*/
diff --git a/apps/files_external/tests/README.md b/apps/files_external/tests/README.md
index 0b3c7fd004f..202ae8eee9a 100644
--- a/apps/files_external/tests/README.md
+++ b/apps/files_external/tests/README.md
@@ -20,7 +20,7 @@ freely.
## Hands-on way of unit test execution
-Run all files_external unit tests by invoking the following in the ownCloud
+Run all files_external unit tests by invoking the following in the Nextcloud
core root folder:
./autotest-external.sh
diff --git a/apps/files_external/tests/Storage/OwncloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php
index 45b5071d941..f1564304e2f 100644
--- a/apps/files_external/tests/Storage/OwncloudTest.php
+++ b/apps/files_external/tests/Storage/OwncloudTest.php
@@ -45,7 +45,7 @@ class OwncloudTest extends \Test\Files\Storage\Storage {
$id = $this->getUniqueID();
$this->config = include('files_external/tests/config.php');
if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
- $this->markTestSkipped('ownCloud backend not configured');
+ $this->markTestSkipped('Nextcloud backend not configured');
}
$this->config['owncloud']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
$this->instance = new OwnCloud($this->config['owncloud']);
diff --git a/apps/files_external/tests/env/start-webdav-apache.sh b/apps/files_external/tests/env/start-webdav-apache.sh
index 48acb8572d6..a5464c9cfab 100755
--- a/apps/files_external/tests/env/start-webdav-apache.sh
+++ b/apps/files_external/tests/env/start-webdav-apache.sh
@@ -6,7 +6,7 @@
# against. It will also change the files_external config to use the docker
# container as testing environment. This is reverted in the stop step.
#
-# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will
+# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will
# be set up using MySQL instead of SQLite.
#
# Set environment variable DEBUG to print config file
@@ -74,7 +74,7 @@ return array(
DELIM
-echo "ownCloud container: $container"
+echo "Nextcloud container: $container"
# put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
echo $container >> $thisFolder/dockerContainerWebdav.$EXECUTOR_NUMBER.webdav
diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh
index d992516d7b1..870bd5bcdf8 100755
--- a/apps/files_external/tests/env/start-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh
@@ -6,7 +6,7 @@
# against. It will also change the files_external config to use the docker
# container as testing environment. This is reverted in the stop step.
#
-# If the environment variable RUN_DOCKER_MYSQL is set the ownCloud will
+# If the environment variable RUN_DOCKER_MYSQL is set the Nextcloud will
# be set up using MySQL instead of SQLite.
#
# Set environment variable DEBUG to print config file
@@ -48,7 +48,7 @@ container=`docker run -P $parameter -d -e ADMINLOGIN=test -e ADMINPWD=test morri
host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container`
-echo -n "Waiting for ownCloud initialization"
+echo -n "Waiting for Nextcloud initialization"
if ! "$thisFolder"/env/wait-for-connection ${host} 80 60; then
echo "[ERROR] Waited 60 seconds, no response" >&2
exit 1
@@ -74,7 +74,7 @@ return array(
DELIM
-echo "ownCloud container: $container"
+echo "Nextcloud container: $container"
# put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
echo $container >> $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav