aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Cloud.php2
-rw-r--r--Zotlabs/Storage/BasicAuth.php13
-rw-r--r--Zotlabs/Storage/File.php2
3 files changed, 14 insertions, 3 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 05109247a..527b06b3a 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -54,9 +54,9 @@ class Cloud extends Controller {
if (local_channel()) {
$channel = \App::get_channel();
$auth->setCurrentUser($channel['channel_address']);
+ $auth->channel_account_id = $channel['channel_account_id'];
$auth->channel_id = $channel['channel_id'];
$auth->channel_hash = $channel['channel_hash'];
- $auth->channel_account_id = $channel['channel_account_id'];
if($channel['channel_timezone'])
$auth->setTimezone($channel['channel_timezone']);
}
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index d23f3d848..3fd1bcc1f 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -34,6 +34,14 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
* @var int $channel_id
*/
public $channel_id = 0;
+
+ /**
+ * @brief channel_account_id of the current channel of the logged-in account.
+ *
+ * @var int $channel_account_id
+ */
+ public $channel_account_id = 0;
+
/**
* @brief channel_hash of the current channel of the logged-in account.
*
@@ -127,6 +135,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
*/
protected function setAuthenticated($channel) {
$this->channel_name = $channel['channel_address'];
+ $this->channel_account_id = $channel['channel_account_id'];
$this->channel_id = $channel['channel_id'];
$this->channel_hash = $this->observer = $channel['channel_hash'];
@@ -139,8 +148,8 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
}
}
- $_SESSION['uid'] = $channel['channel_id'];
- $_SESSION['account_id'] = $channel['channel_account_id'];
+ $_SESSION['uid'] = $this->channel_id;
+ $_SESSION['account_id'] = $this->channel_account_id;
$_SESSION['authenticated'] = true;
return true;
}
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index dc60a72ae..ff379e2e9 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -38,6 +38,8 @@ class File extends DAV\Node implements DAV\IFile {
*/
private $name;
+ public $os_path;
+ public $folder_hash;
/**
* Sets up the node, expects a full path name.