admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

src build elFinder-2.1-1990f7d

Browse Source
This commit is contained in:
nao-pon
2020-01-04 00:50:23 +09:00
parent bdb34c20a5
commit beeb23cc6d
7 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeBox.class.php
+10 -3
View File
@@ -269,16 +269,17 @@ class elFinderVolumeBox extends elFinderVolumeDriver
);
$this->token = $token;
$json = json_encode($token);
if (!empty($decoded->refresh_token)) {
if (empty($this->options['netkey']) && $this->aTokenFile) {
file_put_contents($this->aTokenFile, json_encode($token));
$this->options['accessToken'] = $json;
} else if (!empty($this->options['netkey'])) {
$json = json_encode($token);
// OAuth2 refresh token can be used only once,
// so update it if it is the same as the token file
$aTokenFile = $this->_bd_getATokenFile();
if (is_file($aTokenFile)) {
if ($aTokenFile && is_file($aTokenFile)) {
if ($_token = json_decode(file_get_contents($aTokenFile))) {
if ($_token->data->refresh_token === $refresh_token) {
file_put_contents($aTokenFile, $json);
@@ -288,6 +289,7 @@ class elFinderVolumeBox extends elFinderVolumeDriver
$this->options['accessToken'] = $json;
// update session value
elFinder::$instance->updateNetVolumeOption($this->options['netkey'], 'accessToken', $json);
$this->session->set('BoxTokens', $token);
} else {
throw new \Exception(ERROR_CREATING_TEMP_DIR);
}
@@ -756,7 +758,8 @@ class elFinderVolumeBox extends elFinderVolumeDriver
$folders = json_encode($folders);
$expires = empty($this->token->data->refresh_token) ? (int)$this->token->expires : 0;
$json = '{"protocol": "box", "mode": "done", "folders": ' . $folders . ', "expires": ' . $expires . '}';
$mnt2res = empty($this->token->data->refresh_token) ? '' : ', "mnt2res": 1';
$json = '{"protocol": "box", "mode": "done", "folders": ' . $folders . ', "expires": ' . $expires . $mnt2res . '}';
$html = 'Box.com';
$html .= '<script>
$("#' . $options['id'] . '").elfinder("instance").trigger("netmount", ' . $json . ');
@@ -772,11 +775,15 @@ class elFinderVolumeBox extends elFinderVolumeDriver
if ($_aToken = $this->session->get('BoxTokens')) {
$options['accessToken'] = json_encode($_aToken);
} else {
$this->session->remove('BoxTokens');
$this->setError(elFinder::ERROR_NETMOUNT, $options['host'], implode(' ', $this->error()));
return array('exit' => true, 'error' => $this->error());
}
if (!empty($_aToken->data->refresh_token)) {
$this->session->remove('BoxTokens');
}
$this->session->remove('nodeId');
unset($options['user'], $options['pass'], $options['id']);