diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-03-20 15:55:53 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-03-20 16:00:52 +0000 |
| commit | 09631f691bd04baf1c31860f7b9c432c183e9400 (patch) | |
| tree | 8c4fc361e30c17ccf426c34475069e085f80f7c7 | |
| parent | 95d81c36ffff9c19681255f2af86e101409f2125 (diff) | |
| download | nextcloud-server-09631f691bd04baf1c31860f7b9c432c183e9400.tar.gz nextcloud-server-09631f691bd04baf1c31860f7b9c432c183e9400.zip | |
Support constructing an SMB_OC without saved session credentials
Conflicts:
apps/files_external/lib/smb_oc.php
| -rw-r--r-- | apps/files_external/lib/smb_oc.php | 14 |
1 files changed, 10 insertions, 4 deletions
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 = ''; |