From c1a8d90ea641791e8f448bb60d9cbc7e5221be26 Mon Sep 17 00:00:00 2001
From: nao-pon <hypweb@gmail.com>
Date: Sun, 13 Nov 2016 00:35:53 +0900
Subject: [PATCH] [VD:GoogleDrive,OneDrive,Box] CS fixes

---
 php/elFinderVolumeBox.class.php         | 43 +++++++++++++------------
 php/elFinderVolumeGoogleDrive.class.php |  2 +-
 php/elFinderVolumeOneDrive.class.php    | 41 +++++++++++------------
 3 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/php/elFinderVolumeBox.class.php b/php/elFinderVolumeBox.class.php
index c0449d961..f566a6ea5 100644
--- a/php/elFinderVolumeBox.class.php
+++ b/php/elFinderVolumeBox.class.php
@@ -235,9 +235,9 @@ class elFinderVolumeBox extends elFinderVolumeDriver
     protected function _bd_refreshToken($token)
     {
         if ($token->expires < time()) {
-            if (! isset($token->data->refresh_token) || $token->data->refresh_token === null) {
-            	$this->session->remove('BoxTokens');
-            	throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
+            if (!isset($token->data->refresh_token) || $token->data->refresh_token === null) {
+                $this->session->remove('BoxTokens');
+                throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
             }
 
             if (null === $this->options['client_id']) {
@@ -609,19 +609,19 @@ class elFinderVolumeBox extends elFinderVolumeDriver
             }
 
             if ($options['user'] === 'init') {
-            	$this->token = $this->session->get('BoxTokens');
-            	
-            	if ($this->token) {
-            		try {
-            			$this->_bd_refreshToken($this->token);
-            		} catch (Exception $e) {
-            			$this->error($e->getMessage());
-            			$this->token = null;
-            			$this->session->remove('BoxTokens');
-            		}
-            	}
-            	
-            	if (empty($this->token)) {
+                $this->token = $this->session->get('BoxTokens');
+
+                if ($this->token) {
+                    try {
+                        $this->_bd_refreshToken($this->token);
+                    } catch (Exception $e) {
+                        $this->error($e->getMessage());
+                        $this->token = null;
+                        $this->session->remove('BoxTokens');
+                    }
+                }
+
+                if (empty($this->token)) {
                     $cdata = '';
                     $innerKeys = array('cmd', 'host', 'options', 'pass', 'protocol', 'user');
                     $this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
@@ -640,7 +640,7 @@ class elFinderVolumeBox extends elFinderVolumeDriver
                         $this->session->set('BoxTokens', (object) array('token' => null));
 
                         $url = self::AUTH_URL.'?'.http_build_query(array('response_type' => 'code', 'client_id' => $options['client_id'], 'redirect_uri' => elFinder::getConnectorUrl().'?cmd=netmount&protocol=box&host=1'));
-                        
+
                         $url .= '&oauth_callback='.rawurlencode($callback);
                     } catch (Exception $e) {
                         return array('exit' => true, 'body' => '{msg:errAccess}');
@@ -666,7 +666,7 @@ class elFinderVolumeBox extends elFinderVolumeDriver
                     $folders = ['root' => 'My Box'] + $folders;
                     $folders = json_encode($folders);
 
-                    $expires = empty($this->token->data->refresh_token)? (int) $this->token->expires : 0;
+                    $expires = empty($this->token->data->refresh_token) ? (int) $this->token->expires : 0;
                     $json = '{"protocol": "box", "mode": "done", "folders": '.$folders.', "expires": '.$expires.'}';
                     $html = 'Box.com';
                     $html .= '<script>
@@ -683,7 +683,7 @@ class elFinderVolumeBox extends elFinderVolumeDriver
         if ($_aToken = $this->session->get('BoxTokens')) {
             $options['accessToken'] = json_encode($_aToken);
         } else {
-        	return array('exit' => true, 'error' => $this->error(self::ERROR_NETMOUNT, $options['host'], implode(' ', $this->error())));
+            return array('exit' => true, 'error' => $this->error(self::ERROR_NETMOUNT, $options['host'], implode(' ', $this->error())));
         }
 
         $this->session->remove('nodeId');
@@ -735,8 +735,9 @@ class elFinderVolumeBox extends elFinderVolumeDriver
                 $this->token = json_decode($this->options['accessToken']);
                 $this->_bd_refreshToken($this->token);
             } catch (Exception $e) {
-            	$this->error($e->getMessage());
-            	return $this->setError($e->getMessage());
+                $this->error($e->getMessage());
+
+                return $this->setError($e->getMessage());
             }
         }
 
diff --git a/php/elFinderVolumeGoogleDrive.class.php b/php/elFinderVolumeGoogleDrive.class.php
index 991402e42..b396aaedb 100644
--- a/php/elFinderVolumeGoogleDrive.class.php
+++ b/php/elFinderVolumeGoogleDrive.class.php
@@ -713,7 +713,7 @@ class elFinderVolumeGoogleDrive extends elFinderVolumeDriver
                     natcasesort($folders);
                     $folders = ['root' => $rootObj->getName()] + $folders;
                     $folders = json_encode($folders);
-                    $expires = empty($aToken['refresh_token'])? $aToken['created'] + $aToken['expires_in'] - 30 : 0;
+                    $expires = empty($aToken['refresh_token']) ? $aToken['created'] + $aToken['expires_in'] - 30 : 0;
                     $json = '{"protocol": "googledrive", "mode": "done", "folders": '.$folders.', "expires": '.$expires.'}';
                     $options['pass'] = 'return';
                     $html = 'Google.com';
diff --git a/php/elFinderVolumeOneDrive.class.php b/php/elFinderVolumeOneDrive.class.php
index 29c1c915f..d3d86a75f 100644
--- a/php/elFinderVolumeOneDrive.class.php
+++ b/php/elFinderVolumeOneDrive.class.php
@@ -184,7 +184,7 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
         }
 
         return (object) array(
-        		'expires' => time() + $decoded->expires_in - 30,
+                'expires' => time() + $decoded->expires_in - 30,
                 'data' => $decoded,
         );
     }
@@ -200,8 +200,8 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
     {
         if ($token->expires < time()) {
             if (null === $this->token->data->refresh_token) {
-            	$this->session->remove('OneDriveTokens');
-            	throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
+                $this->session->remove('OneDriveTokens');
+                throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
             }
 
             if (null === $this->options['client_id']) {
@@ -251,7 +251,7 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
             }
 
             $token = (object) array(
-            		    'expires' => time() + $decoded->expires_in - 30,
+                        'expires' => time() + $decoded->expires_in - 30,
                         'data' => $decoded,
                 );
 
@@ -555,19 +555,19 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
             }
 
             if ($options['user'] === 'init') {
-            	$this->token = $this->session->get('OneDriveTokens');
-            	
-            	if ($this->token) {
-            		try {
-            			$this->_od_refreshToken($this->token);
-            		} catch (Exception $e) {
-            			$this->error($e->getMessage());
-            			$this->token = null;
-           				$this->session->remove('OneDriveTokens');
-            		}
-            	}
+                $this->token = $this->session->get('OneDriveTokens');
 
-            	if (empty($this->token)) {
+                if ($this->token) {
+                    try {
+                        $this->_od_refreshToken($this->token);
+                    } catch (Exception $e) {
+                        $this->error($e->getMessage());
+                        $this->token = null;
+                        $this->session->remove('OneDriveTokens');
+                    }
+                }
+
+                if (empty($this->token)) {
                     $cdata = '';
                     $innerKeys = array('cmd', 'host', 'options', 'pass', 'protocol', 'user');
                     $this->ARGS = $_SERVER['REQUEST_METHOD'] === 'POST' ? $_POST : $_GET;
@@ -626,7 +626,7 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
                     $folders = ['root' => 'My OneDrive'] + $folders;
                     $folders = json_encode($folders);
 
-                    $expires = empty($this->token->data->refresh_token)? (int) $this->token->expires : 0;
+                    $expires = empty($this->token->data->refresh_token) ? (int) $this->token->expires : 0;
                     $json = '{"protocol": "onedrive", "mode": "done", "folders": '.$folders.', "expires": '.$expires.'}';
                     $html = 'OneDrive.com';
                     $html .= '<script>
@@ -643,7 +643,7 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
         if ($_aToken = $this->session->get('OneDriveTokens')) {
             $options['accessToken'] = json_encode($_aToken);
         } else {
-        	return array('exit' => true, 'error' => $this->error(self::ERROR_NETMOUNT, $options['host'], implode(' ', $this->error())));
+            return array('exit' => true, 'error' => $this->error(self::ERROR_NETMOUNT, $options['host'], implode(' ', $this->error())));
         }
 
         $this->session->remove('nodeId');
@@ -695,8 +695,9 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
                 $this->token = json_decode($this->options['accessToken']);
                 $this->_od_refreshToken($this->token);
             } catch (Exception $e) {
-            	$this->error($e->getMessage());
-            	return $this->setError($e->getMessage());
+                $this->error($e->getMessage());
+
+                return $this->setError($e->getMessage());
             }
         }