Resolved conflict in view/it/hstrings.php

1 files changed, 10 insertions, 10 deletions

diff --git a/mod/cloud.php b/mod/cloud.php
index 67fc199bf..eed941ff7 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -7,7 +7,7 @@
  */
 
 use Sabre\DAV;
-use RedMatrix\RedDAV;
+use Zotlabs\Storage;
 
 // composer autoloader for SabreDAV
 require_once('vendor/autoload.php');
@@ -30,18 +30,18 @@ function cloud_init(&$a) {
 
 	$profile = 0;
 
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which . '" />' . "\r\n";
+	App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n";
 
 	if ($which)
 		profile_load($a, $which, $profile);
 
-	$auth = new RedDAV\RedBasicAuth();
+	$auth = new Zotlabs\Storage\BasicAuth();
 
 	$ob_hash = get_observer_hash();
 
 	if ($ob_hash) {
 		if (local_channel()) {
-			$channel = $a->get_channel();
+			$channel = App::get_channel();
 			$auth->setCurrentUser($channel['channel_address']);
 			$auth->channel_id = $channel['channel_id'];
 			$auth->channel_hash = $channel['channel_hash'];
@@ -63,7 +63,7 @@ function cloud_init(&$a) {
 	$_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
 	$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']);
 
-	$rootDirectory = new RedDAV\RedDirectory('/', $auth);
+	$rootDirectory = new Zotlabs\Storage\Directory('/', $auth);
 
 	// A SabreDAV server-object
 	$server = new DAV\Server($rootDirectory);
@@ -77,7 +77,7 @@ function cloud_init(&$a) {
 
 	if($_SERVER['REQUEST_METHOD'] === 'GET') {
 		try { 
-			$x = RedFileData('/' . $a->cmd, $auth);
+			$x = RedFileData('/' . App::$cmd, $auth);
 		}
 		catch(\Exception $e) {
 			if($e instanceof Sabre\DAV\Exception\Forbidden) {
@@ -86,16 +86,16 @@ function cloud_init(&$a) {
 		}
 	}
 
-	require_once('include/RedDAV/RedBrowser.php');
+//	require_once('Zotlabs/Storage/Browser.php');
 	// provide a directory view for the cloud in Hubzilla
-	$browser = new RedDAV\RedBrowser($auth);
+	$browser = new Zotlabs\Storage\Browser($auth);
 	$auth->setBrowserPlugin($browser);
 
 	$server->addPlugin($browser);
 
 	// Experimental QuotaPlugin
-//	require_once('include/RedDAV/QuotaPlugin.php');
-//	$server->addPlugin(new RedDAV\QuotaPlugin($auth));
+//	require_once('Zotlabs\Storage/QuotaPlugin.php');
+//	$server->addPlugin(new Zotlabs\Storage\\QuotaPlugin($auth));
 
 	// All we need to do now, is to fire up the server
 	$server->exec();