From 927e8e62f60148774505462b20bcf5ec2308e9e1 Mon Sep 17 00:00:00 2001
From: nao-pon <hypweb@gmail.com>
Date: Fri, 10 Jan 2020 01:19:48 +0900
Subject: [PATCH] [doc,example] fix #3079 add connector.maximal.php-dist

---
 Jakefile.js                    |   1 +
 elfinder.html                  |  14 +-
 php/MySQLStorage.sql           |  32 +-
 php/connector.maximal.php-dist | 426 +++++++++++++++++++++++++
 php/connector.php-dist         | 555 ---------------------------------
 5 files changed, 462 insertions(+), 566 deletions(-)
 create mode 100644 php/connector.maximal.php-dist
 delete mode 100644 php/connector.php-dist

diff --git a/Jakefile.js b/Jakefile.js
index 27705fd74..9e3fc3af2 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -64,6 +64,7 @@ var dirmode = 0755,
 			[
 				path.join(src, 'php', 'autoload.php'),
 				path.join(src, 'php', 'connector.minimal.php-dist'),
+				path.join(src, 'php', 'connector.maximal.php-dist'),
 				path.join(src, 'php', 'mime.types'),
 				path.join(src, 'php', 'MySQLStorage.sql'),
 				path.join(src, 'php', 'elFinderPlugin.php'),
diff --git a/elfinder.html b/elfinder.html
index 7a6006bcf..e40e7b41c 100644
--- a/elfinder.html
+++ b/elfinder.html
@@ -8,15 +8,15 @@
 
 		<!-- Require JS (REQUIRED) -->
 		<!-- Rename "main.default.js" to "main.js" and edit it if you need configure elFInder options or any things -->
-		<script data-main="./main.default.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
+		<script data-main="./main.default.js" src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.3.6/require.min.js"></script>
 		<script>
 			define('elFinderConfig', {
 				// elFinder options (REQUIRED)
 				// Documentation for client options:
 				// https://github.com/Studio-42/elFinder/wiki/Client-configuration-options
 				defaultOpts : {
-					url : 'php/connector.minimal.php' // connector URL (REQUIRED)
-					,commandsOptions : {
+					url : 'php/connector.minimal.php', // or connector.maximal.php : connector URL (REQUIRED)
+					commandsOptions : {
 						edit : {
 							extraOptions : {
 								// set API key to enable Creative Cloud image editor
@@ -26,8 +26,8 @@
 								// uses self location with the empty value
 								managerUrl : ''
 							}
-						}
-						,quicklook : {
+						},
+						quicklook : {
 							// to enable CAD-Files and 3D-Models preview with sharecad.org
 							sharecadMimes : ['image/vnd.dwg', 'image/vnd.dxf', 'model/vnd.dwf', 'application/vnd.hp-hpgl', 'application/plt', 'application/step', 'model/iges', 'application/vnd.ms-pki.stl', 'application/sat', 'image/cgm', 'application/x-msmetafile'],
 							// to enable preview with Google Docs Viewer
@@ -36,9 +36,9 @@
 							// these MIME types override "googleDocsMimes"
 							officeOnlineMimes : ['application/vnd.ms-office', 'application/msword', 'application/vnd.ms-word', 'application/vnd.ms-excel', 'application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.presentation']
 						}
-					}
+					},
 					// bootCalback calls at before elFinder boot up 
-					,bootCallback : function(fm, extraObj) {
+					bootCallback : function(fm, extraObj) {
 						/* any bind functions etc. */
 						fm.bind('init', function() {
 							// any your code
diff --git a/php/MySQLStorage.sql b/php/MySQLStorage.sql
index 4b0b323ec..205e9c311 100644
--- a/php/MySQLStorage.sql
+++ b/php/MySQLStorage.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS `elfinder_file`;
 CREATE TABLE IF NOT EXISTS `elfinder_file` (
   `id`        int(7) unsigned NOT NULL auto_increment,
   `parent_id` int(7) unsigned NOT NULL,
-  `name`      varchar(256) NOT NULL,
+  `name`      varchar(255) NOT NULL,
   `content`   longblob NOT NULL,
   `size`      int(10) unsigned NOT NULL default '0',
   `mtime`     int(10) unsigned NOT NULL default '0',
@@ -16,8 +16,32 @@ CREATE TABLE IF NOT EXISTS `elfinder_file` (
   PRIMARY KEY (`id`),
   UNIQUE KEY  `parent_name` (`parent_id`, `name`),
   KEY         `parent_id`   (`parent_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `elfinder_file`
-(`id`, `parent_id`, `name`,     `content`, `size`, `mtime`, `mime`,      `read`, `write`, `locked`, `hidden`, `width`, `height`) VALUES 
-('1',  '0',         'DATABASE', '',        '0',    '0',     'directory', '1',    '1',     '0',      '0',      '0',     '0');
+(`id`, `parent_id`, `name`, `content`, `size`, `mtime`, `mime`,  `read`, `write`, `locked`, `hidden`, `width`, `height`) VALUES 
+('1' ,         '0', 'DATABASE',    '',    '0',     '0','directory', '1',     '1',      '0',      '0',      '0',     '0');
+
+DROP TABLE IF EXISTS `elfinder_trash`;
+CREATE TABLE IF NOT EXISTS `elfinder_trash` (
+  `id`        int(7) unsigned NOT NULL auto_increment,
+  `parent_id` int(7) unsigned NOT NULL,
+  `name`      varchar(255) NOT NULL,
+  `content`   longblob NOT NULL,
+  `size`      int(10) unsigned NOT NULL default '0',
+  `mtime`     int(10) unsigned NOT NULL default '0',
+  `mime`      varchar(256) NOT NULL default 'unknown',
+  `read`      enum('1', '0') NOT NULL default '1',
+  `write`     enum('1', '0') NOT NULL default '1',
+  `locked`    enum('1', '0') NOT NULL default '0',
+  `hidden`    enum('1', '0') NOT NULL default '0',
+  `width`     int(5) NOT NULL default '0',
+  `height`    int(5) NOT NULL default '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY  `parent_name` (`parent_id`, `name`),
+  KEY         `parent_id`   (`parent_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+
+INSERT INTO `elfinder_trash`
+(`id`, `parent_id`, `name`, `content`, `size`, `mtime`, `mime`,  `read`, `write`, `locked`, `hidden`, `width`, `height`) VALUES 
+('1' ,         '0', 'DB Trash',    '',    '0',     '0','directory', '1',     '1',      '0',      '0',      '0',     '0');
diff --git a/php/connector.maximal.php-dist b/php/connector.maximal.php-dist
new file mode 100644
index 000000000..9c911ed9a
--- /dev/null
+++ b/php/connector.maximal.php-dist
@@ -0,0 +1,426 @@
+<?php
+
+error_reporting(0); // Set E_ALL for debuging
+
+// // Optional exec path settings (Default is called with command name only)
+// define('ELFINDER_TAR_PATH',      '/PATH/TO/tar');
+// define('ELFINDER_GZIP_PATH',     '/PATH/TO/gzip');
+// define('ELFINDER_BZIP2_PATH',    '/PATH/TO/bzip2');
+// define('ELFINDER_XZ_PATH',       '/PATH/TO/xz');
+// define('ELFINDER_ZIP_PATH',      '/PATH/TO/zip');
+// define('ELFINDER_UNZIP_PATH',    '/PATH/TO/unzip');
+// define('ELFINDER_RAR_PATH',      '/PATH/TO/rar');
+// define('ELFINDER_UNRAR_PATH',    '/PATH/TO/unrar');
+// define('ELFINDER_7Z_PATH',       '/PATH/TO/7za');
+// define('ELFINDER_CONVERT_PATH',  '/PATH/TO/convert');
+// define('ELFINDER_IDENTIFY_PATH', '/PATH/TO/identify');
+// define('ELFINDER_EXIFTRAN_PATH', '/PATH/TO/exiftran');
+// define('ELFINDER_JPEGTRAN_PATH', '/PATH/TO/jpegtran');
+// define('ELFINDER_FFMPEG_PATH',   '/PATH/TO/ffmpeg');
+
+// define('ELFINDER_CONNECTOR_URL', 'URL to this connector script');  // see elFinder::getConnectorUrl()
+
+// define('ELFINDER_DEBUG_ERRORLEVEL', -1); // Error reporting level of debug mode
+
+// // To Enable(true) handling of PostScript files by ImageMagick
+// // It is disabled by default as a countermeasure 
+// // of Ghostscript multiple -dSAFER sandbox bypass vulnerabilities
+// // see https://www.kb.cert.org/vuls/id/332928
+// define('ELFINDER_IMAGEMAGICK_PS', true);
+// ===============================================
+
+// // load composer autoload before load elFinder autoload If you need composer
+// // You need to run the composer command in the php directory.
+// require './vendor/autoload.php';
+
+// // elFinder autoload
+require './autoload.php';
+// ===============================================
+
+// // Enable FTP connector netmount
+elFinder::$netDrivers['ftp'] = 'FTP';
+// ===============================================
+
+// // Required for Dropbox network mount
+// // Installation by composer
+// // `composer require kunalvarma05/dropbox-php-sdk` on php directory
+// // Enable network mount
+// elFinder::$netDrivers['dropbox2'] = 'Dropbox2';
+// // Dropbox2 Netmount driver need next two settings. You can get at https://www.dropbox.com/developers/apps
+// // AND require register redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=dropbox2&host=1"
+// define('ELFINDER_DROPBOX_APPKEY',    '');
+// define('ELFINDER_DROPBOX_APPSECRET', '');
+// ===============================================
+
+// // Required for Google Drive network mount
+// // Installation by composer
+// // `composer require google/apiclient:^2.0` on php directory
+// // Enable network mount
+// elFinder::$netDrivers['googledrive'] = 'GoogleDrive';
+// // GoogleDrive Netmount driver need next two settings. You can get at https://console.developers.google.com
+// // AND require register redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=googledrive&host=1"
+// define('ELFINDER_GOOGLEDRIVE_CLIENTID',     '');
+// define('ELFINDER_GOOGLEDRIVE_CLIENTSECRET', '');
+// // Required case when Google API is NOT added via composer
+// define('ELFINDER_GOOGLEDRIVE_GOOGLEAPICLIENT', '/path/to/google-api-php-client/vendor/autoload.php');
+// ===============================================
+
+// // Required for Google Drive network mount with Flysystem
+// // Installation by composer
+// // `composer require nao-pon/flysystem-google-drive:~1.1 nao-pon/elfinder-flysystem-driver-ext` on php directory
+// // Enable network mount
+// elFinder::$netDrivers['googledrive'] = 'FlysystemGoogleDriveNetmount';
+// // GoogleDrive Netmount driver need next two settings. You can get at https://console.developers.google.com
+// // AND require register redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=googledrive&host=1"
+// define('ELFINDER_GOOGLEDRIVE_CLIENTID',     '');
+// define('ELFINDER_GOOGLEDRIVE_CLIENTSECRET', '');
+// // And "php/.tmp" directory must exist and be writable by PHP.
+// ===============================================
+
+// // Required for One Drive network mount
+// //  * cURL PHP extension required
+// //  * HTTP server PATH_INFO supports required
+// // Enable network mount
+// elFinder::$netDrivers['onedrive'] = 'OneDrive';
+// // GoogleDrive Netmount driver need next two settings. You can get at https://dev.onedrive.com
+// // AND require register redirect url to "YOUR_CONNECTOR_URL/netmount/onedrive/1"
+// define('ELFINDER_ONEDRIVE_CLIENTID',     '');
+// define('ELFINDER_ONEDRIVE_CLIENTSECRET', '');
+// ===============================================
+
+// // Required for Box network mount
+// //  * cURL PHP extension required
+// // Enable network mount
+// elFinder::$netDrivers['box'] = 'Box';
+// // Box Netmount driver need next two settings. You can get at https://developer.box.com
+// // AND require register redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=box&host=1"
+// define('ELFINDER_BOX_CLIENTID',     '');
+// define('ELFINDER_BOX_CLIENTSECRET', '');
+// ===============================================
+
+
+// // Zoho Office Editor APIKey
+// // https://www.zoho.com/docs/help/office-apis.html
+// define('ELFINDER_ZOHO_OFFICE_APIKEY', '');
+// ===============================================
+
+// // Online converter (online-convert.com) APIKey
+// // https://apiv2.online-convert.com/docs/getting_started/api_key.html
+// define('ELFINDER_ONLINE_CONVERT_APIKEY', '');
+// ===============================================
+
+// // Zip Archive editor
+// // Installation by composer
+// // `composer require nao-pon/elfinder-flysystem-ziparchive-netmount` on php directory
+// define('ELFINDER_DISABLE_ZIPEDITOR', false); // set `true` to disable zip editor
+// ===============================================
+
+/**
+ * Simple function to demonstrate how to control file access using "accessControl" callback.
+ * This method will disable accessing files/folders starting from '.' (dot)
+ *
+ * @param  string    $attr    attribute name (read|write|locked|hidden)
+ * @param  string    $path    absolute file path
+ * @param  string    $data    value of volume option `accessControlData`
+ * @param  object    $volume  elFinder volume driver object
+ * @param  bool|null $isDir   path is directory (true: directory, false: file, null: unknown)
+ * @param  string    $relpath file path relative to volume root directory started with directory separator
+ * @return bool|null
+ **/
+function access($attr, $path, $data, $volume, $isDir, $relpath) {
+    $basename = basename($path);
+    return $basename[0] === '.'                  // if file/folder begins with '.' (dot)
+             && strlen($relpath) !== 1           // but with out volume root
+        ? !($attr == 'read' || $attr == 'write') // set read+write to false, other (locked+hidden) set to true
+        :  null;                                 // else elFinder decide it itself
+}
+
+/**
+ * Simple debug function
+ * Usage: debug($anyVal[, $anyVal2 ...]);
+ */
+function debug() {
+    $arg = func_get_args();
+    ob_start();
+    foreach($arg as $v) {
+        var_dump($v);
+    }
+    $o = ob_get_contents();
+    ob_end_clean();
+    file_put_contents('.debug.txt', $o, FILE_APPEND);
+}
+
+/**
+ * Simple logger function.
+ * Demonstrate how to work with elFinder event api.
+ *
+ * @package elFinder
+ * @author Dmitry (dio) Levashov
+ **/
+class elFinderSimpleLogger {
+
+    /**
+     * Log file path
+     *
+     * @var string
+     **/
+    protected $file = '';
+
+    /**
+     * constructor
+     *
+     * @return void
+     * @author Dmitry (dio) Levashov
+     **/
+    public function __construct($path)
+    {
+        $this->file = $path;
+        $dir = dirname($path);
+        if (!is_dir($dir)) {
+            mkdir($dir);
+        }
+    }
+    
+    /**
+     * Create log record
+     *
+     * @param  string               $cmd       command name
+     * @param  array                $result    command result
+     * @param  array                $args      command arguments from client
+     * @param  elFinder             $elfinder  elFinder instance
+     * @param  elFinderVolumeDriver $volume    current volume driver instance
+     * @return void|true
+     * @author Dmitry (dio) Levashov
+     **/
+    public function log($cmd, $result, $args, $elfinder, $volume)
+    {
+        $log = $cmd.' ['.date('d.m H:s')."]\n";
+        
+        if (!empty($result['error'])) {
+            $log .= "\tERROR: ".implode(' ', $result['error'])."\n";
+        }
+        
+        if (!empty($result['warning'])) {
+            $log .= "\tWARNING: ".implode(' ', $result['warning'])."\n";
+        }
+        
+        if (!empty($result['removed'])) {
+            foreach ($result['removed'] as $file) {
+                // removed file contain additional field "realpath"
+                $log .= "\tREMOVED: ".$file['realpath']."\n";
+            }
+        }
+        
+        if (!empty($result['added'])) {
+            foreach ($result['added'] as $file) {
+                $log .= "\tADDED: ".$elfinder->realpath($file['hash'])."\n";
+            }
+        }
+        
+        if (!empty($result['changed'])) {
+            foreach ($result['changed'] as $file) {
+                $log .= "\tCHANGED: ".$elfinder->realpath($file['hash'])."\n";
+            }
+        }
+        
+        $this->write($log);
+    }
+
+    /**
+     * Write log into file
+     *
+     * @param  string  $log  log record
+     * @return void
+     * @author Dmitry (dio) Levashov
+     **/
+    protected function write($log)
+    {
+        
+        if (($fp = @fopen($this->file, 'a'))) {
+            fwrite($fp, $log."\n");
+            fclose($fp);
+        }
+    }
+
+} // END class
+// Make logger instance
+$logger = new elFinderSimpleLogger('log.txt');
+
+// Documentation for connector options:
+// https://github.com/Studio-42/elFinder/wiki/Connector-configuration-options
+$opts = array(
+    'debug' => true, // enable debug mode
+    'roots' => array(
+        // Items volume
+        array(
+            'driver'        => 'LocalFileSystem',           // driver for accessing file system (REQUIRED)
+            'path'          => '../files/',                 // path to files (REQUIRED)
+            'URL'           => dirname($_SERVER['PHP_SELF']) . '/../files/', // URL to files (REQUIRED)
+            'trashHash'     => 't1_Lw',                     // elFinder's hash of trash folder
+            'winHashFix'    => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
+            'uploadDeny'    => array('all'),                // All Mimetypes not allowed to upload
+            'uploadAllow'   => array('image/x-ms-bmp', 'image/gif', 'image/jpeg', 'image/png', 'image/x-icon', 'text/plain'), // Mimetype `image` and `text/plain` allowed to upload
+            'uploadOrder'   => array('deny', 'allow'),      // allowed Mimetype `image` and `text/plain` only
+            'accessControl' => 'access'                     // disable and hide dot starting files (OPTIONAL)
+        ),
+        // Trash volume
+        array(
+            'id'            => '1',
+            'driver'        => 'Trash',
+            'path'          => '../files/.trash/',
+            'tmbURL'        => dirname($_SERVER['PHP_SELF']) . '/../files/.trash/.tmb/',
+            'winHashFix'    => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
+            'uploadDeny'    => array('all'),                // Recomend the same settings as the original volume that uses the trash
+            'uploadAllow'   => array('image/x-ms-bmp', 'image/gif', 'image/jpeg', 'image/png', 'image/x-icon', 'text/plain'), // Same as above
+            'uploadOrder'   => array('deny', 'allow'),      // Same as above
+            'accessControl' => 'access',                    // Same as above
+        ),
+    ),
+    // some bind functions
+    'bind' => array(
+        // enable logger
+        // '*' => array($logger, 'log'),
+        'mkdir mkfile rename duplicate upload rm paste' => array($logger, 'log'),
+        // enable plugins
+        'archive.pre ls.pre mkdir.pre mkfile.pre rename.pre upload.pre' => array(
+            'Plugin.Normalizer.cmdPreprocess',
+            'Plugin.Sanitizer.cmdPreprocess'
+        ),
+        'upload.presave' => array(
+            'Plugin.AutoRotate.onUpLoadPreSave',
+            'Plugin.AutoResize.onUpLoadPreSave',
+            'Plugin.Watermark.onUpLoadPreSave',
+            'Plugin.Normalizer.onUpLoadPreSave',
+            'Plugin.Sanitizer.onUpLoadPreSave',
+        ),
+    ),
+    // volume options of netmount volumes
+    'optionsNetVolumes' => array(
+        '*' => array( // "*" is all of netmount volumes
+            'tmbURL'    => dirname($_SERVER['PHP_SELF']) . '/../files/.tmbNetmount/',
+            'tmbPath'   => '../files/.tmbNetmount',
+            'tmbGcMaxlifeHour' => 1,  // 1 hour
+            'tmbGcPercentage'  => 10, // 10 execute / 100 tmb querys
+            'plugin' => array(
+                'AutoResize' => array(
+                    'enable' => false
+                ),
+                'Watermark' => array(
+                    'enable' => false
+                ),
+                'Normalizer' => array(
+                    'enable' => false
+                ),
+                'Sanitizer' => array(
+                    'enable' => false
+                )
+            ),
+        )
+    ),
+);
+
+// Extended other volume types
+// To get an access token or refresh token, see the elFinder wiki.
+// https://github.com/Studio-42/elFinder/wiki/How-to-get-OAuth-token
+
+// Thumbnail settings for cloud volumes
+$tmbConfig = array(
+    'tmbPath'          => '../files/.tmbCloud',
+    'tmbURL'           => dirname($_SERVER['PHP_SELF']) . '/../files/.tmbCloud/',
+    'tmbGcMaxlifeHour' => 2160, // 90 days
+    'tmbGcPercentage'  => 5,    // 5 execute / 100 tmb querys
+); 
+
+// MySQL config
+$mySqlConfig = array(
+    'path'          => 1,
+    'host'          => '127.0.0.1',
+    'user'          => 'DB user',
+    'pass'          => 'DB user password',
+    'db'            => 'DB name',
+    'uploadMaxSize' => '10M', // It should be less than "max_allowed_packet" value of MySQL setting
+);
+// MySQL volume
+$opts['roots'][] = array_merge($tmbConfig, $mySqlConfig, array(
+    'driver'        => 'MySQL',
+    'trashHash'     => 'tm1_MQ', // set trash to MySQL trash (tm1_) 1 (MQ)
+    'files_table'   => 'elfinder_file',
+));
+// MySQL trash volume
+$opts['roots'][] = array_merge($tmbConfig, $mySqlConfig, array(
+    'id'            => '1', // volume id became "tm1_"
+    'alias'         => 'DB Trash',
+    'driver'        => 'TrashMySQL',
+    'files_table'   => 'elfinder_trash',
+));
+
+// Volume group
+$opts['roots'][] = array(
+    'id'           => '1', // volume id became "g1_"
+    'alias'        => 'CloudVolumes',
+    'driver'       => 'Group',
+    'rootCssClass' => 'elfinder-navbar-root-network' // set volume icon
+);
+
+// FTP volume
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'  => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver' => 'FTP',
+    'host'   => 'ftp.jaist.ac.jp',
+    'user'   => 'anonymous',
+    'path'   => '/', 
+));
+
+// To enable the following cloud volumes, first complete the steps 
+// for enabling each network-mounted volume described earlier in this file.
+
+// Box volume
+// Require constant "ELFINDER_BOX_CLIENTID" and "ELFINDER_BOX_CLIENTSECRET"
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'       => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver'      => 'Box',
+    'path'        => '/', // or folder id as root
+    'accessToken' => 'JSON strings of access token including refresh token',
+));
+
+// Dropbox volume
+// Require constant "ELFINDER_DROPBOX_APPKEY" and "ELFINDER_DROPBOX_APPSECRET"
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'        => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver'       => 'Dropbox2',
+    'path'         => '/', // or folder path as root
+    'access_token' => 'access token strings',
+));
+
+// GoogleDrive volume with refresh token
+// Require constant "ELFINDER_GOOGLEDRIVE_CLIENTID" and "ELFINDER_GOOGLEDRIVE_CLIENTSECRET"
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'         => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver'        => 'GoogleDrive',
+    'path'          => '/', // or folder id as root
+    'refresh_token' => 'refresh token strings',
+));
+
+// GoogleDrive volume with service account
+// Require constant "ELFINDER_GOOGLEDRIVE_CLIENTID" and "ELFINDER_GOOGLEDRIVE_CLIENTSECRET"
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'                    => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver'                   => 'GoogleDrive',
+    'path'                     => '/', // or folder id as root
+    'serviceAccountConfigFile' => '/path/to/config/json',
+));
+
+// OneDrive volume
+// Require constant "ELFINDER_ONEDRIVE_CLIENTID" and "ELFINDER_ONEDRIVE_CLIENTSECRET"
+$opts['roots'][] = array_merge($tmbConfig, array(
+    'phash'       => 'g1_Lw', // set parent to Volume group (g1_) root "/" (Lw)
+    'driver'      => 'OneDrive',
+    'path'        => '/', // or folder id as root
+    'accessToken' => 'JSON string of access token including refresh token',
+));
+
+
+// run elFinder
+$connector = new elFinderConnector(new elFinder($opts));
+$connector->run();
+
diff --git a/php/connector.php-dist b/php/connector.php-dist
deleted file mode 100644
index 4915389e3..000000000
--- a/php/connector.php-dist
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-
-set_time_limit(0); // just in case it too long, not recommended for production
-error_reporting(E_ALL | E_STRICT); // Set E_ALL for debuging
-// error_reporting(0);
-ini_set('max_file_uploads', 50);   // allow uploading up to 50 files at once
-
-// needed for case insensitive search to work, due to broken UTF-8 support in PHP
-ini_set('mbstring.internal_encoding', 'UTF-8');
-ini_set('mbstring.func_overload', 2);
-
-if (function_exists('date_default_timezone_set')) {
-	date_default_timezone_set('Europe/Moscow');
-}
-
-// // Optional exec path settings (Default is called with command name only)
-// define('ELFINDER_TAR_PATH',      '/PATH/TO/tar');
-// define('ELFINDER_GZIP_PATH',     '/PATH/TO/gzip');
-// define('ELFINDER_BZIP2_PATH',    '/PATH/TO/bzip2');
-// define('ELFINDER_XZ_PATH',       '/PATH/TO/xz');
-// define('ELFINDER_ZIP_PATH',      '/PATH/TO/zip');
-// define('ELFINDER_UNZIP_PATH',    '/PATH/TO/unzip');
-// define('ELFINDER_RAR_PATH',      '/PATH/TO/rar');
-// define('ELFINDER_UNRAR_PATH',    '/PATH/TO/unrar');
-// define('ELFINDER_7Z_PATH',       '/PATH/TO/7za');
-// define('ELFINDER_CONVERT_PATH',  '/PATH/TO/convert');
-// define('ELFINDER_IDENTIFY_PATH', '/PATH/TO/identify');
-// define('ELFINDER_EXIFTRAN_PATH', '/PATH/TO/exiftran');
-// define('ELFINDER_JPEGTRAN_PATH', '/PATH/TO/jpegtran');
-// define('ELFINDER_FFMPEG_PATH',   '/PATH/TO/ffmpeg');
-
-// define('ELFINDER_CONNECTOR_URL', 'URL to this connector script');  // see elFinder::getConnectorUrl()
-
-// define('ELFINDER_DEBUG_ERRORLEVEL', -1); // Error reporting level of debug mode
-
-// // To Enable(true) handling of PostScript files by ImageMagick
-// // It is disabled by default as a countermeasure 
-// // of Ghostscript multiple -dSAFER sandbox bypass vulnerabilities
-// // see https://www.kb.cert.org/vuls/id/332928
-// define('ELFINDER_IMAGEMAGICK_PS', true);
-// ===============================================
-
-// // load composer autoload before load elFinder autoload If you need composer
-// // You need to run the composer command in the php directory.
-//require './vendor/autoload.php';
-
-// // elFinder autoload
-require './autoload.php';
-// ===============================================
-
-// // Enable FTP connector netmount
-elFinder::$netDrivers['ftp'] = 'FTP';
-// ===============================================
-
-// // Required for Dropbox network mount
-// // Installation by composer
-// // `composer require kunalvarma05/dropbox-php-sdk` on php directory
-// // Enable network mount
-// elFinder::$netDrivers['dropbox2'] = 'Dropbox2';
-// // Dropbox2 Netmount driver need next two settings. You can get at https://www.dropbox.com/developers/apps
-// // AND reuire regist redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=dropbox2&host=1"
-// define('ELFINDER_DROPBOX_APPKEY',    '');
-// define('ELFINDER_DROPBOX_APPSECRET', '');
-// ===============================================
-
-// // Required for Google Drive network mount
-// // Installation by composer
-// // `composer require google/apiclient:^2.0` on php directory
-// // Enable network mount
-// elFinder::$netDrivers['googledrive'] = 'GoogleDrive';
-// // GoogleDrive Netmount driver need next two settings. You can get at https://console.developers.google.com
-// // AND reuire regist redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=googledrive&host=1"
-// define('ELFINDER_GOOGLEDRIVE_CLIENTID',     '');
-// define('ELFINDER_GOOGLEDRIVE_CLIENTSECRET', '');
-// // Required case of without composer
-// define('ELFINDER_GOOGLEDRIVE_GOOGLEAPICLIENT', '/path/to/google-api-php-client/vendor/autoload.php');
-// ===============================================
-
-// // Required for Google Drive network mount with Flysystem
-// // Installation by composer
-// // `composer require nao-pon/flysystem-google-drive:~1.1 nao-pon/elfinder-flysystem-driver-ext` on php directory
-// // Enable network mount
-// elFinder::$netDrivers['googledrive'] = 'FlysystemGoogleDriveNetmount';
-// // GoogleDrive Netmount driver need next two settings. You can get at https://console.developers.google.com
-// // AND reuire regist redirect url to "YOUR_CONNECTOR_URL?cmd=netmount&protocol=googledrive&host=1"
-// define('ELFINDER_GOOGLEDRIVE_CLIENTID',     '');
-// define('ELFINDER_GOOGLEDRIVE_CLIENTSECRET', '');
-// ===============================================
-
-// // Required for One Drive network mount
-// //  * cURL PHP extension required
-// //  * HTTP server PATH_INFO supports required
-// // Enable network mount
-// elFinder::$netDrivers['onedrive'] = 'OneDrive';
-// // GoogleDrive Netmount driver need next two settings. You can get at https://dev.onedrive.com
-// // AND reuire regist redirect url to "YOUR_CONNECTOR_URL/netmount/onedrive/1"
-// define('ELFINDER_ONEDRIVE_CLIENTID',     '');
-// define('ELFINDER_ONEDRIVE_CLIENTSECRET', '');
-// ===============================================
-
-// // Required for Box network mount
-// //  * cURL PHP extension required
-// // Enable network mount
-// elFinder::$netDrivers['box'] = 'Box';
-// // Box Netmount driver need next two settings. You can get at https://developer.box.com
-// // AND reuire regist redirect url to "YOUR_CONNECTOR_URL"
-// define('ELFINDER_BOX_CLIENTID',     '');
-// define('ELFINDER_BOX_CLIENTSECRET', '');
-// ===============================================
-
-// // Zoho Office Editor APIKey
-// // https://www.zoho.com/docs/help/office-apis.html
-// define('ELFINDER_ZOHO_OFFICE_APIKEY', '');
-// ===============================================
-
-// // Online converter (online-convert.com) APIKey
-// // https://apiv2.online-convert.com/docs/getting_started/api_key.html
-// define('ELFINDER_ONLINE_CONVERT_APIKEY', '');
-// define('ELFINDER_DISABLE_ONLINE_CONVERT', false); // set `true` to disable Online converter
-// ===============================================
-
-// // Zip Archive editor
-// // Installation by composer
-// // `composer require barryvdh/elfinder-flysystem-driver league/flysystem-ziparchive` on php directory
-// define('ELFINDER_DISABLE_ZIPEDITOR', false); // set `true` to disable zip editor
-// ===============================================
-
-function debug() {
-	$arg = func_get_args();
-	ob_start();
-	foreach($arg as $v) {
-		var_dump($v);
-	}
-	$o = ob_get_contents();
-	ob_end_clean();
-	file_put_contents('.debug.txt', $o, FILE_APPEND);
-}
-
-
-
-/**
- * Smart logger function
- * Demonstrate how to work with elFinder event api
- *
- * @param  string   $cmd       command name
- * @param  array    $result    command result
- * @param  array    $args      command arguments from client
- * @param  elFinder $elfinder  elFinder instance
- * @return void|true
- * @author Troex Nevelin
- **/
-function logger($cmd, $result, $args, $elfinder) {
-
-	
-	$log = sprintf("[%s] %s: %s \n", date('r'), strtoupper($cmd), var_export($result, true));
-	$logfile = '../files/temp/log.txt';
-	$dir = dirname($logfile);
-	if (!is_dir($dir) && !mkdir($dir)) {
-		return;
-	}
-	if (($fp = fopen($logfile, 'a'))) {
-		fwrite($fp, $log);
-		fclose($fp);
-	}
-	return;
-
-	foreach ($result as $key => $value) {
-		if (empty($value)) {
-			continue;
-		}
-		$data = array();
-		if (in_array($key, array('error', 'warning'))) {
-			array_push($data, implode(' ', $value));
-		} else {
-			if (is_array($value)) { // changes made to files
-				foreach ($value as $file) {
-					$filepath = (isset($file['realpath']) ? $file['realpath'] : $elfinder->realpath($file['hash']));
-					array_push($data, $filepath);
-				}
-			} else { // other value (ex. header)
-				array_push($data, $value);
-			}
-		}
-		$log .= sprintf(' %s(%s)', $key, implode(', ', $data));
-	}
-	$log .= "\n";
-
-	$logfile = '../files/temp/log.txt';
-	$dir = dirname($logfile);
-	if (!is_dir($dir) && !mkdir($dir)) {
-		return;
-	}
-	if (($fp = fopen($logfile, 'a'))) {
-		fwrite($fp, $log);
-		fclose($fp);
-	}
-}
-
-
-/**
- * Simple logger function.
- * Demonstrate how to work with elFinder event api.
- *
- * @package elFinder
- * @author Dmitry (dio) Levashov
- **/
-class elFinderSimpleLogger {
-	
-	/**
-	 * Log file path
-	 *
-	 * @var string
-	 **/
-	protected $file = '';
-	
-	/**
-	 * constructor
-	 *
-	 * @return void
-	 * @author Dmitry (dio) Levashov
-	 **/
-	public function __construct($path) {
-		$this->file = $path;
-		$dir = dirname($path);
-		if (!is_dir($dir)) {
-			mkdir($dir);
-		}
-	}
-	
-	/**
-	 * Create log record
-	 *
-	 * @param  string   $cmd       command name
-	 * @param  array    $result    command result
-	 * @param  array    $args      command arguments from client
-	 * @param  elFinder $elfinder  elFinder instance
-	 * @return void|true
-	 * @author Dmitry (dio) Levashov
-	 **/
-	public function log($cmd, $result, $args, $elfinder) {
-		$log = $cmd.' ['.date('d.m H:s')."]\n";
-		
-		if (!empty($result['error'])) {
-			$log .= "\tERROR: ".implode(' ', $result['error'])."\n";
-		}
-		
-		if (!empty($result['warning'])) {
-			$log .= "\tWARNING: ".implode(' ', $result['warning'])."\n";
-		}
-		
-		if (!empty($result['removed'])) {
-			foreach ($result['removed'] as $file) {
-				// removed file contain additional field "realpath"
-				$log .= "\tREMOVED: ".$file['realpath']."\n";
-			}
-		}
-		
-		if (!empty($result['added'])) {
-			foreach ($result['added'] as $file) {
-				$log .= "\tADDED: ".$elfinder->realpath($file['hash'])."\n";
-			}
-		}
-		
-		if (!empty($result['changed'])) {
-			foreach ($result['changed'] as $file) {
-				$log .= "\tCHANGED: ".$elfinder->realpath($file['hash'])."\n";
-			}
-		}
-		
-		$this->write($log);
-	}
-	
-	/**
-	 * Write log into file
-	 *
-	 * @param  string  $log  log record
-	 * @return void
-	 * @author Dmitry (dio) Levashov
-	 **/
-	protected function write($log) {
-		
-		if (($fp = @fopen($this->file, 'a'))) {
-			fwrite($fp, $log."\n");
-			fclose($fp);
-		}
-	}
-	
-	
-} // END class 
-
-
-/**
- * Simple function to demonstrate how to control file access using "accessControl" callback.
- * This method will disable accessing files/folders starting from '.' (dot)
- *
- * @param  string    $attr    attribute name (read|write|locked|hidden)
- * @param  string    $path    absolute file path
- * @param  string    $data    value of volume option `accessControlData`
- * @param  object    $volume  elFinder volume driver object
- * @param  bool|null $isDir   path is directory (true: directory, false: file, null: unknown)
- * @param  string    $relpath file path relative to volume root directory started with directory separator
- * @return bool|null
- **/
-function access($attr, $path, $data, $volume, $isDir, $relpath) {
-	$basename = basename($path);
-	return $basename[0] === '.'                  // if file/folder begins with '.' (dot)
-			 && strlen($relpath) !== 1           // but with out volume root
-		? !($attr == 'read' || $attr == 'write') // set read+write to false, other (locked+hidden) set to true
-		:  null;                                 // else elFinder decide it itself
-}
-
-/**
- * Access control example class
- *
- * @author Dmitry (dio) Levashov
- **/
-class elFinderTestACL {
-	
-	/**
-	 * make dotfiles not readable, not writable, hidden and locked
-	 *
-	 * @param  string  $attr  attribute name (read|write|locked|hidden)
-	 * @param  string  $path  file path. Attention! This is path relative to volume root directory started with directory separator.
-	 * @param  mixed   $data  data which seted in 'accessControlData' elFinder option
-	 * @param  elFinderVolumeDriver  $volume  volume driver
-	 * @return bool
-	 * @author Dmitry (dio) Levashov
-	 **/
-	public function fsAccess($attr, $path, $data, $volume) {
-		
-		if ($volume->name() == 'localfilesystem') {
-			return strpos(basename($path), '.') === 0
-				? !($attr == 'read' || $attr == 'write')
-				: $attr == 'read' || $attr == 'write';
-		}
-		
-		return true;
-	}
-	
-} // END class 
-
-$acl = new elFinderTestACL();
-
-function validName($name) {
-	return strpos($name, '.') !== 0;
-}
-
-
-$logger = new elFinderSimpleLogger('../files/temp/log.txt');
-
-
-
-$opts = array(
-	'locale' => 'en_US.UTF-8',
-	'bind' => array(
-		// '*' => 'logger',
-		'mkdir mkfile rename duplicate upload rm paste' => 'logger'
-	),
-	'debug' => true,
-	'netVolumesSessionKey' => 'netVolumes',
-	'roots' => array(
-		array(
-			'driver'     => 'LocalFileSystem',
-			'path'       => '../files/',
-			'startPath'  => '../files/test/',
-			'URL'        => dirname($_SERVER['PHP_SELF']) . '/../files/',
-			'trashHash'  => 't1_Lw',                     // elFinder's hash of trash folder
-			'winHashFix' => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
-			// 'treeDeep'   => 3,
-			// 'alias'      => 'File system',
-			'mimeDetect' => 'internal',
-			'tmbPath'    => '.tmb',
-			'utf8fix'    => true,
-			'tmbCrop'    => false,
-			'tmbBgColor' => 'transparent',
-			'accessControl' => 'access',
-			'acceptedName'    => '/^[^\.].*$/',
-			// 'disabled' => array('extract', 'archive'),
-			// 'tmbSize' => 128,
-			'attributes' => array(
-				array(
-					'pattern' => '/\.js$/',
-					'read' => true,
-					'write' => false
-				),
-				array(
-					'pattern' => '/^\/icons$/',
-					'read' => true,
-					'write' => false
-				)
-			),
-			'uploadDeny'  => array('all'),                // All Mimetypes not allowed to upload
-			'uploadAllow' => array('image/x-ms-bmp', 'image/gif', 'image/jpeg', 'image/png', 'image/x-icon', 'text/plain'), // Mimetype `image` and `text/plain` allowed to upload
-			'uploadOrder' => array('deny', 'allow'),      // allowed Mimetype `image` and `text/plain` only
-		),
-		// Trash volume
-		array(
-			'id'            => '1',
-			'driver'        => 'Trash',
-			'path'          => '../files/.trash/',
-			'tmbURL'        => dirname($_SERVER['PHP_SELF']) . '/../files/.trash/.tmb/',
-			'winHashFix'    => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
-			'uploadDeny'    => array('all'),                // Recomend the same settings as the original volume that uses the trash
-			'uploadAllow'   => array('image/x-ms-bmp', 'image/gif', 'image/jpeg', 'image/png', 'image/x-icon', 'text/plain'), // Same as above
-			'uploadOrder'   => array('deny', 'allow'),      // Same as above
-			'accessControl' => 'access',                    // Same as above
-		),
-		// array(
-		// 	'driver'     => 'LocalFileSystem',
-		// 	'path'       => '../files2/',
-		// 	// 'URL'        => dirname($_SERVER['PHP_SELF']) . '/../files2/',
-		// 	'alias'      => 'File system',
-		//	'winHashFix' => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
-		// 	'mimeDetect' => 'internal',
-		// 	'tmbPath'    => '.tmb',
-		// 	'utf8fix'    => true,
-		// 	'tmbCrop'    => false,
-		// 	'startPath'  => '../files/test',
-		// 	// 'separator' => ':',
-		// 	'attributes' => array(
-		// 		array(
-		// 			'pattern' => '~/\.~',
-		// 			// 'pattern' => '/^\/\./',
-		// 			'read' => false,
-		// 			'write' => false,
-		// 			'hidden' => true,
-		// 			'locked' => false
-		// 		),
-		// 		array(
-		// 			'pattern' => '~/replace/.+png$~',
-		// 			// 'pattern' => '/^\/\./',
-		// 			'read' => false,
-		// 			'write' => false,
-		// 			// 'hidden' => true,
-		// 			'locked' => true
-		// 		)
-		// 	),
-		// 	// 'defaults' => array('read' => false, 'write' => true)
-		// ),
-		
-		// array(
-		// 	'driver' => 'FTP',
-		// 	'host' => '192.168.1.38',
-		// 	'user' => 'dio',
-		// 	'pass' => 'hane',
-		// 	'path' => '/Users/dio/Documents',
-		// 	'tmpPath' => '../files/ftp',
-		// 	'utf8fix' => true,
-		// 	'attributes' => array(
-		// 		array(
-		// 			'pattern' => '~/\.~',
-		// 			'read' => false,
-		// 			'write' => false,
-		// 			'hidden' => true,
-		// 			'locked' => false
-		// 		),
-		// 		
-		// 	)
-		// ),
-		//array(
-		//	'driver' => 'FTP',
-		//	'host' => 'work.std42.ru',
-		//	'user' => 'dio',
-		//	'pass' => 'wallrus',
-		//	'path' => '/',
-		//	'tmpPath' => '../files/ftp',
-		//),
-		// array(
-		// 	'driver' => 'FTP',
-		// 	'host' => '10.0.1.3',
-		// 	'user' => 'frontrow',
-		// 	'pass' => 'frontrow',
-		// 	'path' => '/',
-		// 	'tmpPath' => '../files/ftp',
-		// ),
-		
-		// array(
-		// 	'driver'     => 'LocalFileSystem',
-		// 	'path'       => '../files2/',
-		// 	'URL'        => dirname($_SERVER['PHP_SELF']) . '/../files2/',
-		//	'winHashFix' => DIRECTORY_SEPARATOR !== '/', // to make hash same to Linux one on windows too
-		// 	'alias'      => 'Files',
-		// 	'mimeDetect' => 'internal',
-		// 	'tmbPath'    => '.tmb',
-		// 	// 'copyOverwrite' => false,
-		// 	'utf8fix'    => true,
-		// 	'attributes' => array(
-		// 		array(
-		// 			'pattern' => '~/\.~',
-		// 			// 'pattern' => '/^\/\./',
-		// 			// 'read' => false,
-		// 			// 'write' => false,
-		// 			'hidden' => true,
-		// 			'locked' => false
-		// 		),
-		// 	)
-		// ),
-		
-		// array(
-		// 	'driver' => 'MySQL',
-		// 	'path' => 1,
-		// 	// 'treeDeep' => 2,
-		// 	// 'socket'          => '/opt/local/var/run/mysql5/mysqld.sock',
-		// 	'user' => 'root',
-		// 	'pass' => 'hane',
-		// 	'db' => 'elfinder',
-		// 	'user_id' => 1,
-		// 	// 'accessControl' => 'access',
-		// 	// 'separator' => ':',
-		// 	'tmbCrop'         => true,
-		// 	// thumbnails background color (hex #rrggbb or 'transparent')
-		// 	'tmbBgColor'      => '#000000',
-		// 	'files_table' => 'elfinder_file',
-		// 	// 'imgLib' => 'imagick',
-		// 	// 'uploadOverwrite' => false,
-		// 	// 'copyTo' => false,
-		// 	// 'URL'    => 'http://localhost/git/elfinder',
-		// 	'tmpPath' => '../filesdb/tmp',
-		// 	'tmbPath' => '../filesdb/tmb',
-		// 	'tmbURL' => dirname($_SERVER['PHP_SELF']) . '/../filesdb/tmb/',
-		// 	// 'attributes' => array(
-		// 	// 	array(),
-		// 	// 	array(
-		// 	// 		'pattern' => '/\.jpg$/',
-		// 	// 		'read' => false,
-		// 	// 		'write' => false,
-		// 	// 		'locked' => true,
-		// 	// 		'hidden' => true
-		// 	// 	)
-		// 	// )
-		// 	
-		// ),
-
-		// Sample cloud drive: Dropbox (require Dropbox API - see above)
-		// if the drive shall be permanent use following options
-		// array(
-		//	'driver'	    => 'Dropbox2',
-		//	'consumerKey'	=> 'YOUR_KEY_HERE',
-		//	'consumerSecret'=> 'YOUR_SECRET_HERE',
-		//	'access_token'	=> 'YOUR_ACCESS_TOKEN_HERE', // require for permanent mount
-		//	'path'		    => '/',
-		// ),
-	)
-		
-);
-
-
-
-// sleep(3);
-header('Access-Control-Allow-Origin: *');
-$connector = new elFinderConnector(new elFinder($opts), true);
-$connector->run();
-
-// echo '<pre>';
-// print_r($connector);