From 09631f691bd04baf1c31860f7b9c432c183e9400 Mon Sep 17 00:00:00 2001 From: Robin McCorkell Date: Fri, 20 Mar 2015 15:55:53 +0000 Subject: Support constructing an SMB_OC without saved session credentials Conflicts: apps/files_external/lib/smb_oc.php --- apps/files_external/lib/smb_oc.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'apps/files_external') diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php index a7c93d97fd1..5e9442746f8 100644 --- a/apps/files_external/lib/smb_oc.php +++ b/apps/files_external/lib/smb_oc.php @@ -18,13 +18,19 @@ class SMB_OC extends \OC\Files\Storage\SMB { * @throws \Exception */ public function __construct($params) { - if (isset($params['host']) && \OC::$server->getSession()->exists('smb-credentials')) { + if (isset($params['host'])) { $host=$params['host']; $this->username_as_share = ($params['username_as_share'] === 'true'); - $params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true); - $user = \OC::$server->getSession()->get('loginname'); - $password = $params_auth['password']; + $user = 'foo'; + $password = 'bar'; + if (\OC::$server->getSession()->exists('smb-credentials')) { + $params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true); + $user = \OC::$server->getSession()->get('loginname'); + $password = $params_auth['password']; + } else { + // assume we are testing from the admin section + } $root=isset($params['root'])?$params['root']:'/'; $share = ''; -- cgit v1.2.3