show Environment<4K error

fix: ionicons svg 404 error and Cannot read property 'focus' of null

.htaccess

@@ -9,8 +9,23 @@ RewriteRule ^(.*) index.php?/$1 [L]
 ### nginx
 # rewrite ^/(?!.well-known)(.*)$ /index.php?/$1 last;
 #
+### nginx Subdirectory 在子目录中使用
+# location /OneManager2/ {
+#  rewrite ^/(.*)$ /OneManager2/index.php?/$1 last;
+# }
+#
 ### caddy
 # rewrite {
 #     to index.php?/$1
 # }
+#
+### caddy2 Caddyfile
+# @try_files {
+#     not path /.well-known/*
+#     file {
+#         try_files index.php
+#     }
+# }
+# rewrite @try_files {http.matchers.file.relative}
+#
 ###-----------------------------------

CFWorkers.js

@@ -0,0 +1,90 @@
+
+// odd, 单日
+const SingleDay = 'https://aaa1.herokuapp.com'
+// even, 双日
+const DoubleDay = 'https://bbb2.herokuapp.com'
+
+//const SingleDay = 'https://153xxxxx0.cn-hongkong.fc.aliyuncs.com/2016-08-15/proxy/onedrive/xxx/'
+//const DoubleDay = 'https://153xxxxx0.cn-hongkong.fc.aliyuncs.com/2016-08-15/proxy/onedrive/xxx/'
+
+// CF proxy all, 一切给CF代理，true/false
+const CFproxy = true
+
+// Used in cloudflare workers, odd or even days point to 2 heroku account.
+
+// 由于heroku不绑卡不能自定义域名，就算绑卡后https也不方便
+// 另外免费套餐每月550小时，有些人不够用
+// 于是在CF Workers使用此代码，分单双日拉取不同heroku帐号下的相同网页
+// 只改上面，下面不用动
+
+addEventListener('fetch', event => {
+    let url=new URL(event.request.url);
+    if (url.protocol == 'http:') {
+        url.protocol = 'https:'
+        event.respondWith( Response.redirect(url.href) )
+    } else {
+        let response = null;
+        let nd = new Date();
+        if (nd.getDate()%2) {
+            host = SingleDay
+        } else {
+            host = DoubleDay
+        }
+        if (host.substr(0, 7)!='http://'&&host.substr(0, 8)!='https://') host = 'http://' + host;
+
+        response = fetchAndApply(host, event.request);
+
+        event.respondWith( response );
+    }
+})
+
+async function fetchAndApply(host, request) {
+    let f_url = new URL(request.url);
+    let a_url = new URL(host);
+    let replace_path = a_url.pathname;
+    if (replace_path.substr(replace_path.length-1)!='/') replace_path += '/';
+    let replaced_path = '/';
+    let query = f_url.search;
+    let path = f_url.pathname;
+    if (host.substr(host.length-1)=='/') path = path.substr(1);
+    f_url.href = host + path + query;
+
+    let response = null;
+    if (!CFproxy) {
+        response = await fetch(f_url, request);
+    } else {
+        let method = request.method;
+        let body = request.body;
+        let request_headers = request.headers;
+        let new_request_headers = new Headers(request_headers);
+        new_request_headers.set('Host', f_url.host);
+        new_request_headers.set('Referer', request.url);
+
+        response = await fetch(f_url.href, {
+            method: method,
+            body: body,
+            headers: new_request_headers
+        });
+    }
+
+    let out_headers = new Headers(response.headers);
+    if (out_headers.get('Content-Disposition')=='attachment') out_headers.delete('Content-Disposition');
+    let out_body = null;
+    let contentType = out_headers.get('Content-Type');
+    if (contentType.includes("application/text")) {
+        out_body = await response.text();
+        while (out_body.includes(replace_path)) out_body = out_body.replace(replace_path, replaced_path);
+    } else if (contentType.includes("text/html")) {
+        out_body = await response.text();
+        while (replace_path!='/'&&out_body.includes(replace_path)) out_body = out_body.replace(replace_path, replaced_path);
+    } else {
+        out_body = await response.body;
+    }
+
+    let out_response = new Response(out_body, {
+        status: response.status,
+        headers: out_headers
+    })
+
+    return out_response;
+}

disk/Aliyundrive.php

@@ -0,0 +1,869 @@
+<?php
+
+class Aliyundrive {
+    protected $access_token;
+    protected $disktag;
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        //$this->auth_url = 'https://websv.aliyundrive.com/token/refresh';
+        $this->auth_url = 'https://auth.aliyundrive.com/v2/account/token';
+        $this->api_url = 'https://api.aliyundrive.com/v2';
+        $this->driveId = getConfig('driveId', $tag);
+        $res = $this->get_access_token(getConfig('refresh_token', $tag));
+    }
+    
+    public function isfine()
+    {
+        if (!$this->access_token) return false;
+        else return true;
+    }
+    public function show_base_class()
+    {
+        return get_class();
+        //$tmp[0] = get_class();
+        //$tmp[1] = get_class($this);
+        //return $tmp;
+    }
+
+    public function ext_show_innerenv()
+    {
+        return ['driveId'];
+    }
+
+    public function list_files($path = '/')
+    {
+
+        $files = $this->list_path($path);
+
+        return $this->files_format($files);
+    }
+
+    protected function files_format($files)
+    {
+        //return $files;
+        if ($files['type']=='file') {
+            $tmp['type'] = 'file';
+            $tmp['id'] = $files['file_id'];
+            if (isset($files['name'])) $tmp['name'] = $files['name'];
+            elseif (isset($files['file_name'])) $tmp['name'] = $files['file_name'];
+            $tmp['time'] = $files['updated_at'];
+            $tmp['size'] = $files['size'];
+            $tmp['mime'] = $files['file']['mimeType'];
+            $tmp['url'] = $files['download_url'];
+            $tmp['content'] = $files['content'];
+            if (isset($files['exist'])) $tmp['exist'] = $files['exist'];
+            if (isset($files['rapid_upload'])) $tmp['rapid_upload'] = $files['rapid_upload'];
+        } elseif ($files['type']=='folder'||isset($files['items'])) {
+            $tmp['type'] = 'folder';
+            $tmp['id'] = $files['file_id'];
+            if (isset($files['name'])) $tmp['name'] = $files['name'];
+            elseif (isset($files['file_name'])) $tmp['name'] = $files['file_name'];
+            $tmp['time'] = $files['updated_at'];
+            $tmp['size'] = $files['size'];
+            //$tmp['page'] = $files['folder']['page'];
+            foreach ($files['items'] as $file) {
+                $filename = strtolower($file['name']);
+                if ($file['type']=='file') {
+                    $tmp['list'][$filename]['type'] = 'file';
+                    $tmp['list'][$filename]['url'] = $file['download_url'];
+                    $tmp['list'][$filename]['mime'] = $file['file']['content_type'];
+                } elseif ($file['type']=='folder') {
+                    $tmp['list'][$filename]['type'] = 'folder';
+                }
+                //$tmp['id'] = $file['parent_file_id'];
+                $tmp['list'][$filename]['id'] = $file['file_id'];
+                $tmp['list'][$filename]['name'] = $file['name'];
+                $tmp['list'][$filename]['time'] = $file['updated_at'];
+                $tmp['list'][$filename]['size'] = $file['size'];
+                //$tmp['childcount']++;
+            }
+        } elseif (isset($files['code'])||isset($files['error'])) {
+            return $files;
+        }
+        //error_log1(json_encode($tmp));
+        return $tmp;
+    }
+
+    protected function list_path($path = '/')
+    {
+        global $exts;
+        while (substr($path, -1)=='/') $path = substr($path, 0, -1);
+        if ($path == '') $path = '/';
+        if (!($files = getcache('path_' . $path, $this->disktag))) {
+            if ($path == '/' || $path == '') {
+                $files = $this->fileList('root');
+                //error_log1('root_id' . $files['id']);
+                $files['file_id'] = 'root';
+                $files['type'] = 'folder';
+            } else {
+                $tmp = splitlast($path, '/');
+                $parent_path = $tmp[0];
+                $filename = urldecode($tmp[1]);
+                $parent_folder = $this->list_path($parent_path);
+                foreach ($parent_folder['items'] as $item) {
+                    if ($item['name']==$filename) {
+                        if ($item['type']=='folder') {
+                            $files = $this->fileList($item['file_id']);
+                            $files['type'] = 'folder';
+                            $files['file_id'] = $item['file_id'];
+                            $files['name'] = $item['name'];
+                            $files['time'] = $item['updated_at'];
+                            $files['size'] = $item['size'];
+                        } else $files = $item;
+                    }
+                }
+                //echo $files['name'];
+            }
+            if ($files['type']=='file') {
+                if (in_array(strtolower(splitlast($files['name'],'.')[1]), $exts['txt'])) {
+                    if ($files['size']<1024*1024) {
+                        if (!(isset($files['content'])&&$files['content']['stat']==200)) {
+                            $header['Referer'] = 'https://www.aliyundrive.com/';
+                            $header['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36';
+                            $content1 = curl('GET', $files['download_url'], '', $header);
+                            $tmp = null;
+                            $tmp = json_decode(json_encode($content1), true);
+                            if ($tmp['body']===null) {
+                                $tmp['body'] = iconv("GBK", 'UTF-8//TRANSLIT', $content1['body']);
+                                $tmp = json_decode(json_encode($tmp), true);
+                                if ($tmp['body']!==null) $content1['body'] = $tmp['body'];
+                            }
+                            //error_log1('body : ' . $content1['body'] . PHP_EOL);
+                            $files['content'] = $content1;
+                            savecache('path_' . $path, $files, $this->disktag);
+                        }
+                    } else {
+                        $files['content']['stat'] = 202;
+                        $files['content']['body'] = 'File too large.';
+                    }
+                    //error_log1($files['name'] . ' : ' . json_encode($files['content']) . PHP_EOL);
+                }
+            }
+            if (!$files) {
+                $files['error']['code'] = 'Not Found';
+                $files['error']['message'] = $path . ' Not Found';
+                $files['error']['stat'] = 404;
+            } elseif (isset($files['stat'])) {
+                $files['error']['stat'] = $files['stat'];
+                $files['error']['code'] = 'Error';
+                $files['error']['message'] = $files['body'];
+                unset($files['file_id']);
+                unset($files['type']);
+            } elseif (isset($files['code'])) {
+                $files['error']['stat'] = 500;
+                $files['error']['code'] = $files['code'];
+                $files['error']['message'] = $files['message'];
+                unset($files['file_id']);
+                unset($files['type']);
+            } else {
+                savecache('path_' . $path, $files, $this->disktag, 600);
+            }
+        }
+        //error_log1('path:' . $path . ', files:' . substr(json_encode($files), 0, 150));
+        //error_log1('path:' . $path . ', files:' . json_encode($files));
+        return $files;
+    }
+
+    protected function fileGet($file_id)
+    {
+        $url = $this->api_url . '/file/get';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['drive_id'] = $this->driveId;
+        $data['file_id'] = $file_id;
+
+        $res = curl('POST', $url, json_encode($data), $header);
+        if ($res['stat']==200) return json_decode($res['body'], true);
+        else return $res;
+    }
+    protected function fileList($parent_file_id)
+    {
+        $url = $this->api_url . '/file/list';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['limit'] = 200;
+        $data['marker'] = null;
+        $data['drive_id'] = $this->driveId;
+        $data['parent_file_id'] = $parent_file_id;
+        $data['image_thumbnail_process'] = 'image/resize,w_160/format,jpeg';
+        $data['image_url_process'] = 'image/resize,w_1920/format,jpeg';
+        $data['video_thumbnail_process'] = 'video/snapshot,t_0,f_jpg,w_300';
+        $data['fields'] = '*';
+        $data['order_by'] = 'updated_at';
+        $data['order_direction'] = 'DESC';
+
+        $res = curl('POST', $url, json_encode($data), $header);
+        //error_log1($res['stat'] . $res['body']);
+        if ($res['stat']==200) {
+            $body = json_decode($res['body'], true);
+            $body1 = $body;
+            while ($body1['next_marker']!='') {
+                $data['marker'] = $body1['next_marker'];
+                $res1 = null;
+                $res1 = curl('POST', $url, json_encode($data), $header);
+                $body1 = json_decode($res1['body'], true);
+                $body['items'] = array_merge($body['items'], $body1['items']);
+            }
+            return $body;
+            //return json_decode($res['body'], true);
+        }
+        else return $res;
+    }
+
+    public function Rename($file, $newname) {
+        $url = $this->api_url . '/file/update';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['check_name_mode'] = 'refuse';
+        $data['drive_id'] = $this->driveId;
+        $data['file_id'] = $file['id'];
+        $data['name'] = $newname;
+        //$data['parent_file_id'] = 'root';
+
+        $result = curl('POST', $url, json_encode($data), $header);
+        //savecache('path_' . $file['path'], json_decode('{}',true), $this->disktag, 1);
+        //error_log1('decode:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        //return output($result['body'], $result['stat']);
+    }
+    public function Delete($file) {
+        $url = $this->api_url . '/batch';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['resource'] = 'file';
+        $data['requests'][0]['url'] = '/file/delete';
+        $data['requests'][0]['method'] = 'DELETE';
+        $data['requests'][0]['id'] = $file['id'];
+        $data['requests'][0]['headers']['Content-Type'] = 'application/json';
+        $data['requests'][0]['body']['drive_id'] = $this->driveId;
+        $data['requests'][0]['body']['file_id'] = $file['id'];
+
+        $result = curl('POST', $url, json_encode($data), $header);
+        //savecache('path_' . $file['path'], json_decode('{}',true), $this->disktag, 1);
+        //error_log1('result:' . json_encode($result));
+        //return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        $res = json_decode($result['body'], true)['responses'][0];
+        if (isset($res['status'])) return output($res['id'], $res['status']);
+        else return output($result['body'], $result['stat']);
+    }
+    public function Encrypt($folder, $passfilename, $pass) {
+        $existfile = $this->list_path($folder['path'] . '/' . $passfilename);
+        if (isset($existfile['type'])) { // 删掉原文件
+            $this->Delete(['id'=>$existfile['file_id']]);
+        }
+        if ($pass==='') {
+            // 如果为空，上面已经删除了
+            return output('Success', 200);
+        }
+        if (!$folder['id']) {
+            $res = $this->list_path($folder['path']);
+            //error_log1('res:' . json_encode($res));
+            $folder['id'] = $res['file_id'];
+        }
+        $tmp = '/tmp/' . $passfilename;
+        file_put_contents($tmp, $pass);
+
+        $result = $this->tmpfileCreate($folder['id'], $tmp, $passfilename);
+
+        if ($result['stat']==201) {
+            //error_log1('1,url:' . $url .' res:' . json_encode($result));
+            $res = json_decode($result['body'], true);
+            $url = $res['part_info_list'][0]['upload_url'];
+            if (!$url) { // 无url，应该算秒传
+                return output('no up url', 200);
+            }
+            $file_id = $res['file_id'];
+            $upload_id = $res['upload_id'];
+            $result = curl('PUT', $url, $pass, [], 1);
+            if ($result['stat']==200) { // 块1传好
+                $result = $this->fileComplete($file_id, $upload_id, [ $result['returnhead']['ETag'] ]);
+                return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+            }
+        }
+        //error_log1('2,url:' . $url .' res:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Move($file, $folder) {
+        if (!$folder['id']) {
+            $res = $this->list_path($folder['path']);
+            //error_log1('res:' . json_encode($res));
+            $folder['id'] = $res['file_id'];
+        }
+
+        $url = $this->api_url . '/batch';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['resource'] = 'file';
+        $data['requests'][0]['url'] = '/file/move';
+        $data['requests'][0]['method'] = 'POST';
+        $data['requests'][0]['id'] = $file['id'];
+        $data['requests'][0]['headers']['Content-Type'] = 'application/json';
+        $data['requests'][0]['body']['drive_id'] = $this->driveId;
+        $data['requests'][0]['body']['file_id'] = $file['id'];
+        $data['requests'][0]['body']['auto_rename'] = true;
+        $data['requests'][0]['body']['to_parent_file_id'] = $folder['id'];
+
+        $result = curl('POST', $url, json_encode($data), $header);
+        //savecache('path_' . $file['path'], json_decode('{}',true), $this->disktag, 1);
+        //error_log1('result:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Copy($file) {
+        if (!$file['id']) {
+            $oldfile = $this->list_path($file['path'] . '/' . $file['name']);
+            //error_log1('res:' . json_encode($res));
+            //$file['id'] = $res['file_id'];
+        } else {
+            $oldfile = $this->fileGet($file['id']);
+        }
+
+        $url = $this->api_url . '/file/create';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['check_name_mode'] = 'auto_rename'; // ignore, auto_rename, refuse.
+        $data['content_hash'] = $oldfile['content_hash'];
+        $data['content_hash_name'] = 'sha1';
+        $data['content_type'] = $oldfile['content_type'];
+        $data['drive_id'] = $this->driveId;
+        $data['ignoreError'] = false;
+        $data['name'] = $oldfile['name'];
+        $data['parent_file_id'] = $oldfile['parent_file_id'];
+        $data['part_info_list'][0]['part_number'] = 1;
+        $data['size'] = $oldfile['size'];
+        $data['type'] = 'file';
+
+        $result = curl('POST', $url, json_encode($data), $header);
+
+        if ($result['stat']==201) {
+            //error_log1('1,url:' . $url .' res:' . json_encode($result));
+            $res = json_decode($result['body'], true);
+            $url = $res['part_info_list'][0]['upload_url'];
+            if (!$url) { // 无url，应该算秒传
+                return output('no up url', 200);
+            } else {
+                return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+            }
+            /*$file_id = $res['file_id'];
+            $upload_id = $res['upload_id'];
+            $result = curl('PUT', $url, $content, [], 1);
+            if ($result['stat']==200) { // 块1传好
+                $etag = $result['returnhead']['ETag'];
+                $result = $this->fileComplete($file_id, $upload_id, [ $etag ]);
+                if ($result['stat']!=200) return output($result['body'], $result['stat']);
+                else return output('success', 0);
+            }*/
+        }
+        //error_log1('2,url:' . $url .' res:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Edit($file, $content) {
+        $tmp = splitlast($file['path'], '/');
+        $folderpath = $tmp[0];
+        $filename = $tmp[1];
+        $existfile = $this->list_path($file['path']);
+        if (isset($existfile['type'])) { // 删掉原文件
+            $this->Delete(['id'=>$existfile['file_id']]);
+        }
+        $tmp1 = '/tmp/' . $filename;
+        file_put_contents($tmp1, $content);
+
+        $result = $this->tmpfileCreate($this->list_path($folderpath)['file_id'], $tmp1, $filename);
+
+        if ($result['stat']==201) {
+            //error_log1('1,url:' . $url .' res:' . json_encode($result));
+            $res = json_decode($result['body'], true);
+            $url = $res['part_info_list'][0]['upload_url'];
+            if (!$url) { // 无url，应该算秒传
+                return output('no up url', 0);
+            }
+            $file_id = $res['file_id'];
+            $upload_id = $res['upload_id'];
+            $result = curl('PUT', $url, $content, [], 1);
+            if ($result['stat']==200) { // 块1传好
+                $result = $this->fileComplete($file_id, $upload_id, [ $result['returnhead']['ETag'] ]);
+                if ($result['stat']!=200) return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+                else return output('success', 0);
+            }
+        }
+        //error_log1('2,url:' . $url .' res:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Create($folder, $type, $name, $content = '') {
+        if (!$folder['id']) {
+            $res = $this->list_path($folder['path']);
+            //error_log1('res:' . json_encode($res));
+            $folder['id'] = $res['file_id'];
+        }
+        if ($type=='folder') {
+            $result = $this->folderCreate($folder['id'], $name);
+            //error_log1('res:' . json_encode($result));
+            return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        }
+        if ($type=='file') {
+            $tmp = '/tmp/' . $name;
+            file_put_contents($tmp, $content);
+
+            $result = $this->tmpfileCreate($folder['id'], $tmp, $name);
+
+            if ($result['stat']==201) {
+                //error_log1('1,url:' . $url .' res:' . json_encode($result));
+                $res = json_decode($result['body'], true);
+                if (isset($res['exist'])&&$res['exist']!=false) {
+                    // 已经有
+                    //error_log1('exist:' . json_encode($res));
+                    return output('{"type":"file","name":"' . $name . '", "exist":true}', 200);
+                }
+                if (isset($res['rapid_upload'])&&$res['rapid_upload']!=false) {
+                    // 秒传
+                    //error_log1('rapid up:' . json_encode($res));
+                    return output('{"type":"file","name":"' . $name . '", "rapid_upload":true}', 200);
+                }
+                $url = $res['part_info_list'][0]['upload_url'];
+                $file_id = $res['file_id'];
+                $upload_id = $res['upload_id'];
+                $result = curl('PUT', $url, $content, [], 1);
+                //error_log1('2,url:' . $url .' res:' . json_encode($result));
+                if ($result['stat']==200) { // 块1传好
+                    $result = $this->fileComplete($file_id, $upload_id, [ $result['returnhead']['ETag'] ]);
+                    //error_log1('3,url:' . $url .' res:' . json_encode($result));
+                    return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+                }
+            }
+            //error_log1('4,url:' . $url .' res:' . json_encode($result));
+            return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        }
+        return output('Type not folder or file.', 500);
+    }
+
+    protected function folderCreate($parentId, $folderName) {
+        if (strrpos($folderName, '/')) {
+            $tmp = splitlast($folderName, '/');
+            $parentId = json_decode($this->folderCreate($parentId, $tmp[0])['body'], true)['file_id'];
+            $folderName = $tmp[1];
+        }
+        $url = $this->api_url . '/file/create';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['check_name_mode'] = 'refuse'; // ignore, auto_rename, refuse.
+        $data['drive_id'] = $this->driveId;
+        $data['name'] = $folderName;
+        $data['parent_file_id'] = $parentId;
+        $data['type'] = 'folder';
+
+        return curl('POST', $url, json_encode($data), $header);
+    }
+    protected function fileCreate($parentId, $fileName, $sha1, $size, $part_number) {
+        $url = $this->api_url . '/file/create';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+    
+        $data['check_name_mode'] = 'refuse'; // ignore, auto_rename, refuse.
+        $data['content_hash'] = $sha1;
+        $data['content_hash_name'] = 'sha1';
+        $data['content_type'] = '';
+        $data['drive_id'] = $this->driveId;
+        $data['ignoreError'] = false;
+        $data['name'] = $fileName;
+        $data['parent_file_id'] = $parentId;
+        for ($i=0;$i<$part_number;$i++) {
+            $data['part_info_list'][$i]['part_number'] = $i+1;
+        }
+        $data['size'] = (int)$size;
+        $data['type'] = 'file';
+
+        return curl('POST', $url, json_encode($data), $header);
+    }
+    protected function tmpfileCreate($parentId, $tmpFilePath, $tofileName = '') {
+        $sha1 = sha1_file($tmpFilePath);
+        if ($tofileName == '') $tofileName = splitlast($tmpFilePath, '/')[1];
+        $url = $this->api_url . '/file/create';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['check_name_mode'] = 'refuse'; // ignore, auto_rename, refuse.
+        $data['content_hash'] = $sha1;
+        $data['content_hash_name'] = 'sha1';
+        $data['content_type'] = 'text/plain'; // now only txt
+        $data['drive_id'] = $this->driveId;
+        $data['ignoreError'] = false;
+        $data['name'] = $tofileName;
+        $data['parent_file_id'] = $parentId;
+        $data['part_info_list'][0]['part_number'] = 1; // now only txt
+        $data['size'] = filesize($tmpFilePath);
+        $data['type'] = 'file';
+
+        return curl('POST', $url, json_encode($data), $header);
+    }
+    protected function fileComplete($file_id, $upload_id, $etags) {
+        $url = $this->api_url . '/file/complete';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+
+        $data['drive_id'] = $this->driveId;
+        $data['file_id'] = $file_id;
+        $data['ignoreError'] = false;
+        $i = 0;
+        foreach ($etags as $etag) {
+            $data['part_info_list'][$i]['part_number'] = $i + 1;
+            $data['part_info_list'][$i]['etag'] = $etag;
+            $i++;
+        }
+        $data['upload_id'] = $upload_id;
+
+        return curl('POST', $url, json_encode($data), $header);
+    }
+
+    public function get_thumbnails_url($path = '/')
+    {
+        $res = $this->list_path($path);
+        $thumb_url = $res['thumbnail'];
+        return $thumb_url;
+    }
+    public function bigfileupload($path)
+    {
+        if (isset($_POST['uploadid'])) {
+            // Complete
+            $result = $this->fileComplete($_POST['fileid'], $_POST['uploadid'], json_decode($_POST['etag'], true));
+            return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        } else {
+            if ($_POST['upbigfilename']=='') return output('error: no file name', 400);
+            if (!is_numeric($_POST['filesize'])) return output('error: no file size', 400);
+            if (!isset($_POST['filesha1'])) return output('error: no file sha1', 400);
+
+            $tmp = splitlast($_POST['upbigfilename'], '/');
+            if ($tmp[1]!='') {
+                $fileinfo['name'] = $tmp[1];
+                if ($_SERVER['admin']) $fileinfo['path'] = $tmp[0];
+            } else {
+                $fileinfo['name'] = $_POST['upbigfilename'];
+            }
+            $fileinfo['size'] = $_POST['filesize'];
+            $fileinfo['filelastModified'] = $_POST['filelastModified'];
+            if ($_SERVER['admin']) {
+                $filename = $fileinfo['name'];
+            } else {
+                $tmp1 = splitlast($fileinfo['name'], '.');
+                if ($tmp1[0]==''||$tmp1[1]=='') $filename = $_POST['filesha1'];
+                else $filename = $_POST['filesha1'] . '.' . $tmp1[1];
+            }
+
+            $parent = $this->list_path($path . '/' . $fileinfo['path']);
+            if (isset($parent['file_id'])) {
+                $parent_file_id = $parent['file_id'];
+            } else {
+                $res = $this->folderCreate($this->list_path($path)['file_id'], $fileinfo['path']);
+                //error_log1($res['body']);
+                $parent_file_id = json_decode($res['body'], true)['file_id'];
+            }
+            $response = $this->fileCreate($parent_file_id, $filename, $_POST['filesha1'], $fileinfo['size'], ceil($fileinfo['size']/$_POST['chunksize']));
+            $res = json_decode($response['body'], true);
+            if (isset($res['exist'])) {
+                // 已经有
+                //error_log1('exist:' . json_encode($res));
+                return output(json_encode($this->files_format(json_decode($response['body'], true))), $response['stat']);
+                //return output('{"type":"file","name":"' . $_POST['upbigfilename'] . '", "exist":true}', 200);
+            }
+            if (isset($res['rapid_upload'])&&$res['rapid_upload']!=false) {
+                // 秒传
+                //error_log1('rapid up:' . json_encode($res));
+                return output(json_encode($this->files_format(json_decode($response['body'], true))), $response['stat']);
+                //return output('{"type":"file","name":"' . $_POST['upbigfilename'] . '", "rapid upload":true}', 200);
+            }
+            //if ($response['stat']<500) {
+            //    $responsearry = json_decode($response['body'], true);
+            //    if (isset($responsearry['error'])) return output($response['body'], $response['stat']);
+            //    $fileinfo['uploadUrl'] = $responsearry['uploadUrl'];
+            //    if ($fileinfo['size']>10*1024*1024) $this->MSAPI('PUT', path_format($path . '/' . $cachefilename), json_encode($fileinfo, JSON_PRETTY_PRINT), $this->access_token);
+            //}
+            return output($response['body'], $response['stat']);
+        }
+    }
+
+    public function AddDisk() {
+        global $constStr;
+        global $EnvConfigs;
+
+        $envs = '';
+        foreach ($EnvConfigs as $env => $v) if (isCommonEnv($env)) $envs .= '\'' . $env . '\', ';
+        $url = path_format($_SERVER['PHP_SELF'] . '/');
+
+        if (isset($_GET['Finish'])) {
+            if ($this->access_token == '') {
+                $refresh_token = getConfig('refresh_token', $this->disktag);
+                if (!$refresh_token) {
+                    $html = 'No refresh_token config, please AddDisk again or wait minutes.<br>' . $this->disktag;
+                    $title = 'Error';
+                    return message($html, $title, 201);
+                }
+                $response = $this->get_access_token($refresh_token);
+                if (!$response) return message($this->error['body'], 'Error', $this->error['stat']);
+            }
+            $tmp = null;
+            if ($_POST['driveId']!='') {
+                $tmp['driveId'] = $_POST['driveId'];
+            } else {
+                return message('no driveId', 'Error', 201);
+            }
+
+            $response = setConfigResponse( setConfig($tmp, $this->disktag) );
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 201);
+            } else {
+                $str .= '
+<script>
+    var status = "' . $response['status'] . '";
+    var uploadList = setInterval(function(){
+        if (document.getElementById("dis").style.display=="none") {
+            console.log(min++);
+        } else {
+            clearInterval(uploadList);
+            location.href = "' . $url . '";
+        }
+    }, 1000);
+</script>';
+                return message($str, getconstStr('WaitJumpIndex'), 201, 1);
+            }
+        }
+        if (isset($_GET['SelectDrive'])) {
+            if ($this->access_token == '') {
+                if (isset($_POST['refresh_token'])) {
+                    $res = curl('POST', $this->auth_url, json_encode([ 'refresh_token' => $_POST['refresh_token'], 'grant_type' => 'refresh_token' ]), ["content-type"=>"application/json; charset=utf-8"]);
+                    //return output($res['body']);
+                    if ($res['stat']!=200) {
+                        return message($res['body'], $res['stat'], $res['stat']);
+                    }
+                    //var_dump($res['body']);
+                    $result = json_decode($res['body'], true);
+
+                    $tmp = null;
+                    $tmp['refresh_token'] = $result['refresh_token'];
+                    $tmp['token_expires'] = time()+3*24*60*60;
+                    $tmp['Driver'] = 'Aliyundrive';
+                    //error_log(json_encode($tmp));
+
+                    $response = setConfigResponse( setConfig($tmp, $this->disktag) );
+                    if (api_error($response)) {
+                        $html = api_error_msg($response);
+                        $title = 'Error';
+                        return message($html, $title, 201);
+                    }
+                    savecache('access_token', $result['access_token'], $this->disktag, $result['expires_in'] - 60);
+                } else {
+                    $refresh_token = getConfig('refresh_token', $this->disktag);
+                    if (!$refresh_token) {
+                        $html = 'No refresh_token config, please AddDisk again or wait minutes.<br>' . $this->disktag;
+                        $title = 'Error';
+                        return message($html, $title, 201);
+                    }
+                    $response = $this->get_access_token($refresh_token);
+                    if (!$response) return message($this->error['body'], 'Error', $this->error['stat']);
+                }
+            }
+            if (!isset($result['default_drive_id'])) {
+                $res = curl('POST', $this->auth_url, json_encode([ 'refresh_token' => getConfig('refresh_token', $this->disktag), 'grant_type' => 'refresh_token' ]), ["content-type"=>"application/json; charset=utf-8"]);
+                    //return output($res['body']);
+                if ($res['stat']!=200) {
+                    return message($res['body'], $res['stat'], $res['stat']);
+                }
+                    //var_dump($res['body']);
+                $result = json_decode($res['body'], true);
+            }
+
+            //$tmp = null;
+            //$tmp['driveId'] = $result['default_drive_id'];
+                //$tmp['default_sbox_drive_id'] = $result['default_sbox_drive_id'];
+            $title = 'Select Driver';
+            $html = '
+<div>
+    <form action="?Finish&disktag=' . $_GET['disktag'] . '&AddDisk=' . get_class($this) . '" method="post" onsubmit="return notnull(this);">
+        <label><input type="radio" name="driveId" value="' . $result['default_drive_id'] . '"' . ($result['default_drive_id']==$this->driveId?' checked':'') . '>' . '用普通空间 ' . getconstStr(' ') . '</label><br>
+        <label><input type="radio" name="driveId" value="' . $result['default_sbox_drive_id'] . '"' . ($result['default_sbox_drive_id']==$this->driveId?' checked':'') . '>' . '用虎符文件保险箱 </label><br>
+        <input type="submit" value="' . getconstStr('Submit') . '">
+    </form>
+</div>
+<script>
+    var status = "' . $response['status'] . '";
+    function notnull(t)
+    {
+        if (t.driveId.value==\'\') {
+                alert(\'Select a Disk\');
+                return false;
+        }
+        return true;
+    }
+</script>
+    ';
+            return message($html, $title, 201, 1);
+        }
+        if (isset($_GET['install0']) && $_POST['disktag_add']!='') {
+            $_POST['disktag_add'] = preg_replace('/[^0-9a-zA-Z|_]/i', '', $_POST['disktag_add']);
+            $f = substr($_POST['disktag_add'], 0, 1);
+            if (strlen($_POST['disktag_add'])==1) $_POST['disktag_add'] .= '_';
+            if (isCommonEnv($_POST['disktag_add'])) {
+                return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>
+                <script>
+                var expd = new Date();
+                expd.setTime(expd.getTime()+1);
+                var expires = "expires="+expd.toGMTString();
+                document.cookie=\'disktag=; path=/; \'+expires;
+                </script>', 'Error', 201);
+            } elseif (!(('a'<=$f && $f<='z') || ('A'<=$f && $f<='Z'))) {
+                return message('Please start with letters<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>
+                <script>
+                var expd = new Date();
+                expd.setTime(expd.getTime()+1);
+                var expires = "expires="+expd.toGMTString();
+                document.cookie=\'disktag=; path=/; \'+expires;
+                </script>', 'Error', 201);
+            }
+
+            $tmp = null;
+            foreach ($EnvConfigs as $env => $v) if (isInnerEnv($env)) $tmp[$env] = '';
+
+            $tmp['Driver'] = 'Aliyundrive';
+            $tmp['disktag_add'] = $_POST['disktag_add'];
+            $tmp['diskname'] = $_POST['diskname'];
+            //error_log(json_encode($tmp));
+
+            $response = setConfigResponse( setConfig($tmp, $this->disktag) );
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 400);
+            } else {
+                $title = 'Refresh token';
+                $html = '
+<form action="?SelectDrive&disktag=' . $_GET['disktag'] . '&AddDisk=' . get_class($this) . '" method="post" onsubmit="return notnull(this);">
+    <div>填入refresh_token:
+        <input type="text" name="refresh_token" placeholder="自行百度如何获取' . getconstStr(' ') . '" style="width:100%"><br>
+    </div><br>
+    <input type="submit" value="' . getconstStr('Submit') . '">
+<form>
+    <script>
+        function notnull(t)
+        {
+            if (t.refresh_token.value==\'\') {
+                alert(\'Input refresh_token\');
+                return false;
+            }
+            return true;
+        }
+        var status = "' . $response['status'] . '";
+    </script>
+    ';
+                return message($html, $title, 201, 1);
+            }
+        }
+
+        $html = '
+<div>
+    <form id="form1" action="" method="post" onsubmit="return notnull(this);">
+        ' . getconstStr('DiskTag') . ': (' . getConfig('disktag') . ')
+        <input type="text" name="disktag_add" placeholder="' . getconstStr('EnvironmentsDescription')['disktag'] . '" style="width:100%"><br>
+        ' . getconstStr('DiskName') . ':
+        <input type="text" name="diskname" placeholder="' . getconstStr('EnvironmentsDescription')['diskname'] . '" style="width:100%"><br>
+        <br>
+
+        <input type="submit" value="' . getconstStr('Submit') . '">
+    </form>
+</div>
+    <script>
+        function notnull(t)
+        {
+            if (t.disktag_add.value==\'\') {
+                alert(\'' . getconstStr('DiskTag') . '\');
+                return false;
+            }
+            envs = [' . $envs . '];
+            if (envs.indexOf(t.disktag_add.value)>-1) {
+                alert("Do not input ' . $envs . '");
+                return false;
+            }
+            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+            if (!reg.test(t.disktag_add.value)) {
+                alert(\'' . getconstStr('TagFormatAlert') . '\');
+                return false;
+            }
+            
+            document.getElementById("form1").action="?install0&disktag=" + t.disktag_add.value + "&AddDisk=Aliyundrive";
+            //var expd = new Date();
+            //expd.setTime(expd.getTime()+(2*60*60*1000));
+            //var expires = "expires="+expd.toGMTString();
+            //document.cookie=\'disktag=\'+t.disktag_add.value+\'; path=/; \'+expires;
+            return true;
+        }
+    </script>';
+        $title = 'Select Account Type';
+        return message($html, $title, 201);
+    }
+    protected function get_access_token($refresh_token) {
+        if (!$refresh_token) {
+            $tmp['stat'] = 0;
+            $tmp['body'] = 'No refresh_token';
+            $this->error = $tmp;
+            return false;
+        }
+        if (!($this->access_token = getcache('access_token', $this->disktag))) {
+            $p=0;
+            $tmp1['refresh_token'] = $refresh_token;
+            $tmp1['grant_type'] = 'refresh_token';
+            while ($response['stat']==0&&$p<3) {
+                $response = curl('POST', $this->auth_url, json_encode($tmp1), ["content-type"=>"application/json; charset=utf-8"]);
+                $p++;
+            }
+            //error_log1(json_encode($response));
+            if ($response['stat']==200) $ret = json_decode($response['body'], true);
+            if (!isset($ret['access_token'])) {
+                error_log1('failed to get [' . $this->disktag . '] access_token. response: ' . $response['stat'] . $response['body']);
+                //$response['body'] = json_encode(json_decode($response['body']), JSON_PRETTY_PRINT);
+                $response['body'] .= 'failed to get [' . $this->disktag . '] access_token.';
+                $this->error = $response;
+                return false;
+            }
+            $tmp = $ret;
+            $tmp['access_token'] = substr($tmp['access_token'], 0, 10) . '******';
+            $tmp['refresh_token'] = substr($tmp['refresh_token'], 0, 10) . '******';
+            error_log1('[' . $this->disktag . '] Get access token:' . json_encode($tmp, JSON_PRETTY_PRINT));
+            $this->access_token = $ret['access_token'];
+            savecache('access_token', $this->access_token, $this->disktag, $ret['expires_in'] - 300);
+            if (time()>getConfig('token_expires', $this->disktag)) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+3*24*60*60 ], $this->disktag);
+            return true;
+        }
+        return true;
+    }
+    public function getDiskSpace() {
+        if (!($diskSpace = getcache('diskSpace', $this->disktag))) {
+            $url = $this->api_url . '/databox/get_personal_info';
+            $header["content-type"] = "application/json; charset=utf-8";
+            $header['authorization'] = 'Bearer ' . $this->access_token;
+            $response = curl('POST', $url, '', $header);
+            //error_log1(json_encode($response));
+            $res = json_decode($response['body'], true)['personal_space_info'];
+            $used = size_format($res['used_size']);
+            $total = size_format($res['total_size']);
+            $diskSpace = $used . ' / ' . $total;
+            savecache('diskSpace', $diskSpace, $this->disktag);
+        }
+        return $diskSpace;
+    }
+}

disk/Googledrive.php

@@ -0,0 +1,865 @@
+<?php
+
+class Googledrive {
+    protected $access_token;
+    protected $disktag;
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        $this->redirect_uri = 'https://scfonedrive.github.io';
+        if (getConfig('client_id', $tag) && getConfig('client_secret', $tag)) {
+            $this->client_id = getConfig('client_id', $tag);
+            $this->client_secret = getConfig('client_secret', $tag);
+        } else {
+            $this->client_id = '106151778902-ajieetaab5ondhbvia97n4tr5k0cg8eo.apps.googleusercontent.com';
+            $this->client_secret = 'LlCV-rQClzYIKCEqiVddh68G';
+        }
+        //$this->oauth_url = 'https://www.googleapis.com/oauth2/v4/';
+        $this->oauth_url = 'https://accounts.google.com/o/oauth2/';
+        $this->api_url = 'https://www.googleapis.com/drive/v3';
+        $this->scope = 'https://www.googleapis.com/auth/drive';
+
+        $this->client_secret = urlencode($this->client_secret);
+        $this->scope = urlencode($this->scope);
+        //$this->DownurlStrName = '@microsoft.graph.downloadUrl';
+        //$this->ext_api_url = '/me/drive/root';
+        $this->driveId = getConfig('driveId', $tag);
+        $res = $this->get_access_token(getConfig('refresh_token', $tag));
+    }
+
+    public function isfine()
+    {
+        if (!$this->access_token) return false;
+        else return true;
+    }
+    public function show_base_class()
+    {
+        return get_class();
+        //$tmp[0] = get_class();
+        //$tmp[1] = get_class($this);
+        //return $tmp;
+    }
+
+    public function ext_show_innerenv()
+    {
+        return ['driveId'];
+    }
+
+    public function list_files($path = '/')
+    {
+        $files = $this->list_path($path);
+
+        return $this->files_format($files);
+    }
+
+    protected function files_format($files)
+    {
+        if (isset($files['files']) || (isset($files['mimeType'])&&$files['mimeType']=='application/vnd.google-apps.folder') ) {
+            $tmp['type'] = 'folder';
+            $tmp['id'] = $files['id'];
+            $tmp['name'] = $files['name'];
+            $tmp['time'] = $files['modifiedTime'];
+            $tmp['size'] = $files['size'];
+            $tmp['childcount'] = $files['folder']['childCount'];
+            $tmp['page'] = $files['folder']['page'];
+            foreach ($files['files'] as $file) {
+                $filename = strtolower($file['name']);
+                if ($file['mimeType']=='application/vnd.google-apps.folder') {
+                    $tmp['list'][$filename]['type'] = 'folder';
+                } else {
+                    $tmp['list'][$filename]['type'] = 'file';
+                    //var_dump($file);
+                    //echo $file['name'] . ':' . $this->DownurlStrName . ':' . $file[$this->DownurlStrName] . PHP_EOL;
+                    $tmp['list'][$filename]['url'] = ($file['downUrl']?$file['downUrl']:$file['webContentLink']);
+                    $tmp['list'][$filename]['mime'] = $file['mimeType'];
+                }
+                $tmp['list'][$filename]['id'] = $file['id'];
+                $tmp['list'][$filename]['name'] = $file['name'];
+                $tmp['list'][$filename]['time'] = $file['modifiedTime'];
+                $tmp['list'][$filename]['size'] = $file['size'];
+            }
+        } elseif (isset($files['mimeType'])) {
+            $tmp['type'] = 'file';
+            $tmp['id'] = $files['id'];
+            $tmp['name'] = $files['name'];
+            $tmp['time'] = $files['modifiedTime'];
+            $tmp['size'] = $files['size'];
+            $tmp['mime'] = $files['mimeType'];
+            $tmp['url'] = ($files['downUrl']?$files['downUrl']:$files['webContentLink']);
+            $tmp['content'] = $files['content'];
+        } else/*if (isset($files['error']))*/ {
+            return $files;
+        }
+        //error_log1(json_encode($tmp));
+        return $tmp;
+    }
+
+    protected function list_path($path = '/')
+    {
+        global $exts;
+        while (substr($path, -1)=='/') $path = substr($path, 0, -1);
+        if ($path == '') $path = '/';
+
+        if (!($files = getcache('path_' . $path, $this->disktag))) {
+            //$response = curl('GET', $this->api_url . '/drives', '', ['Authorization' => 'Bearer ' . $this->access_token]);
+            //$response = curl('GET', $this->api_url . '/files?fields=*,files(id,name,mimeType,size,modifiedTime,parents,webContentLink,thumbnailLink),nextPageToken' . (($this->driveId!='')?'&driveId=' . $this->driveId . '&corpora=teamDrive&includeItemsFromAllDrives=true&supportsAllDrives=true':''), '', ['Authorization' => 'Bearer ' . $this->access_token]);
+            if ($path == '/' || $path == '') {
+                $files = $this->fileList();
+                //error_log1('root_id' . $files['id']);
+                //$files['id'] = 'root';
+                //$files['type'] = 'folder';
+            } else {
+                $tmp = splitlast($path, '/');
+                $parent_path = $tmp[0];
+                $filename = urldecode($tmp[1]);
+                $parent_folder = $this->list_path($parent_path);
+                $i = 0;
+                foreach ($parent_folder['files'] as $item) {
+                    if ($item['name']==$filename) {
+                        if ($item['mimeType']=='application/vnd.google-apps.folder') {
+                            $files = $this->fileList($item['id']);
+                            $files['type'] = 'folder';
+                            $files['id'] = $item['id'];
+                            $files['name'] = $item['name'];
+                            $files['time'] = $item['modifiedTime'];
+                            $files['size'] = $item['size'];
+                        } else {
+                            if (isset($item['id'])&&$item['shared']!==true) $this->permission('create', $item['id']);
+                            //$this->permission('delete', $files['id']);
+                            
+                            //if (isset($item['mimeType']) && $item['mimeType']!='application/vnd.google-apps.folder') {
+                                if (in_array(strtolower(splitlast($item['name'],'.')[1]), $exts['txt'])) {
+                                    if ($files['size']<1024*1024) {
+                                        if (!(isset($item['content'])&&$item['content']['stat']==200)) {
+                                            //if (!isset($item['downUrl'])) {
+                                                $res = curl('GET', $item['webContentLink'], '', [], 1);
+                                                $weblink = $res['returnhead']['Location'];
+                                                //if ($weblink!==null) $item['downUrl'] = $weblink;
+                                                //else error_log1('Cant get link:' . json_encode($res, JSON_PRETTY_PRINT));
+                                            //}
+                                            if ($res['stat']==302) {
+                                                $content1 = curl('GET', $weblink, '', ["User-Agent"=>"qkqpttgf/OneManager 3.0.0", "Accept"=>"*/*"]);
+                                                $tmp = null;
+                                                $tmp = json_decode(json_encode($content1), true);
+                                                if ($tmp['body']===null) {
+                                                    $tmp['body'] = iconv("GBK", 'UTF-8//TRANSLIT', $content1['body']);
+                                                    $tmp = json_decode(json_encode($tmp), true);
+                                                    if ($tmp['body']!==null) $content1['body'] = $tmp['body'];
+                                                }
+                                                $item['content'] = $content1;
+                                            }// else $content1 = $res;
+                                            //error_log1($item['name'] . '~' . json_encode($content1, JSON_PRETTY_PRINT) . PHP_EOL);
+                                            $parent_folder['files'][$i] = $item;
+                                            savecache('path_' . $path, $parent_folder, $this->disktag);
+                                        }
+                                    } else {
+                                        $files['content']['stat'] = 202;
+                                        $files['content']['body'] = 'File too large.';
+                                    }
+                                }
+                            //}
+                            
+                            //error_log1(json_encode($item, JSON_PRETTY_PRINT));
+                            $files = $item;
+                        } 
+                    }
+                    $i++;
+                }
+                //echo $files['name'];
+            }
+
+            if (!$files) {
+                $files['error']['code'] = 'Not Found';
+                $files['error']['message'] = 'Not Found';
+                $files['error']['stat'] = 404;
+            } elseif (isset($files['stat'])) {
+                $files['error']['stat'] = $files['stat'];
+                $files['error']['code'] = 'Error';
+                $files['error']['message'] = $files['body'];
+            } else {
+                savecache('path_' . $path, $files, $this->disktag, 600);
+            }
+        }
+        //error_log1('path:' . $path . ', files:' . json_encode($files, JSON_PRETTY_PRINT));
+        //error_log1('path:' . $path . ', files:' . substr(json_encode($files), 0, 150));
+        return $files;
+    }
+    protected function fileList($parent_file_id = '')
+    {
+        $url = $this->api_url . '/files';
+
+        $url .= '?fields=files(id,name,mimeType,size,modifiedTime,parents,webContentLink,thumbnailLink,shared,permissions,permissionIds),nextPageToken';
+        //$url .= '?fields=files(*),nextPageToken';
+        //$url .= '?q=mimeType=\'application/vnd.google-apps.folder\'';
+        if ($parent_file_id!='') {
+            $q = $parent_file_id;
+        } else {
+            $q = $this->driveId;
+        }
+        $q = '\'' . $q . '\' in parents and trashed = false';
+        $q = urlencode($q);
+        $url .= '&q=' . $q;
+        if ($this->driveId!='root') $url .= '&driveId=' . $this->driveId . '&corpora=teamDrive&includeItemsFromAllDrives=true&supportsAllDrives=true';
+
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+
+        $res = curl('GET', $url, '', $header);
+        if ($res['stat']==200) return json_decode($res['body'], true);
+        else return $res;
+    }
+    protected function permission($op, $fileId)
+    {
+        $url = $this->api_url . '/files/' . $fileId . '/permissions';
+        if ($op=='create') {
+            $method = 'POST';
+            $header['Content-Type'] = 'application/json';
+            $tmp['role'] = 'reader';
+            $tmp['type'] = 'anyone';
+            $data = json_encode($tmp);
+        } elseif ($op=='delete') {
+            $url .= '/anyoneWithLink';
+            $method = 'DELETE';
+            $data = '';
+        } else {
+            return false;
+        }
+        $url .= '?supportsAllDrives=true';
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+
+        $res = curl($method, $url, $data, $header);
+        //error_log1('Set Share' . json_encode($res, JSON_PRETTY_PRINT));
+        return $res;
+    }
+
+    public function Rename($file, $newname) {
+        $url = $this->api_url . '/files/' . $file['id'] . '?supportsAllDrives=true';
+        $tmp['name'] = $newname;
+        $result = $this->GDAPI('PATCH', $url, json_encode($tmp));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Delete($file) {
+        $url = $this->api_url . '/files/' . $file['id'] . '?supportsAllDrives=true';
+        $result = $this->GDAPI('DELETE', $url);
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Encrypt($folder, $passfilename, $pass) {
+        $existfile = $this->list_path($folder['path'] . '/' . $passfilename);
+        if (isset($existfile['name'])) {
+            if ($pass==='') {
+                // 如果为空，删除
+                $this->Delete(['id'=>$existfile['id']]);
+                return output('Success', 200);
+            } else {
+                $result = $this->editFile($existfile['id'], $pass);
+            }
+        } else {
+            if (!$folder['id']) {
+                $res = $this->list_path($folder['path']);
+                //error_log1('res:' . json_encode($res));
+                $folder['id'] = $res['id'];
+            }
+            if (!$folder['id']) {
+                $folder['id'] = $this->driveId;
+            }
+            $result = $this->createFile_c($folder['id'], $passfilename, $pass);
+        }
+
+        //error_log1('2,url:' . $url .' res:' . json_encode($result));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Move($file, $folder) {
+        $nowParentId = $this->list_path($file['path'])['id'];
+        if (!$nowParentId) {
+            $nowParentId = $this->driveId;
+        }
+        if (!$folder['id']) {
+            $res = $this->list_path($folder['path']);
+            //error_log1('res:' . json_encode($res));
+            $folder['id'] = $res['id'];
+        }
+        if (!$folder['id']) {
+            $folder['id'] = $this->driveId;
+        }
+        $url = $this->api_url . '/files/' . $file['id'] . '?removeParents=' . $nowParentId . '&addParents=' . $folder['id'] . '&supportsAllDrives=true';
+        //$tmp['name'] = $newname;
+        $result = $this->GDAPI('PATCH', $url);
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Copy($file) {
+        $url = $this->api_url . '/files/' . $file['id'] . '/copy?supportsAllDrives=true';
+        $namearr = splitlast($file['name'], '.');
+        date_default_timezone_set('UTC');
+        if ($namearr[0]!='') {
+            $newname = $namearr[0] . '_' . date("Ymd\_His");
+            if ($namearr[1]!='') $newname .= '.' . $namearr[1];
+        } else {
+            $newname = '.' . $namearr[1] . '_' . date("Ymd\_His");
+        }
+        $tmp['name'] = $newname;
+        $result = $this->GDAPI('POST', $url, json_encode($tmp));
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Edit($file, $content) {
+        $tmp = splitlast($file['path'], '/');
+        $folderpath = $tmp[0];
+        $filename = $tmp[1];
+        $existfile = $this->list_path($file['path']);
+        if (isset($existfile['name'])) {
+            $result = $this->editFile($existfile['id'], $content);
+        } else {
+            $result = $this->createFile_c($this->list_path($folderpath)['id'], $filename, $content);
+        }
+        //error_log1('edit: ' . json_encode($result, JSON_PRETTY_PRINT));
+        if ($result['stat']==200) return output('success', 0);
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function Create($parent, $type, $name, $content = '') {
+        $filename = spurlencode($name);
+        $filename = path_format($parent['path'] . '/' . $filename);
+        $res = $this->list_path($filename);
+        //error_log1($filename . '查重:' . json_encode($res, JSON_PRETTY_PRINT) . PHP_EOL);
+        if (isset($res['name'])) {
+            $tmp['error']['code'] = 'File exist';
+            $tmp['error']['message'] = $res;
+            $tmp['error']['stat'] = 409;
+            return output(json_encode($this->files_format($tmp), JSON_PRETTY_PRINT), $tmp['error']['stat']);
+        }
+        if (!$parent['id']) {
+            $res = $this->list_path($parent['path']);
+            //error_log1('找ID:' . json_encode($res));
+            $parent['id'] = $res['id'];
+        }
+        if (!$parent['id']) {
+            $parent['id'] = $this->driveId;
+        }
+
+        if ($type=='file') {
+            $result = $this->createFile_c($parent['id'], $name, $content);
+        }
+        if ($type=='folder') {
+            $result = $this->createFolder($parent['id'], $name);
+        }
+        //error_log1('data:' . $data . ' res:' . json_encode($result, JSON_PRETTY_PRINT));
+        //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
+        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+    }
+    public function get_thumbnails_url($path = '/') {
+        $res = $this->list_path($path);
+        $thumb_url = $res['thumbnailLink'];
+        return $thumb_url;
+    }
+    public function bigfileupload($path) {
+        return output('Stop!\nCan not upload form explorer without token.', 403);
+
+        // https://developers.google.com/drive/api/v3/manage-uploads#http---multiple-requests
+
+        if ($_POST['upbigfilename']=='') return output('error: no file name', 400);
+        if (!is_numeric($_POST['filesize'])) return output('error: no file size', 400);
+        if (!$_SERVER['admin']) if (!isset($_POST['filemd5'])) return output('error: no file md5', 400);
+        $filename = $_POST['upbigfilename'];
+        $filename = path_format($path . '/' . $filename);
+        $res = $this->list_path($filename);
+        //error_log1($filename . '查重:' . json_encode($res, JSON_PRETTY_PRINT) . PHP_EOL);
+        if (isset($res['name'])) {
+            $tmp['error']['code'] = 'File exist';
+            $tmp['error']['message'] = json_encode($res);
+            $tmp['error']['stat'] = 409;
+            return output(json_encode($this->files_format($tmp), JSON_PRETTY_PRINT), $tmp['error']['stat']);
+        }
+        $tmp = splitlast($_POST['upbigfilename'], '/');
+        if ($tmp[1]!='') {
+            $fileinfo['name'] = $tmp[1];
+            if ($_SERVER['admin']) $fileinfo['path'] = $tmp[0];
+        } else {
+            $fileinfo['name'] = $_POST['upbigfilename'];
+        }
+        $fileinfo['size'] = $_POST['filesize'];
+        $fileinfo['filelastModified'] = $_POST['filelastModified'];
+        if ($_SERVER['admin']) {
+            $filename = $fileinfo['name'];
+        } else {
+            $tmp1 = splitlast($fileinfo['name'], '.');
+            if ($tmp1[0]==''||$tmp1[1]=='') $filename = $_POST['filemd5'];
+            else $filename = $_POST['filemd5'] . '.' . $tmp1[1];
+        }
+        $parent = $this->list_path($path . '/' . $fileinfo['path']);
+        if (isset($parent['id'])) {
+            $parent_file_id = $parent['id'];
+        } else {
+            $res = $this->createFolder($this->list_path($path)['id'], $fileinfo['path']);
+            //error_log1($res['body']);
+            $parent_file_id = json_decode($res['body'], true)['id'];
+        }
+        $url = 'https://www.googleapis.com/upload/drive/v3/files?uploadType=resumable';
+        $res = $this->list_path($path);
+        //error_log1('找ID:' . json_encode($res));
+        $parentId = $res['id'];
+        if (!$parentId) {
+            $parentId = $this->driveId;
+        }
+        $tmp['name'] = $_POST['upbigfilename'];
+        $tmp['parents'][0] = $parentId;
+
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+        $header['Content-Type'] = 'application/json; charset=UTF-8';
+        //$header['Content-Length'] = '';
+        //$header['X-Upload-Content-Type'] = '';
+        //$header['X-Upload-Content-Length'] = $_POST['filesize'];
+
+        $response = curl('POST', $url, json_encode($tmp), $header, 1);
+        return output($response['returnhead']['Location'], $response['stat']);
+    }
+
+    protected function editFile($id, $content) {
+        $url = 'https://www.googleapis.com/upload/drive/v3/files/' . $id . '?uploadType=multipart&supportsAllDrives=true';
+
+        $boundary = md5($id . date());
+        $header['Content-Type'] = 'multipart/related; boundary=' . $boundary;
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+        $data = '--' . $boundary . "\r\n";
+        $data .= 'Content-Type: application/json; charset=UTF-8' . "\r\n";
+        $data .= "\r\n";
+        $data .= "\r\n";
+        $data .= "\r\n";
+        $data .= '--' . $boundary . "\r\n";
+        $data .= 'Content-Type: text/plain' . "\r\n";
+        $data .= "\r\n";
+        $data .= $content . "\r\n";
+        $data .= '--' . $boundary . "--";
+
+        $result = curl('PATCH', $url, $data, $header);
+        //error_log1('url: ' . $url . ' data: ' . $data . ' result: ' . json_encode($result, JSON_PRETTY_PRINT));
+        return $result;
+    }
+    protected function createFile_c($parentId, $name, $content) {
+        while (substr($name, 0, 1)=='/') $name = substr($name, 1);
+        while (substr($name, -1)=='/') $name = substr($name, 0, -1);
+        if (strpos($name, '/')>0) {
+            $p = splitlast($name, '/');
+            $res = $this->createFolder($parentId, $p[0]);
+            $parentId = json_decode($res['body'], true)['id'];
+            $name = $p[1];
+        }
+
+        $url = 'https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&supportsAllDrives=true';
+        $tmp['name'] = $name;
+        $tmp['parents'][0] = $parentId;
+
+        $boundary = md5($name . date());
+        $header['Content-Type'] = 'multipart/related; boundary=' . $boundary;
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+        $data = '--' . $boundary . "\r\n";
+        $data .= 'Content-Type: application/json; charset=UTF-8' . "\r\n";
+        $data .= "\r\n";
+        $data .= json_encode($tmp, JSON_PRETTY_PRINT) . "\r\n";
+        $data .= "\r\n";
+        $data .= '--' . $boundary . "\r\n";
+        $data .= 'Content-Type: text/plain' . "\r\n";
+        $data .= "\r\n";
+        $data .= $content . "\r\n";
+        $data .= '--' . $boundary . "--";
+
+        $result = curl('POST', $url, $data, $header);
+        return $result;
+    }
+    protected function createFolder($parentId, $name) {
+        while (substr($name, 0, 1)=='/') $name = substr($name, 1);
+        while (substr($name, -1)=='/') $name = substr($name, 0, -1);
+        if (strpos($name, '/')>0) {
+            $p = splitlast($name, '/');
+            $res = $this->createFolder($parentId, $p[0]);
+            $parentId = json_decode($res['body'], true)['id'];
+            $name = $p[1];
+        }
+
+        $url = $this->api_url . '/files?&supportsAllDrives=true';
+
+        $tmp['name'] = $name;
+        $tmp['parents'][0] = $parentId;
+        $tmp['mimeType'] = 'application/vnd.google-apps.folder';
+        $data = json_encode($tmp);
+
+        $header['Content-Type'] = 'application/json; charset=UTF-8';
+        $header['Authorization'] = 'Bearer ' . $this->access_token;
+
+        $result = curl('POST', $url, $data, $header);
+        return $result;
+    }
+    
+    public function AddDisk() {
+        global $constStr;
+        global $EnvConfigs;
+
+        $envs = '';
+        foreach ($EnvConfigs as $env => $v) if (isCommonEnv($env)) $envs .= '\'' . $env . '\', ';
+        $url = path_format($_SERVER['PHP_SELF'] . '/');
+
+        if (isset($_GET['Finish'])) {
+            if ($this->access_token == '') {
+                $refresh_token = getConfig('refresh_token', $this->disktag);
+                if (!$refresh_token) {
+                    $html = 'No refresh_token config, please AddDisk again or wait minutes.<br>' . $this->disktag;
+                    $title = 'Error';
+                    return message($html, $title, 201);
+                }
+                $response = $this->get_access_token($refresh_token);
+                if (!$response) return message($this->error['body'], 'Error', $this->error['stat']);
+            }
+
+            $tmp = null;
+            if ($_POST['DriveType']=='Googledrive') {
+                $tmp['driveId'] = 'root';
+            } else {
+                // 直接是id
+                $tmp['driveId'] = $_POST['DriveType'];
+            }
+
+            $response = setConfigResponse( setConfig($tmp, $this->disktag) );
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 201);
+            } else {
+                $str .= '<meta http-equiv="refresh" content="5;URL=' . $url . '">';
+                return message($str, getconstStr('WaitJumpIndex'), 201);
+            }
+        }
+
+        if (isset($_GET['SelectDrive'])) {
+            if ($this->access_token == '') {
+                $refresh_token = getConfig('refresh_token', $this->disktag);
+                if (!$refresh_token) {
+                    $html = 'No refresh_token config, please AddDisk again or wait minutes.<br>' . $this->disktag;
+                    $title = 'Error';
+                    return message($html, $title, 201);
+                }
+                $response = $this->get_access_token($refresh_token);
+                if (!$response) return message($this->error['body'], 'Error', $this->error['stat']);
+            }
+
+            $api = $this->api_url . '/drives';
+            $arr = curl('GET', $api, '', [ 'Authorization' => 'Bearer ' . $this->access_token ]);
+            //if (!($arr['stat']==200||$arr['stat']==403||$arr['stat']==400||$arr['stat']==404))
+            if ($arr['stat']!=200) return message($arr['stat'] . json_encode(json_decode($arr['body']), JSON_PRETTY_PRINT), 'Get followedSites', $arr['stat']);
+            error_log1($arr['body']);
+            $drives = json_decode($arr['body'], true)['drives'];
+
+            $title = 'Select Driver';
+            $html = '
+<div>
+    <form action="?Finish&disktag=' . $_GET['disktag'] . '&AddDisk=' . get_class($this) . '" method="post" onsubmit="return notnull(this);">
+        <label><input type="radio" name="DriveType" value="Googledrive" checked>' . 'Use Googledrive ' . getconstStr(' ') . '</label><br>';
+            if ($drives[0]!='') foreach ($drives as $k => $v) {
+                $html .= '
+        <label>
+            <input type="radio" name="DriveType" value="' . $v['id'] . '" onclick="document.getElementById(\'sharepointSiteUrl\').value=\'' . $v['webUrl'] . '\';">' . 'Use Google share drive: <br><div style="width:100%;margin:0px 35px">: ' . $v['name'] . '<br>siteid: ' . $v['id'] . '</div>
+        </label>';
+            }
+            $html .= '
+        <input type="submit" value="' . getconstStr('Submit') . '">
+    </form>
+</div>
+<script>
+        function notnull(t)
+        {
+            if (t.DriveType.value==\'\') {
+                    alert(\'Select a Disk\');
+                    return false;
+            }
+            if (t.DriveType.value==\'Custom\') {
+                if (t.sharepointSite.value==\'\') {
+                    alert(\'sharepoint Site Address\');
+                    return false;
+                }
+            }
+            return true;
+        }
+    </script>
+    ';
+            return message($html, $title, 201);
+        }
+
+        if (isset($_GET['install2']) && isset($_GET['code'])) {
+            $data['client_id'] = $this->client_id;
+            $data['client_secret'] = $this->client_secret;
+            $data['grant_type'] = 'authorization_code';
+            $data['redirect_uri'] = $this->redirect_uri;
+            $data['code'] = $_GET['code'];
+            $api = $this->oauth_url . 'token';
+            //$api = 'https://www.googleapis.com/oauth2/v4/token';
+            $tmp = curl('POST',
+                $api,
+                json_encode($data)
+            );
+            if ($tmp['stat']==200) $ret = json_decode($tmp['body'], true);
+            if (isset($ret['refresh_token'])) {
+                $refresh_token = $ret['refresh_token'];
+                $str = '
+        refresh_token :<br>';
+                $str .= '
+        <textarea readonly style="width: 95%">' . $refresh_token . '</textarea><br><br>
+        ' . getconstStr('SavingToken') . '
+        <script>
+            var texta=document.getElementsByTagName(\'textarea\');
+            for(i=0;i<texta.length;i++) {
+                texta[i].style.height = texta[i].scrollHeight + \'px\';
+            }
+        </script>';
+                $tmptoken['refresh_token'] = $refresh_token;
+                //$tmptoken['token_expires'] = time()+7*24*60*60;
+                $response = setConfigResponse( setConfig($tmptoken, $this->disktag) );
+                if (api_error($response)) {
+                    $html = api_error_msg($response);
+                    $title = 'Error';
+                    return message($html, $title, 201);
+                } else {
+                    savecache('access_token', $ret['access_token'], $this->disktag, $ret['expires_in'] - 60);
+                    $str .= '
+                <meta http-equiv="refresh" content="3;URL=' . $url . '?AddDisk=' . get_class($this) . '&disktag=' . $_GET['disktag'] . '&SelectDrive">';
+                    return message($str, getconstStr('Wait') . ' 3s', 201);
+                }
+            }
+            return message('<pre>' . $tmp['body'] . '</pre>', $tmp['stat']);
+            //return message('<pre>' . json_encode($ret, JSON_PRETTY_PRINT) . '</pre>', 500);
+        }
+
+        if (isset($_GET['install1'])) {
+            if (get_class($this)=='Googledrive') {
+                return message('
+    <a href="" id="a1">' . getconstStr('JumptoOffice') . '</a>
+    <script>
+        url=location.protocol + "//" + location.host + "' . $url . '?install2&disktag=' . $_GET['disktag'] . '&AddDisk=' . get_class($this) . '";
+        url="' . $this->oauth_url . 'auth?scope=' . $this->scope . '&response_type=code&client_id=' . $this->client_id . '&redirect_uri=' . $this->redirect_uri . '&access_type=offline&state=' . '"+encodeURIComponent(url);
+        document.getElementById(\'a1\').href=url;
+        //window.open(url,"_blank");
+        location.href = url;
+    </script>
+    ', getconstStr('Wait') . ' 1s', 201);
+            } else {
+                return message('Something error, retry after a few seconds.', 'Retry', 201);
+            }
+        }
+
+        if (isset($_GET['install0'])) {
+            if ($_POST['disktag_add']!='') {
+                $_POST['disktag_add'] = preg_replace('/[^0-9a-zA-Z|_]/i', '', $_POST['disktag_add']);
+                $f = substr($_POST['disktag_add'], 0, 1);
+                if (strlen($_POST['disktag_add'])==1) $_POST['disktag_add'] .= '_';
+                if (isCommonEnv($_POST['disktag_add'])) {
+                    return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>', 'Error', 201);
+                } elseif (!(('a'<=$f && $f<='z') || ('A'<=$f && $f<='Z'))) {
+                    return message('Please start with letters<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>
+                    <script>
+                    var expd = new Date();
+                    expd.setTime(expd.getTime()+1);
+                    var expires = "expires="+expd.toGMTString();
+                    document.cookie=\'disktag=; path=/; \'+expires;
+                    </script>', 'Error', 201);
+                }
+
+                $tmp = null;
+                // clear envs
+                foreach ($EnvConfigs as $env => $v) if (isInnerEnv($env)) $tmp[$env] = '';
+
+                //$this->disktag = $_POST['disktag_add'];
+                $tmp['disktag_add'] = $_POST['disktag_add'];
+                $tmp['diskname'] = $_POST['diskname'];
+                $tmp['Driver'] = 'Googledrive';
+                
+                    if ($_POST['NT_Drive_custom']=='on') {
+                        $tmp['client_id'] = $_POST['NT_client_id'];
+                        $tmp['client_secret'] = $_POST['NT_client_secret'];
+                    }
+                
+                $response = setConfigResponse( setConfig($tmp, $this->disktag) );
+                if (api_error($response)) {
+                    $html = api_error_msg($response);
+                    $title = 'Error';
+                } else {
+                    $title = getconstStr('MayinEnv');
+                    $html = getconstStr('Wait') . ' 3s<meta http-equiv="refresh" content="3;URL=' . $url . '?install1&disktag=' . $_GET['disktag'] . '&AddDisk=Googledrive">';
+                }
+                return message($html, $title, 201);
+            }
+        }
+
+        $html = '
+<div>
+    <form id="form1" action="" method="post" onsubmit="return notnull(this);">
+        ' . getconstStr('DiskTag') . ': (' . getConfig('disktag') . ')
+        <input type="text" name="disktag_add" placeholder="' . getconstStr('EnvironmentsDescription')['disktag'] . '" style="width:100%"><br>
+        ' . getconstStr('DiskName') . ':
+        <input type="text" name="diskname" placeholder="' . getconstStr('EnvironmentsDescription')['diskname'] . '" style="width:100%"><br>
+        <br>
+        <div>
+                <label><input type="checkbox" name="NT_Drive_custom" onclick="document.getElementById(\'NT_secret\').style.display=(this.checked?\'\':\'none\');">' . getconstStr('CustomIdSecret') . '</label><br>
+                <div id="NT_secret" style="display:none;margin:10px 35px">
+                    <a href="https://console.cloud.google.com/apis" target="_blank">' . getconstStr('GetSecretIDandKEY') . '</a><br>
+                    return_uri(Reply URL):<br>https://scfonedrive.github.io<br>
+                    client_id:<input type="text" name="NT_client_id" style="width:100%" placeholder="123456789-abcdefghijklmno.apps.googleusercontent.com"><br>
+                    client_secret:<input type="text" name="NT_client_secret" style="width:100%"><br>
+                </div>
+        </div>
+        <br>';
+        if ($_SERVER['language']=='zh-cn') $html .= '你要理解 scfonedrive.github.io 是github上的静态网站，<br><font color="red">除非github真的挂掉</font>了，<br>不然，稍后你如果连不上，请检查你的运营商或其它“你懂的”问题！<br>';
+        $html .='
+        <input type="submit" value="' . getconstStr('Submit') . '">
+    </form>
+</div>
+    <script>
+        function notnull(t)
+        {
+            if (t.disktag_add.value==\'\') {
+                alert(\'' . getconstStr('DiskTag') . '\');
+                return false;
+            }
+            envs = [' . $envs . '];
+            if (envs.indexOf(t.disktag_add.value)>-1) {
+                alert("Do not input ' . $envs . '");
+                return false;
+            }
+            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+            if (!reg.test(t.disktag_add.value)) {
+                alert(\'' . getconstStr('TagFormatAlert') . '\');
+                return false;
+            }
+            
+            
+                if (t.NT_Drive_custom.checked==true) {
+                    if (t.NT_client_secret.value==\'\'||t.NT_client_id.value==\'\') {
+                        alert(\'client_id & client_secret\');
+                        return false;
+                    }
+                }
+            
+            document.getElementById("form1").action="?install0&disktag=" + t.disktag_add.value + "&AddDisk=Googledrive";
+            return true;
+        }
+    </script>';
+        $title = 'Select Account Type';
+        return message($html, $title, 201);
+    }
+
+    protected function get_access_token($refresh_token) {
+        if (!$refresh_token) {
+            $tmp['stat'] = 0;
+            $tmp['body'] = 'No refresh_token';
+            $this->error = $tmp;
+            return false;
+        }
+        if (!($this->access_token = getcache('access_token', $this->disktag))) {
+            $p=0;
+            $data['client_id'] = $this->client_id;
+            $data['client_secret'] = $this->client_secret;
+            $data['grant_type'] = 'refresh_token';
+            //$data['redirect_uri'] = $this->redirect_uri;
+            $data['refresh_token'] = $refresh_token;
+            while ($response['stat']==0&&$p<3) {
+                //$response = curl('POST', 'https://www.googleapis.com/oauth2/v4/token', json_encode($data));
+                $response = curl('POST', $this->oauth_url . 'token', json_encode($data));
+                $p++;
+            }
+            if ($response['stat']==200) $ret = json_decode($response['body'], true);
+            if (!isset($ret['access_token'])) {
+                error_log1($this->oauth_url . 'token' . '?client_id=' . $this->client_id . '&client_secret=' . $this->client_secret . '&grant_type=refresh_token&refresh_token=' . substr($refresh_token, 0, 20) . '******' . substr($refresh_token, -20));
+                error_log1('failed to get [' . $this->disktag . '] access_token. response: ' . $response['body']);
+                $response['body'] = json_encode(json_decode($response['body']), JSON_PRETTY_PRINT);
+                $response['body'] .= '\nfailed to get [' . $this->disktag . '] access_token.';
+                $this->error = $response;
+                return false;
+                //throw new Exception($response['stat'].', failed to get ['.$this->disktag.'] access_token.'.$response['body']);
+            }
+            $tmp = $ret;
+            $tmp['access_token'] = substr($tmp['access_token'], 0, 10) . '******';
+            //$tmp['refresh_token'] = substr($tmp['refresh_token'], 0, 10) . '******';
+            error_log1('[' . $this->disktag . '] Get access token:' . json_encode($tmp, JSON_PRETTY_PRINT));
+            $this->access_token = $ret['access_token'];
+            savecache('access_token', $this->access_token, $this->disktag, $ret['expires_in'] - 300);
+            //if (time()>getConfig('token_expires', $this->disktag)) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+7*24*60*60 ], $this->disktag);
+            return true;
+        }
+        return true;
+    }
+    public function getDiskSpace() {
+        if ($this->driveId!='root') return '0 / 0';
+        if (!($diskSpace = getcache('diskSpace', $this->disktag))) {
+            $url = $this->api_url . '/about?fields=storageQuota';
+            $response = $this->GDAPI('GET', $url);
+            if ($response['stat']==200) {
+                $res = json_decode($response['body'], true)['storageQuota'];
+                $used = size_format($res['usage']);
+                $total = size_format($res['limit']);
+                $diskSpace = $used . ' / ' . $total;
+                savecache('diskSpace', $diskSpace, $this->disktag);
+            } else return json_encode($response);
+        }
+        return $diskSpace;
+    }
+
+    protected function GDAPI($method, $url, $data = '')
+    {
+        /*if (substr($path,0,7) == 'http://' or substr($path,0,8) == 'https://') {
+            $url = $path;
+        } else {
+            $url = $this->api_url;
+            if ($path=='' or $path=='/') {
+                $url .= '/';
+            } else {
+                $url .= ':' . $path;
+                if (substr($url,-1)=='/') $url=substr($url,0,-1);
+            }
+            if ($method=='PUT') {
+                if ($path=='' or $path=='/') {
+                    $url .= 'content';
+                } else {
+                    $url .= ':/content';
+                }
+                $headers['Content-Type'] = 'text/plain';
+            } elseif ($method=='PATCH') {
+                $headers['Content-Type'] = 'application/json';
+            } elseif ($method=='POST') {
+                $headers['Content-Type'] = 'application/json';
+            } elseif ($method=='DELETE') {
+                $headers['Content-Type'] = 'application/json';
+            } else {
+                if ($path=='' or $path=='/') {
+                    $url .= $method;
+                } else {
+                    $url .= ':/' . $method;
+                }
+                $method='POST';
+                $headers['Content-Type'] = 'application/json';
+            }
+        }*/
+        $headers['Authorization'] = 'Bearer ' . $this->access_token;
+        if (!isset($headers['Accept'])) $headers['Accept'] = '*/*';
+        $headers['Content-Type'] = 'application/json';
+        //if (!isset($headers['Referer'])) $headers['Referer'] = $url;*
+        $sendHeaders = array();
+        foreach ($headers as $headerName => $headerVal) {
+            $sendHeaders[] = $headerName . ': ' . $headerVal;
+        }
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+        //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $sendHeaders);
+        $response['body'] = curl_exec($ch);
+        $response['stat'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        //$response['Location'] = curl_getinfo($ch);
+        curl_close($ch);
+        /*error_log1($response['stat'].'
+    ' . $response['body'].'
+    ' . $url.'
+    ' . $data);*/
+        return $response;
+    }
+
+}

disk/OnedriveCN.php

@@ -0,0 +1,26 @@
+<?php
+if (!class_exists('Onedrive')) require 'Onedrive.php';
+
+class OnedriveCN extends Onedrive {
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        $this->redirect_uri = 'https://scfonedrive.github.io';
+        if (getConfig('client_id', $tag) && getConfig('client_secret', $tag)) {
+            $this->client_id = getConfig('client_id', $tag);
+            $this->client_secret = getConfig('client_secret', $tag);
+        } else {
+            $this->client_id = '31f3bed5-b9d9-4173-86a4-72c73d278617';
+            $this->client_secret = 'P5-ZNtFK-tT90J.We_-DcsuB8uV7AfjL8Y';
+        }
+        $this->oauth_url = 'https://login.partner.microsoftonline.cn/common/oauth2/v2.0/';
+        $this->api_url = 'https://microsoftgraph.chinacloudapi.cn/v1.0';
+        $this->scope = 'https://microsoftgraph.chinacloudapi.cn/Files.ReadWrite.All https://microsoftgraph.chinacloudapi.cn/Sites.ReadWrite.All offline_access';
+        $res = $this->get_access_token(getConfig('refresh_token', $tag));
+
+        $this->client_secret = urlencode($this->client_secret);
+        $this->scope = urlencode($this->scope);
+        $this->DownurlStrName = '@microsoft.graph.downloadUrl';
+        $this->ext_api_url = '/me/drive/root';
+    }
+}

disk/Sharelink.php

@@ -0,0 +1,67 @@
+<?php
+if (!class_exists('Onedrive')) require 'Onedrive.php';
+
+class Sharelink extends Onedrive {
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        $this->redirect_uri = 'https://scfonedrive.github.io';
+        $this->api_url = getConfig('shareapiurl', $tag);
+        $res = $this->get_access_token(1);
+        //$this->ext_api_url = '/me/drive/root';
+        $this->DownurlStrName = '@content.downloadUrl';
+    }
+
+    public function ext_show_innerenv()
+    {
+        return [ 'shareurl' ];
+    }
+
+    protected function get_access_token($refresh_token) {
+        if (!($this->access_token = getcache('access_token', $this->disktag))) {
+            $shareurl = getConfig('shareurl', $this->disktag);
+            if (!($this->sharecookie = getcache('sharecookie', $this->disktag))) {
+                $res = curl('GET', $shareurl, '', [], 1);
+                error_log1(json_encode($res, JSON_PRETTY_PRINT));
+                if (isset($res['returnhead']['Set-Cookie'])) $this->sharecookie = $res['returnhead']['Set-Cookie'];
+                if (isset($res['returnhead']['set-cookie'])) $this->sharecookie = $res['returnhead']['set-cookie'];
+                if ($this->sharecookie=='') {
+                    $this->error = $res;
+                    return false;
+                }
+                savecache('sharecookie', $this->sharecookie, $this->disktag);
+            }
+            $tmp1 = splitlast($shareurl, '/')[0];
+            $account = splitlast($tmp1, '/')[1];
+            $domain = splitlast($shareurl, '/:')[0];
+            $response = curl('POST', 
+                $domain . "/personal/" . $account . "/_api/web/GetListUsingPath(DecodedUrl=@a1)/RenderListDataAsStream?@a1='" . urlencode("/personal/" . $account . "/Documents") . "'&RootFolder=" . urlencode("/personal/" . $account . "/Documents/") . "&TryNewExperienceSingle=TRUE",
+                '{"parameters":{"__metadata":{"type":"SP.RenderListDataParameters"},"RenderOptions":136967,"AllowMultipleValueFilterForTaxonomyFields":true,"AddRequiredFields":true}}',
+                [ 'Accept' => 'application/json;odata=verbose', 'Content-Type' => 'application/json;odata=verbose', 'origin' => $domain, 'Cookie' => $this->sharecookie ]
+            );
+            if ($response['stat']==200) $ret = json_decode($response['body'], true);
+            $this->access_token = splitlast($ret['ListSchema']['.driveAccessToken'],'=')[1];
+            $this->api_url = $ret['ListSchema']['.driveUrl'].'/root';
+            if (!$this->access_token) {
+                error_log1($domain . "/personal/" . $account . "/_api/web/GetListUsingPath(DecodedUrl=@a1)/RenderListDataAsStream?@a1='" . urlencode("/personal/" . $account . "/Documents") . "'&RootFolder=" . urlencode("/personal/" . $account . "/Documents/") . "&TryNewExperienceSingle=TRUE");
+                error_log1('failed to get share access_token. response' . json_encode($ret));
+                //$response['body'] = json_encode(json_decode($response['body']), JSON_PRETTY_PRINT);
+                $response['body'] .= '<br>' .json_decode($response['body'], true)['error']['message']['value'];
+                $response['body'] .= '<br>failed to get shareurl access_token.';
+                $this->error = $response;
+                return false;
+                //throw new Exception($response['stat'].', failed to get share access_token.'.$response['body']);
+            }
+            //$tmp = $ret;
+            //$tmp['access_token'] = '******';
+            //error_log1('['.$this->disktag.'] Get access token:'.json_encode($tmp, JSON_PRETTY_PRINT));
+            savecache('access_token', $this->access_token, $this->disktag);
+            $tmp1 = null;
+            if (getConfig('shareapiurl', $this->disktag)!=$this->api_url) $tmp1['shareapiurl'] = $this->api_url;
+            //if (getConfig('sharecookie', $this->disktag)!=$this->sharecookie) $tmp1['sharecookie'] = $this->sharecookie;
+            if (!!$tmp1) setConfig($tmp1, $this->disktag);
+            return true;
+        }
+        return true;
+    }
+}

disk/Sharepoint.php

@@ -0,0 +1,31 @@
+<?php
+if (!class_exists('Onedrive')) require 'Onedrive.php';
+
+class Sharepoint extends Onedrive {
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        $this->redirect_uri = 'https://scfonedrive.github.io';
+        if (getConfig('client_id', $tag) && getConfig('client_secret', $tag)) {
+            $this->client_id = getConfig('client_id', $tag);
+            $this->client_secret = getConfig('client_secret', $tag);
+        } else {
+            $this->client_id = '734ef928-d74c-4555-8d1b-d942fa0a1a41';
+            $this->client_secret = '_I5gOpmG5vTC2Ts_K._wCW4nN1km~4Pk52';
+        }
+        $this->oauth_url = 'https://login.microsoftonline.com/common/oauth2/v2.0/';
+        $this->api_url = 'https://graph.microsoft.com/v1.0';
+        $this->scope = 'https://graph.microsoft.com/Files.ReadWrite.All https://graph.microsoft.com/Sites.ReadWrite.All offline_access';
+        $res = $this->get_access_token(getConfig('refresh_token', $tag));
+
+        $this->client_secret = urlencode($this->client_secret);
+        $this->scope = urlencode($this->scope);
+        $this->DownurlStrName = '@microsoft.graph.downloadUrl';
+        $this->ext_api_url = '/sites/' . getConfig('siteid', $tag) . '/drive/root';
+    }
+
+    public function ext_show_innerenv()
+    {
+        return [ 'sharepointSite', 'siteid' ];
+    }
+}

disk/SharepointCN.php

@@ -0,0 +1,31 @@
+<?php
+if (!class_exists('Onedrive')) require 'Onedrive.php';
+
+class SharepointCN extends Onedrive {
+
+    function __construct($tag) {
+        $this->disktag = $tag;
+        $this->redirect_uri = 'https://scfonedrive.github.io';
+        if (getConfig('client_id', $tag) && getConfig('client_secret', $tag)) {
+            $this->client_id = getConfig('client_id', $tag);
+            $this->client_secret = getConfig('client_secret', $tag);
+        } else {
+            $this->client_id = '31f3bed5-b9d9-4173-86a4-72c73d278617';
+            $this->client_secret = 'P5-ZNtFK-tT90J.We_-DcsuB8uV7AfjL8Y';
+        }
+        $this->oauth_url = 'https://login.partner.microsoftonline.cn/common/oauth2/v2.0/';
+        $this->api_url = 'https://microsoftgraph.chinacloudapi.cn/v1.0';
+        $this->scope = 'https://microsoftgraph.chinacloudapi.cn/Files.ReadWrite.All https://microsoftgraph.chinacloudapi.cn/Sites.ReadWrite.All offline_access';
+        $res = $this->get_access_token(getConfig('refresh_token', $tag));
+
+        $this->client_secret = urlencode($this->client_secret);
+        $this->scope = urlencode($this->scope);
+        $this->DownurlStrName = '@microsoft.graph.downloadUrl';
+        $this->ext_api_url = '/sites/' . getConfig('siteid', $tag) . '/drive/root';
+    }
+
+    public function ext_show_innerenv()
+    {
+        return [ 'sharepointSite', 'siteid' ];
+    }
+}

glitch.json

@@ -0,0 +1,3 @@
+{
+    "start": "php -S 0.0.0.0:8080 index.php"
+}

index.php

@@ -1,10 +1,12 @@
 <?php
-error_reporting(E_ALL & ~E_NOTICE);
+//error_reporting(E_ALL & ~E_NOTICE);
+error_reporting(0);
 include 'vendor/autoload.php';
 include 'conststr.php';
 include 'common.php';
 
 //echo '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
+//echo '<pre>'. json_encode($_ENV, JSON_PRETTY_PRINT).'</pre>';
 if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
     if (getenv('ONEMANAGER_CONFIG_SAVE')=='file') include 'platform/TencentSCF_file.php';
     else include 'platform/TencentSCF_env.php';
@@ -15,8 +17,6 @@ if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
     //else include 'platform/HuaweiFG_env.php';
     echo 'FG' . PHP_EOL;
 } elseif ($_SERVER['BCE_CFC_RUNTIME_NAME']=='php7') {
-    //set_include_path(get_include_path() . PATH_SEPARATOR . '/opt/php');
-    //include 'BaiduBce.phar';
     include 'platform/BaiduCFC.php';
 } elseif (isset($_SERVER['HEROKU_APP_DIR'])&&$_SERVER['HEROKU_APP_DIR']==='/app') {
     include 'platform/Heroku.php';
@@ -31,6 +31,19 @@ if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
     }
     http_response_code($re['statusCode']);
     echo $re['body'];
+} elseif (isset($_SERVER['DOCUMENT_ROOT'])&&$_SERVER['DOCUMENT_ROOT']==='/var/task/user') {
+    include 'platform/Vercel.php';
+    $path = getpath();
+    //echo 'path:'. $path;
+    $_GET = getGET();
+    //echo '<pre>'. json_encode($_GET, JSON_PRETTY_PRINT).'</pre>';
+    $re = main($path);
+    $sendHeaders = array();
+    foreach ($re['headers'] as $headerName => $headerVal) {
+        header($headerName . ': ' . $headerVal, true);
+    }
+    http_response_code($re['statusCode']);
+    echo $re['body'];
 } else {
     include 'platform/Normal.php';
     $path = getpath();
@@ -73,7 +86,7 @@ function handler($event, $context)
         $tmp = array(
             'method' => $event->getMethod(),
             'clientIP' => $event->getAttribute("clientIP"),
-            'eventURI' => $event->getAttribute("eventURI"),
+            'requestURI' => $event->getAttribute("requestURI"),
             'path' => spurlencode($event->getAttribute("path"), '/'),
             'queryString' => $event->getQueryParams(),
             'headers' => $event->getHeaders(),
@@ -136,28 +149,3 @@ function handler($event, $context)
 
     }
 }
-
-// used by Aliyun FC
-function myErrorHandler($errno, $errstr, $errfile, $errline) {
-    if (!(error_reporting() & $errno)) {
-        return false;
-    }
-    switch ($errno) {
-    case E_USER_ERROR:
-        $errInfo = array(
-            "errorMessage" => $errstr,
-            "errorType"    => \ServerlessFC\friendly_error_type($errno),
-            "stackTrace"   => array(
-                "file" => $errfile,
-                "line" => $errline,
-            ),
-        );
-        throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-        break;
-
-    default: // E_USER_WARNING | E_USER_NOTICE
-        break;
-    }
-
-    return true;
-}

platform/AliyunFC.php

@@ -28,7 +28,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['FC_SERVER_PATH'] = '/var/fc/runtime/php7.2';
 }
 
 function GetPathSetting($event, $context)
@@ -38,32 +37,44 @@ function GetPathSetting($event, $context)
     $_SERVER['region'] = $context['region'];
     $_SERVER['service_name'] = $context['service']['name'];
     $_SERVER['function_name'] = $context['function']['name'];
-
-        $_SERVER['base_path'] = '/';
-        $path = $event['path'];
-        //$path = spurlencode($path, '/');
+    $path = $event['path'];
+    $tmp = $event['requestURI'];
+    if (strpos($tmp, '?')) $tmp = substr($tmp, 0, strpos($tmp, '?'));
+    if ($path=='/'||$path=='') {
+        $_SERVER['base_path'] = $tmp;
+    } else {
+        $_SERVER['base_path'] = substr($tmp, 0, strlen($tmp)-strlen($path)+1);
+    }
 
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['clientIP'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['X-Requested-With'][0];
+    if (isset($event['headers']['Authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['Authorization'][0], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['HTTP_HOST'] = $event['headers']['Host'][0];
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['X-Forwarded-Proto'][0];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['Referer'][0])[2];
+    $_SERVER['FC_SERVER_PATH'] = '/var/fc/runtime/php7.2';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    if (in_array($str, $InnerEnv)) {
+    if (isInnerEnv($str)) {
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
+        if (isBase64Env($str)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -71,29 +82,36 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
-    $disktags = explode("|",getConfig('disktag'));
+    $disktags = explode("|", getConfig('disktag'));
     $diskconfig = json_decode(getenv($disktag), true);
     $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
             array_push($disktags, $v);
-            $oparetdisk = 1;
+            $operatedisk = 1;
         } elseif ($k=='disktag_del') {
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
-            $oparetdisk = 1;
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
-            else $tmp[$k] = $v;
+            $tmp[$k] = json_encode($v);
         }
     }
     if ($indisk) {
@@ -101,11 +119,22 @@ function setConfig($arr, $disktag = '')
         ksort($diskconfig);
         $tmp[$disktag] = json_encode($diskconfig);
     }
-    if ($oparetdisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
-        else $tmp['disktag'] = '';
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']);
+            $tmp[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = '';
+        }
     }
 //    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
 //';
@@ -233,7 +262,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -309,7 +338,8 @@ function updateEnvironment($Envs, $accountId, $region, $service_name, $function_
         $tmp_env[$key1] = $value1;
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    ksort($tmp_env);
+    //ksort($tmp_env);
+    sortConfig($tmp_env);
 
     $tmpdata['environmentVariables'] = $tmp_env;
     return FCAPI2016($config, 'PUT', json_encode($tmpdata));
@@ -445,3 +475,29 @@ function addFileToZip($zip, $rootpath, $path = '')
     }
     @closedir($path);
 }
+
+function myErrorHandler($errno, $errstr, $errfile, $errline) {
+    if (!(error_reporting() & $errno)) {
+        return false;
+    }
+    switch ($errno) {
+    case E_USER_ERROR:
+        $errInfo = array(
+            "errorMessage" => $errstr,
+            "errorType"    => \ServerlessFC\friendly_error_type($errno),
+            "stackTrace"   => array(
+                "file" => $errfile,
+                "line" => $errline,
+            ),
+        );
+        throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+        break;
+    default: // E_USER_WARNING | E_USER_NOTICE
+        break;
+    }
+    return true;
+}
+
+function WaitFunction() {
+    return true;
+}

platform/BaiduCFC.php

@@ -26,9 +26,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['User-Agent'];
-    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
-    $_SERVER['BCE_CFC_RUNTIME_NAME'] = 'php7';
 }
 
 function GetPathSetting($event, $context)
@@ -39,25 +36,35 @@ function GetPathSetting($event, $context)
     $path = $event['path'];
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['requestContext']['sourceIp'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['X-Requested-With'];
+    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['User-Agent'];
+    if (isset($event['headers']['authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['authorization'], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['HTTP_HOST'] = $event['headers']['Host'];
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['X-Forwarded-Proto'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['Referer'])[2];
+    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
+    $_SERVER['BCE_CFC_RUNTIME_NAME'] = 'php7';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    if (in_array($str, $InnerEnv)) {
+    if (isInnerEnv($str)) {
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
+        if (isBase64Env($str)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -65,29 +72,36 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     $disktags = explode("|",getConfig('disktag'));
     $diskconfig = json_decode(getenv($disktag), true);
     $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
             array_push($disktags, $v);
-            $oparetdisk = 1;
+            $operatedisk = 1;
         } elseif ($k=='disktag_del') {
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
-            $oparetdisk = 1;
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
-            else $tmp[$k] = $v;
+            $tmp[$k] = json_encode($v);
         }
     }
     if ($indisk) {
@@ -95,11 +109,22 @@ function setConfig($arr, $disktag = '')
         ksort($diskconfig);
         $tmp[$disktag] = json_encode($diskconfig);
     }
-    if ($oparetdisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
-        else $tmp['disktag'] = '';
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']);
+            $tmp[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = '';
+        }
     }
 //    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
 //';
@@ -224,7 +249,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -294,7 +319,8 @@ function updateEnvironment($Envs, $SecretId, $SecretKey)
         $tmp_env[$key1] = $value1;
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    ksort($tmp_env);
+    //ksort($tmp_env);
+    sortConfig($tmp_env);
 
     $tmp['Environment']['Variables'] = $tmp_env;
     $data = json_encode($tmp);
@@ -337,7 +363,7 @@ function api_error_msg($response)
 {
     if (isset($response['code'])) $html = $response['code'] . '<br>
 ' . $response['message'];
-    else $html = var_dump($response);
+    else $html = json_encode($response, JSON_PRETTY_PRINT);
     return $html . '<br><br>
 BRN: ' . $_SERVER['functionBrn'] . '<br>
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
@@ -405,3 +431,7 @@ function addFileToZip($zip, $rootpath, $path = '')
     }
     @closedir($path);
 }
+
+function WaitFunction() {
+    return true;
+}

platform/Heroku.php

@@ -1,9 +1,37 @@
 <?php
+// https://devcenter.heroku.com/articles/platform-api-reference#build-create
 
 function getpath()
 {
+    if (getConfig('function_name') && getConfig('APIKey')) {
+        $APIKey = getConfig('APIKey');
+        $res = HerokuAPI('GET', 'https://api.heroku.com/apps/' . getConfig('function_name'), '', $APIKey);
+        $response = json_decode($res['body'], true);
+        if (isset($response['build_stack'])) {
+            $tmp['HerokuappId'] = $response['id'];
+            $tmp['function_name'] = null;
+        } else {
+            error_log1('Something error' . 'Get Heroku app id: ' . json_encode($res, JSON_PRETTY_PRINT));
+            //return message('Get Heroku app id: ' . json_encode($res, JSON_PRETTY_PRINT), 'Something error', 500);
+        }
+        $response = json_decode(setHerokuConfig($tmp, $tmp['HerokuappId'], $APIKey)['body'], true);
+        $title = 'Change function_name to HerokuappId';
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $stat = 500;
+            error_log1('Change function_name to HerokuappId' . $html);
+        } else {
+            $html = getconstStr('Wait') . ' 5s, jump to index.
+            <meta http-equiv="refresh" content="5;URL=/">';
+            $stat = 201;
+        }
+        //return message($html, $title, $stat);
+    }
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($_SERVER['HTTP_ACCEPT_LANGUAGE'],';')[0],',')[0]);
     $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    $_SERVER['REQUEST_SCHEME'] = $_SERVER['HTTP_X_FORWARDED_PROTO'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $_SERVER['HTTP_REFERER'])[2];
     $_SERVER['base_path'] = path_format(substr($_SERVER['SCRIPT_NAME'], 0, -10) . '/');
     $p = strpos($_SERVER['REQUEST_URI'],'?');
     if ($p>0) $path = substr($_SERVER['REQUEST_URI'], 0, $p);
@@ -15,6 +43,24 @@ function getpath()
 
 function getGET()
 {
+    //error_log1('POST：' . json_encode($_POST));
+    if (!$_POST) {
+        if (!!$HTTP_RAW_POST_DATA) {
+            $tmpdata = $HTTP_RAW_POST_DATA;
+            //error_log1('RAW：' . $tmpdata);
+        } else {
+            $tmpdata = file_get_contents('php://input');
+            //error_log1('PHPINPUT：' . $tmpdata);
+        }
+        if (!!$tmpdata) {
+            $postbody = explode("&", $tmpdata);
+            foreach ($postbody as $postvalues) {
+                $pos = strpos($postvalues,"=");
+                $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1));
+            }
+            //error_log1('POSTformPHPINPUT：' . json_encode($_POST));
+        }
+    }
     $p = strpos($_SERVER['REQUEST_URI'],'?');
     if ($p>0) {
         $getstr = substr($_SERVER['REQUEST_URI'], $p+1);
@@ -40,17 +86,15 @@ function getGET()
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    if (in_array($str, $InnerEnv)) {
+    if (isInnerEnv($str)) {
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
             else return $env[$str];
 	}
     } else {
-	if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
+        if (isBase64Env($str)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -58,29 +102,36 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     $disktags = explode("|",getConfig('disktag'));
-    $diskconfig = json_decode(getenv($disktag), true);
+    if ($disktag!='') $diskconfig = json_decode(getenv($disktag), true);
     $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
             array_push($disktags, $v);
-            $oparetdisk = 1;
+            $operatedisk = 1;
         } elseif ($k=='disktag_del') {
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
-            $oparetdisk = 1;
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
-            else $tmp[$k] = $v;
+            $tmp[$k] = json_encode($v);
         }
     }
     if ($indisk) {
@@ -88,16 +139,27 @@ function setConfig($arr, $disktag = '')
         ksort($diskconfig);
         $tmp[$disktag] = json_encode($diskconfig);
     }
-    if ($oparetdisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
-        else $tmp['disktag'] = '';
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']);
+            $tmp[$arr['disktag_rename']] = null;
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = null;
+        }
     }
     foreach ($tmp as $key => $val) if ($val=='') $tmp[$key]=null;
-//    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
-//';
-    return setHerokuConfig($tmp, getConfig('function_name'), getConfig('APIKey'));
+
+    return setHerokuConfig($tmp, getConfig('HerokuappId'), getConfig('APIKey'));
+    error_log1(json_encode($arr, JSON_PRETTY_PRINT) . ' => tmp：' . json_encode($tmp, JSON_PRETTY_PRINT));
 }
 
 function install()
@@ -113,15 +175,25 @@ function install()
                 $APIKey = $_POST['APIKey'];
                 $tmp['APIKey'] = $APIKey;
             }
-            $function_name = getConfig('function_name');
-            if ($function_name=='') {
-		        $tmp1 = substr($_SERVER['HTTP_HOST'], 0, strrpos($_SERVER['HTTP_HOST'], '.'));
-		        $maindomain = substr($tmp1, strrpos($tmp1, '.')+1);
-		        if ($maindomain=='herokuapp') $function_name = substr($tmp1, 0, strrpos($tmp1, '.'));
-                else $function_name = 'visit from xxxx.herokuapp.com';
-                $tmp['function_name'] = $function_name;
-	        }
-            $response = json_decode(setHerokuConfig($tmp, $function_name, $APIKey)['body'], true);
+            $HerokuappId = getConfig('HerokuappId');
+            if ($HerokuappId=='') {
+                $function_name = getConfig('function_name');
+                if ($function_name=='') {
+                    $tmp1 = substr($_SERVER['HTTP_HOST'], 0, strrpos($_SERVER['HTTP_HOST'], '.'));
+                    $maindomain = substr($tmp1, strrpos($tmp1, '.')+1);
+                    if ($maindomain=='herokuapp') $function_name = substr($tmp1, 0, strrpos($tmp1, '.'));
+                    else return message('Please visit from xxxx.herokuapp.com', '', 500);
+                    $res = HerokuAPI('GET', 'https://api.heroku.com/apps/' . $function_name, '', $APIKey);
+                    $response = json_decode($res['body'], true);
+                    if (isset($response['build_stack'])) {
+                        $HerokuappId = $response['id'];
+                    } else {
+                        return message('Get Heroku app id: ' . json_encode($res, JSON_PRETTY_PRINT), 'Something error', 500);
+                    }
+                }
+            }
+            $tmp['HerokuappId'] = $HerokuappId;
+            $response = json_decode(setHerokuConfig($tmp, $HerokuappId, $APIKey)['body'], true);
             if (api_error($response)) {
                 $html = api_error_msg($response);
                 $title = 'Error';
@@ -129,7 +201,7 @@ function install()
                 return output('Jump
     <script>
         var expd = new Date();
-        expd.setTime(expd.getTime()+(2*60*60*1000));
+        expd.setTime(expd.getTime()+1000);
         var expires = "expires="+expd.toGMTString();
         document.cookie=\'language=; path=/; \'+expires;
     </script>
@@ -188,7 +260,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -205,7 +277,7 @@ function HerokuAPI($method, $url, $data = '', $apikey)
     foreach ($headers as $headerName => $headerVal) {
         $sendHeaders[] = $headerName . ': ' . $headerVal;
     }
-    error_log($method . $url . $data . $apikey);
+    error_log1($method . $url . $data . $apikey);
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_CUSTOMREQUEST,$method);
@@ -220,28 +292,28 @@ function HerokuAPI($method, $url, $data = '', $apikey)
     $response['body'] = curl_exec($ch);
     $response['stat'] = curl_getinfo($ch,CURLINFO_HTTP_CODE);
     curl_close($ch);
-    error_log($response['stat'].'
+    error_log1($response['stat'].'
 '.$response['body'].'
 ');
     return $response;
 }
 
-function getHerokuConfig($function_name, $apikey)
+function getHerokuConfig($HerokuappId, $apikey)
 {
-    return HerokuAPI('GET', 'https://api.heroku.com/apps/' . $function_name . '/config-vars', '', $apikey);
+    return HerokuAPI('GET', 'https://api.heroku.com/apps/' . $HerokuappId . '/config-vars', '', $apikey);
 }
 
-function setHerokuConfig($env, $function_name, $apikey)
+function setHerokuConfig($env, $HerokuappId, $apikey)
 {
     $data = json_encode($env);
-    return HerokuAPI('PATCH', 'https://api.heroku.com/apps/' . $function_name . '/config-vars', $data, $apikey);
+    if (substr($data, 0, 1)=='{') return HerokuAPI('PATCH', 'https://api.heroku.com/apps/' . $HerokuappId . '/config-vars', $data, $apikey);
 }
 
-function updateHerokuapp($function_name, $apikey, $source)
+function updateHerokuapp($HerokuappId, $apikey, $source)
 {
     $tmp['source_blob']['url'] = $source;
     $data = json_encode($tmp);
-    return HerokuAPI('POST', 'https://api.heroku.com/apps/' . $function_name . '/builds', $data, $apikey);
+    return HerokuAPI('POST', 'https://api.heroku.com/apps/' . $HerokuappId . '/builds', $data, $apikey);
 }
 
 function api_error($response)
@@ -261,10 +333,14 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
 {
     //'https://github.com/qkqpttgf/OneManager-php/tarball/master/';
     $source = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
-    return updateHerokuapp(getConfig('function_name'), getConfig('APIKey'), $source);
+    return updateHerokuapp(getConfig('HerokuappId'), getConfig('APIKey'), $source);
 }
 
 function setConfigResponse($response)
 {
     return json_decode( $response['body'], true );
 }
+
+function WaitFunction() {
+    return true;
+}

platform/HuaweiFG_env.php

@@ -39,9 +39,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
-    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
-    $_SERVER['_APP_SHARE_DIR'] = '/var/share/CFF/processrouter';
 }
 
 function GetPathSetting($event, $context)
@@ -61,26 +58,35 @@ function GetPathSetting($event, $context)
     }
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['headers']['x-real-ip'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['x-requested-with'];
+    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
+    if (isset($event['headers']['authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['authorization'], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['x-forwarded-proto'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['referer'])[2];
+    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
+    $_SERVER['_APP_SHARE_DIR'] = '/var/share/CFF/processrouter';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     global $contextUserData;
-    if (in_array($str, $InnerEnv)) {
+    if (isInnerEnv($str)) {
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode($contextUserData->getUserData($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return base64y_decode($contextUserData->getUserData($str));
+        if (isBase64Env($str)) return base64y_decode($contextUserData->getUserData($str));
         else return $contextUserData->getUserData($str);
     }
     return '';
@@ -88,30 +94,37 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     global $contextUserData;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     $disktags = explode("|",getConfig('disktag'));
     $diskconfig = json_decode($contextUserData->getUserData($disktag), true);
     $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
             array_push($disktags, $v);
-            $oparetdisk = 1;
+            $operatedisk = 1;
         } elseif ($k=='disktag_del') {
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
-            $oparetdisk = 1;
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
-            else $tmp[$k] = $v;
+            $tmp[$k] = json_encode($v);
         }
     }
     if ($indisk) {
@@ -119,11 +132,22 @@ function setConfig($arr, $disktag = '')
         ksort($diskconfig);
         $tmp[$disktag] = json_encode($diskconfig);
     }
-    if ($oparetdisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
-        else $tmp['disktag'] = '';
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']);
+            $tmp[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = '';
+        }
     }
 //    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
 //';
@@ -270,7 +294,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -349,7 +373,8 @@ function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
         $tmp_env[$key1] = $value1;
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    ksort($tmp_env);
+    //ksort($tmp_env);
+    sortConfig($tmp_env);
 
     $tmpdata['handler'] = 'index.handler';
     $tmpdata['memory_size'] = $contextUserData->getMemorySize()+1-1;
@@ -462,3 +487,7 @@ function addFileToZip($zip, $rootpath, $path = '')
     }
     @closedir($path);
 }
+
+function WaitFunction() {
+    return true;
+}

platform/HuaweiFG_file.php

@@ -39,9 +39,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
-    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
-    $_SERVER['_APP_SHARE_DIR'] = '/var/share/CFF/processrouter';
 }
 
 function GetPathSetting($event, $context)
@@ -61,31 +58,42 @@ function GetPathSetting($event, $context)
     }
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['headers']['x-real-ip'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['x-requested-with'];
+    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
+    if (isset($event['headers']['authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['authorization'], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['x-forwarded-proto'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['referer'])[2];
+    $_SERVER['HTTP_TRANSLATE'] = $event['headers']['translate'];//'f'
+    $_SERVER['_APP_SHARE_DIR'] = '/var/share/CFF/processrouter';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    //include 'config.php';
-    $s = file_get_contents(__DIR__ . '/../config.php');
-    //$configs = substr($s, 18, -2);
+
+    global $slash;
+    $projectPath = splitlast(__DIR__, $slash)[0];
+    $configPath = $projectPath . $slash . '.data' . $slash . 'config.php';
+    $s = file_get_contents($configPath);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') {
         $envs = json_decode($configs, true);
-        if (in_array($str, $InnerEnv)) {
+        if (isInnerEnv($str)) {
             if ($disktag=='') $disktag = $_SERVER['disktag'];
             if (isset($envs[$disktag][$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$disktag][$str]);
                 else return $envs[$disktag][$str];
             }
         } else {
             if (isset($envs[$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$str]);
                 else return $envs[$str];
             }
         }
@@ -95,20 +103,23 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
+
     if ($disktag=='') $disktag = $_SERVER['disktag'];
-    //include 'config.php';
-    $s = file_get_contents(__DIR__ . '/../config.php');
-    //$configs = substr($s, 18, -2);
+    global $slash;
+    $projectPath = splitlast(__DIR__, $slash)[0];
+    $configPath = $projectPath . $slash . '.data' . $slash . 'config.php';
+    $s = file_get_contents($configPath);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') $envs = json_decode($configs, true);
     $disktags = explode("|",getConfig('disktag'));
     $indisk = 0;
     $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $envs[$k] = base64y_encode($v);
+            else $envs[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $envs[$disktag][$k] = base64y_encode($v);
             else $envs[$disktag][$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -118,9 +129,15 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
-            else $envs[$k] = $v;
+            $envs[$k] = $v;
         }
     }
     if ($indisk) {
@@ -130,13 +147,24 @@ function setConfig($arr, $disktag = '')
         $envs[$disktag] = $diskconfig;
     }
     if ($operatedisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
-        else $envs['disktag'] = '';
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $envs['disktag'] = implode('|', $tags);
+            $envs[$arr['disktag_newname']] = $envs[$arr['disktag_rename']];
+            $envs[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
+            else $envs['disktag'] = '';
+        }
     }
     $envs = array_filter($envs, 'array_value_isnot_null');
-    ksort($envs);
+    //ksort($envs);
     $response = updateEnvironment($envs, getConfig('HW_urn'), getConfig('HW_key'), getConfig('HW_secret'));
     return $response;
 }
@@ -280,7 +308,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -340,7 +368,7 @@ function getfunctioncode($HW_urn, $HW_key, $HW_secret)
 ' . '/' . $bucket . '/' . $path;
 
     $signature = base64_encode(hash_hmac('sha1', $StringToSign, $HW_secret, true));
-    $response = curl_request($url, false, [ 'Authorization' => 'OBS ' . $HW_key . ':' . $signature, 'x-obs-date' => $date, 'Content-Type' => '' ]);
+    $response = curl('GET', $url, false, [ 'Authorization' => 'OBS ' . $HW_key . ':' . $signature, 'x-obs-date' => $date, 'Content-Type' => '' ]);
     //if ($response['stat']==200) return $response['body'];
     if ($response['stat']==0) return json_encode( [ 'error_code' => 'Network', 'error_msg' => 'Network error in getting code.' ] );
     else return $response['body'];
@@ -369,9 +397,8 @@ function copyFolder($from, $to)
 
 function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
 {
-
+    sortConfig($Envs);
     //echo json_encode($Envs,JSON_PRETTY_PRINT);
-    global $contextUserData;
     $source = '/tmp/code.zip';
     $outPath = '/tmp/code/';
     $oldcode = '/tmp/oldcode.zip';
@@ -384,7 +411,7 @@ function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
     // 将配置写入
     $prestr = '<?php $configs = \'' . PHP_EOL;
     $aftstr = PHP_EOL . '\';';
-    file_put_contents($outPath . 'config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
+    file_put_contents($outPath . '.data/config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
 
     // 将目录中文件打包成zip
     //$zip=new ZipArchive();
@@ -399,6 +426,7 @@ function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
 
 function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
 {
+    global $slash;
     //echo json_encode($Envs,JSON_PRETTY_PRINT);
     if ($Envs['ONEMANAGER_CONFIG_SAVE'] == 'file') $envs = Array( 'ONEMANAGER_CONFIG_SAVE' => 'file' );
     else {
@@ -440,15 +468,17 @@ function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
     if (api_error(setConfigResponse($response))) {
         return $response;
     }
-    $s = file_get_contents(__DIR__ . '/../config.php');
-    //$configs = substr($s, 18, -2);
+
+    $projectPath = splitlast(__DIR__, $slash)[0];
+    $configPath = $projectPath . $slash . '.data' . $slash . 'config.php';
+    $s = file_get_contents($configPath);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') $tmp_env = json_decode($configs, true);
     foreach ($Envs as $k => $v) {
         $tmp_env[$k] = $v;
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null');
-    ksort($tmp_env);
+    //ksort($tmp_env);
     $response = updateEnvironment($tmp_env, $HW_urn, $HW_key, $HW_secret);
     return $response;
 }
@@ -530,7 +560,7 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
     }
 
     // 放入配置文件
-    file_put_contents($outPath . '/config.php', file_get_contents(__DIR__.'/../config.php'));
+    file_put_contents($outPath . '/.data/config.php', file_get_contents(__DIR__ . '/../.data/config.php'));
 
     // 将目录中文件打包成zip
     //$zip=new ZipArchive();
@@ -838,3 +868,7 @@ class Signer
         return $curl;
     }
 }
+
+function WaitFunction() {
+    return true;
+}

platform/Normal.php

@@ -4,7 +4,18 @@ function getpath()
 {
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($_SERVER['HTTP_ACCEPT_LANGUAGE'],';')[0],',')[0]);
     if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
-    $_SERVER['base_path'] = path_format(substr($_SERVER['SCRIPT_NAME'], 0, -10) . '/');
+    if (isset($_SERVER['HTTP_FLY_CLIENT_IP'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_FLY_CLIENT_IP'];
+    if ($_SERVER['REQUEST_SCHEME']!='http'&&$_SERVER['REQUEST_SCHEME']!='https') {
+        if ($_SERVER['HTTP_X_FORWARDED_PROTO']!='') {
+            $tmp = explode(',', $_SERVER['HTTP_X_FORWARDED_PROTO'])[0];
+            if ($tmp=='http'||$tmp=='https') $_SERVER['REQUEST_SCHEME'] = $tmp;
+        }
+        if ($_SERVER['HTTP_FLY_FORWARDED_PROTO']!='') $_SERVER['REQUEST_SCHEME'] = $_SERVER['HTTP_FLY_FORWARDED_PROTO'];
+    }
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $_SERVER['HTTP_REFERER'])[2];
+    if (isset($_SERVER['DOCUMENT_ROOT'])&&$_SERVER['DOCUMENT_ROOT']==='/app') $_SERVER['base_path'] = '/';
+    else $_SERVER['base_path'] = path_format(substr($_SERVER['SCRIPT_NAME'], 0, -10) . '/');
     if (isset($_SERVER['UNENCODED_URL'])) $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
     $p = strpos($_SERVER['REQUEST_URI'],'?');
     if ($p>0) $path = substr($_SERVER['REQUEST_URI'], 0, $p);
@@ -17,6 +28,20 @@ function getpath()
 
 function getGET()
 {
+    if (!$_POST) {
+        if (!!$HTTP_RAW_POST_DATA) {
+            $tmpdata = $HTTP_RAW_POST_DATA;
+        } else {
+            $tmpdata = file_get_contents('php://input');
+        }
+        if (!!$tmpdata) {
+            $postbody = explode("&", $tmpdata);
+            foreach ($postbody as $postvalues) {
+                $pos = strpos($postvalues,"=");
+                $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1));
+            }
+        }
+    }
     if (isset($_SERVER['UNENCODED_URL'])) $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
     $p = strpos($_SERVER['REQUEST_URI'],'?');
     if ($p>0) {
@@ -43,23 +68,22 @@ function getGET()
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    //include 'config.php';
-    $s = file_get_contents('config.php');
-    //$configs = substr($s, 18, -2);
+    global $slash;
+    $projectPath = splitlast(__DIR__, $slash)[0];
+    $configPath = $projectPath . $slash . '.data' . $slash . 'config.php';
+    $s = file_get_contents($configPath);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') {
         $envs = json_decode($configs, true);
-        if (in_array($str, $InnerEnv)) {
+        if (isInnerEnv($str)) {
             if ($disktag=='') $disktag = $_SERVER['disktag'];
             if (isset($envs[$disktag][$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$disktag][$str]);
                 else return $envs[$disktag][$str];
             }
         } else {
             if (isset($envs[$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$str]);
                 else return $envs[$str];
             }
         }
@@ -69,20 +93,22 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
+    global $slash;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
-    //include 'config.php';
-    $s = file_get_contents('config.php');
-    //$configs = substr($s, 18, -2);
+    $projectPath = splitlast(__DIR__, $slash)[0];
+    $configPath = $projectPath . $slash . '.data' . $slash . 'config.php';
+    $s = file_get_contents($configPath);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') $envs = json_decode($configs, true);
-    $disktags = explode("|",getConfig('disktag'));
+    $disktags = explode("|", getConfig('disktag'));
     $indisk = 0;
     $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $envs[$k] = base64y_encode($v);
+            else $envs[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $envs[$disktag][$k] = base64y_encode($v);
             else $envs[$disktag][$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -92,9 +118,20 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
-            else $envs[$k] = $v;
+            //$tmpdisk = json_decode($v, true);
+            //var_dump($tmpdisk);
+            //error_log(json_encode($tmpdisk));
+            //if ($tmpdisk===null) 
+            $envs[$k] = $v;
+            //else $envs[$k] = $tmpdisk;
         }
     }
     if ($indisk) {
@@ -104,17 +141,30 @@ function setConfig($arr, $disktag = '')
         $envs[$disktag] = $diskconfig;
     }
     if ($operatedisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
-        else $envs['disktag'] = '';
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $envs['disktag'] = implode('|', $tags);
+            $envs[$arr['disktag_newname']] = $envs[$arr['disktag_rename']];
+            unset($envs[$arr['disktag_rename']]);
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
+            else $envs['disktag'] = '';
+        }
     }
     $envs = array_filter($envs, 'array_value_isnot_null');
-    ksort($envs);
+    //ksort($envs);
+    sortConfig($envs);
+    
     //echo '<pre>'. json_encode($envs, JSON_PRETTY_PRINT).'</pre>';
     $prestr = '<?php $configs = \'' . PHP_EOL;
     $aftstr = PHP_EOL . '\';';
-    $response = file_put_contents('config.php', $prestr . json_encode($envs, JSON_PRETTY_PRINT) . $aftstr);
+    $response = file_put_contents($configPath, $prestr . json_encode($envs, JSON_PRETTY_PRINT) . $aftstr);
     if ($response>0) return json_encode( [ 'response' => 'success' ] );
     return json_encode( [ 'message' => 'Failed to write config.', 'code' => 'failed' ] );
 }
@@ -183,8 +233,8 @@ function install()
             //if (location.port!="") url += ":" + location.port;
             url += location.pathname;
             if (url.substr(-1)!="/") url += "/";
-            url += "config.php";
-            //alert(url);
+            url += "app.json";
+            url += "?" + Date.now();
             var xhr4 = new XMLHttpRequest();
             xhr4.open("GET", url);
             xhr4.setRequestHeader("x-requested-with","XMLHttpRequest");
@@ -196,7 +246,7 @@ function install()
                     document.getElementById("submitbtn").disabled = false;
                     document.getElementById("formdiv").style.display = "";
                 } else {
-                    alert("Url: " + url + "\nExpect http code 201, but received " + xhr4.status);
+                    alert("' . getconstStr('MakesuerRewriteOn') . '?\nfalse\n\nUrl: " + url + "\nExpect http code 201, but received " + xhr4.status);
                 }
             }
         }
@@ -229,7 +279,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -244,17 +294,6 @@ function ConfigWriteable()
     return false;
 }
 
-function RewriteEngineOn()
-{
-    $http_type = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')) ? 'https://' : 'http://';
-    $tmpurl = $http_type . $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'];
-    $tmpurl .= path_format($_SERVER['base_path'] . '/config.php');
-    $tmp = curl_request($tmpurl);
-    if ($tmp['stat']==200) return false;
-    if ($tmp['stat']==201) return true; //when install return 201, after installed return 404 or 200;
-    return false;
-}
-
 function api_error($response)
 {
     return isset($response['message']);
@@ -285,8 +324,8 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
     $githubfile = file_get_contents($url);
     if (!$githubfile) return 0;
     file_put_contents($tarfile, $githubfile);
-    if (splitfirst(PHP_VERSION, '.')[0] == '7') {
-        $phar = new PharData($tarfile); // need php7
+    if (splitfirst(PHP_VERSION, '.')[0] > '5') {
+        $phar = new PharData($tarfile); // need php5.3, 7, 8
         $phar->extractTo($projectPath, null, true);//路径 要解压的文件 是否覆盖
     } else {
         ob_start();
@@ -304,14 +343,14 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
             break;
         }
     }
-    //error_log($outPath);
+    //error_log1($outPath);
     if ($outPath=='') return 0;
 
     //unlink($outPath.'/config.php');
-    $response = rename($projectPath . $slash . 'config.php', $outPath . $slash . 'config.php');
+    $response = rename($projectPath . $slash . '.data' . $slash . 'config.php', $outPath . $slash . '.data' . $slash . 'config.php');
     if (!$response) {
         $tmp1['code'] = "Move Failed";
-        $tmp1['message'] = "Can not move " . $projectPath . $slash . 'config.php' . " to " . $outPath . $slash . 'config.php';
+        $tmp1['message'] = "Can not move " . $projectPath . $slash . '.data' . $slash . 'config.php' . " to " . $outPath . $slash . '.data' . $slash . 'config.php';
         return json_encode($tmp1);
     }
     return moveFolder($outPath, $projectPath, $slash);
@@ -346,3 +385,7 @@ function moveFolder($from, $to, $slash)
     rmdir($from);
     return json_encode( [ 'response' => 'success' ] );
 }
+
+function WaitFunction() {
+    return true;
+}

platform/TencentSCF_env.php

@@ -23,9 +23,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
-    $_SERVER['HTTP_TRANSLATE']==$event['headers']['translate'];//'f'
-    $_SERVER['USER'] = 'qcloud';
 }
 
 function GetPathSetting($event, $context)
@@ -33,7 +30,7 @@ function GetPathSetting($event, $context)
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['accept-language'],';')[0],',')[0]);
     $_SERVER['function_name'] = $context['function_name'];
     $_SERVER['namespace'] = $context['namespace'];
-    $_SERVER['Region'] = getenv('TENCENTCLOUD_REGION');
+    $_SERVER['Region'] = $context['tencentcloud_region'];
     $host_name = $event['headers']['host'];
     $_SERVER['HTTP_HOST'] = $host_name;
     $serviceId = $event['requestContext']['serviceId'];
@@ -46,25 +43,35 @@ function GetPathSetting($event, $context)
     }
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['requestContext']['sourceIp'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['x-requested-with'];
+    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
+    if (isset($event['headers']['authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['authorization'], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['x-api-scheme'];
+    //$_SERVER['REQUEST_SCHEME'] = $event['headers']['x-forwarded-proto'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['referer'])[2];
+    $_SERVER['HTTP_TRANSLATE']==$event['headers']['translate'];//'f'
+    $_SERVER['USER'] = 'qcloud';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
-    if (in_array($str, $InnerEnv)) {
+    if (isInnerEnv($str)) {
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
+        if (isBase64Env($str)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -72,29 +79,36 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     $disktags = explode("|",getConfig('disktag'));
     $diskconfig = json_decode(getenv($disktag), true);
     $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
             array_push($disktags, $v);
-            $oparetdisk = 1;
+            $operatedisk = 1;
         } elseif ($k=='disktag_del') {
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
-            $oparetdisk = 1;
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
-            else $tmp[$k] = $v;
+            $tmp[$k] = json_encode($v);
         }
     }
     if ($indisk) {
@@ -102,11 +116,22 @@ function setConfig($arr, $disktag = '')
         ksort($diskconfig);
         $tmp[$disktag] = json_encode($diskconfig);
     }
-    if ($oparetdisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
-        else $tmp['disktag'] = '';
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']);
+            $tmp[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = '';
+        }
     }
 //    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
 //';
@@ -248,7 +273,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -316,7 +341,8 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
     //$tmp_env['Region'] = $Region;
-    ksort($tmp_env);
+    //ksort($tmp_env);
+    sortConfig($tmp_env);
 
     $i = 0;
     foreach ($tmp_env as $key1 => $value1) {
@@ -345,9 +371,6 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
 {
     //echo json_encode($Envs,JSON_PRETTY_PRINT);
     if ($Envs['ONEMANAGER_CONFIG_SAVE'] == 'file') $Envs = Array( 'ONEMANAGER_CONFIG_SAVE' => 'file' );
-    /*$trynum = 0;
-    while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
-'.++$trynum;*/
     //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key']
     $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
     foreach ($tmp as $tmp1) {
@@ -387,7 +410,7 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
 }
 
-function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKey, $source)
+function updateProgram_OLD($function_name, $Region, $Namespace, $SecretId, $SecretKey, $source)
 {
     WaitSCFStat();
     $meth = 'POST';
@@ -426,14 +449,158 @@ namespace:' . $_SERVER['namespace'] . '<br>
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
 }
 
-function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
-{
-    $source['url'] = 'https://github.com/' . $auth . '/' . $project;
-    $source['branch'] = $branch;
-    return updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source);
-}
-
 function setConfigResponse($response)
 {
     return json_decode( $response, true )['Response'];
 }
+
+function WaitFunction() {
+    //$trynum = 0;
+    //while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')),true)['Response']['Status']!='Active' ) echo '
+//'.++$trynum;
+    if ( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')),true)['Response']['Status']=='Active' ) return true;
+    else return false;
+}
+
+function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKey, $source)
+{
+    $secretId = $SecretId;
+    $secretKey = $SecretKey;
+    $host = 'scf.tencentcloudapi.com';
+    $service = "scf";
+    $version = "2018-04-16";
+    $action = "UpdateFunctionCode";
+    $region = $Region;
+    $timestamp = time();
+    $algorithm = "TC3-HMAC-SHA256";
+
+    // step 1: build canonical request string
+    $httpRequestMethod = "POST";
+    $canonicalUri = "/";
+    $canonicalQueryString = "";
+    $canonicalHeaders = "content-type:application/json; charset=utf-8\n"."host:".$host."\n";
+    $signedHeaders = "content-type;host";
+
+    //$tmpdata['Action'] = 'UpdateFunctionCode';
+    $tmpdata['Code']['ZipFile'] = base64_encode( file_get_contents($source) );
+    $tmpdata['CodeSource'] = 'ZipFile';
+    $tmpdata['FunctionName'] = $function_name;
+    $tmpdata['Handler'] = 'index.main_handler';
+    //$tmpdata['Namespace'] = $Namespace;
+    //$tmpdata['Nonce'] = time();
+    //$tmpdata['Region'] = $Region;
+    //$tmpdata['SecretId'] = $SecretId;
+    //$tmpdata['Timestamp'] = time();
+    //$tmpdata['Token'] = '';
+    //$tmpdata['Version'] = '2018-04-16';
+    $payload = json_encode($tmpdata);
+    //$payload = '{"Limit": 1, "Filters": [{"Values": ["\u672a\u547d\u540d"], "Name": "instance-name"}]}';
+    $hashedRequestPayload = hash("SHA256", $payload);
+    $canonicalRequest = $httpRequestMethod."\n"
+        .$canonicalUri."\n"
+        .$canonicalQueryString."\n"
+        .$canonicalHeaders."\n"
+        .$signedHeaders."\n"
+        .$hashedRequestPayload;
+    //echo $canonicalRequest.PHP_EOL;
+
+    // step 2: build string to sign
+    $date = gmdate("Y-m-d", $timestamp);
+    $credentialScope = $date."/".$service."/tc3_request";
+    $hashedCanonicalRequest = hash("SHA256", $canonicalRequest);
+    $stringToSign = $algorithm."\n"
+        .$timestamp."\n"
+        .$credentialScope."\n"
+        .$hashedCanonicalRequest;
+    //echo $stringToSign.PHP_EOL;
+
+    // step 3: sign string
+    $secretDate = hash_hmac("SHA256", $date, "TC3".$secretKey, true);
+    $secretService = hash_hmac("SHA256", $service, $secretDate, true);
+    $secretSigning = hash_hmac("SHA256", "tc3_request", $secretService, true);
+    $signature = hash_hmac("SHA256", $stringToSign, $secretSigning);
+    //echo $signature.PHP_EOL;
+
+    // step 4: build authorization
+    $authorization = $algorithm
+        ." Credential=".$secretId."/".$credentialScope
+        .", SignedHeaders=content-type;host, Signature=".$signature;
+    //echo $authorization.PHP_EOL;
+
+    //$curl = "curl -X POST https://".$host
+    //    .' -H "Authorization: '.$authorization.'"'
+    //    .' -H "Content-Type: application/json; charset=utf-8"'
+    //    .' -H "Host: '.$host.'"'
+    //    .' -H "X-TC-Action: '.$action.'"'
+    //    .' -H "X-TC-Timestamp: '.$timestamp.'"'
+    //    .' -H "X-TC-Version: '.$version.'"'
+    //    .' -H "X-TC-Region: '.$region.'"'
+    //    ." -d '".$payload."'";
+    //error_log1( $curl.PHP_EOL );
+    //return '{"response": {"Error": {"Message":"' . $curl . '"}}}';
+    $headers['Authorization'] = $authorization;
+    $headers['Content-Type'] = 'application/json; charset=utf-8';
+    $headers['Host'] = $host;
+    $headers['X-TC-Action'] = $action;
+    $headers['X-TC-Timestamp'] = $timestamp;
+    $headers['X-TC-Version'] = $version;
+    $headers['X-TC-Region'] = $region;
+    return curl('POST', 'https://'.$host, $payload, $headers)['body'];
+}
+
+function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
+{
+    $source = '/tmp/code.zip';
+    $outPath = '/tmp/';
+
+    // 从github下载对应tar.gz，并解压
+    $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
+    $tarfile = '/tmp/github.tar.gz';
+    file_put_contents($tarfile, file_get_contents($url));
+    $phar = new PharData($tarfile);
+    $html = $phar->extractTo($outPath, null, true);//路径 要解压的文件 是否覆盖
+
+    // 获取包中目录名
+    $tmp = scandir('phar://'.$tarfile);
+    $name = $auth.'-'.$project;
+    foreach ($tmp as $f) {
+        if ( substr($f, 0, strlen($name)) == $name) {
+            $outPath .= $f;
+            break;
+        }
+    }
+    // 放入配置文件
+    file_put_contents($outPath . '/.data/config.php', file_get_contents(__DIR__ . '/../.data/config.php'));
+
+    // 将目录中文件打包成zip
+    //$zip=new ZipArchive();
+    $zip=new PharData($source);
+    //if($zip->open($source, ZipArchive::CREATE)){
+        addFileToZip($zip, $outPath); //调用方法，对要打包的根目录进行操作，并将ZipArchive的对象传递给方法
+    //    $zip->close(); //关闭处理的zip文件
+    //}
+
+    return updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source);
+}
+
+function addFileToZip($zip, $rootpath, $path = '')
+{
+    if (substr($rootpath,-1)=='/') $rootpath = substr($rootpath, 0, -1);
+    if (substr($path,0,1)=='/') $path = substr($path, 1);
+    $handler=opendir(path_format($rootpath.'/'.$path)); //打开当前文件夹由$path指定。
+    while($filename=readdir($handler)){
+        if($filename != "." && $filename != ".."){//文件夹文件名字为'.'和‘..’，不要对他们进行操作
+            $nowname = path_format($rootpath.'/'.$path."/".$filename);
+            if(is_dir($nowname)){// 如果读取的某个对象是文件夹，则递归
+                $zip->addEmptyDir($path."/".$filename);
+                addFileToZip($zip, $rootpath, $path."/".$filename);
+            }else{ //将文件加入zip对象
+                $newname = $path."/".$filename;
+                if (substr($newname,0,1)=='/') $newname = substr($newname, 1);
+                $zip->addFile($nowname, $newname);
+                //$zip->renameName($nowname, $newname);
+            }
+        }
+    }
+    @closedir($path);
+}

platform/TencentSCF_file.php

@@ -23,9 +23,6 @@ function GetGlobalVariable($event)
         $pos = strpos($cookievalues,"=");
         $_COOKIE[urldecode(substr($cookievalues,0,$pos))]=urldecode(substr($cookievalues,$pos+1));
     }
-    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
-    $_SERVER['HTTP_TRANSLATE']==$event['headers']['translate'];//'f'
-    $_SERVER['USER'] = 'qcloud';
 }
 
 function GetPathSetting($event, $context)
@@ -33,7 +30,7 @@ function GetPathSetting($event, $context)
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['accept-language'],';')[0],',')[0]);
     $_SERVER['function_name'] = $context['function_name'];
     $_SERVER['namespace'] = $context['namespace'];
-    $_SERVER['Region'] = getenv('TENCENTCLOUD_REGION');
+    $_SERVER['Region'] = $context['tencentcloud_region'];
     $host_name = $event['headers']['host'];
     $_SERVER['HTTP_HOST'] = $host_name;
     $serviceId = $event['requestContext']['serviceId'];
@@ -46,31 +43,41 @@ function GetPathSetting($event, $context)
     }
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
-    $_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
+    //$_SERVER['PHP_SELF'] = path_format($_SERVER['base_path'] . $path);
     $_SERVER['REMOTE_ADDR'] = $event['requestContext']['sourceIp'];
     $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['x-requested-with'];
+    $_SERVER['HTTP_USER_AGENT'] = $event['headers']['user-agent'];
+    if (isset($event['headers']['authorization'])) {
+        $basicAuth = splitfirst(base64_decode(splitfirst($event['headers']['authorization'], 'Basic ')[1]), ':');
+        $_SERVER['PHP_AUTH_USER'] = $basicAuth[0];
+        $_SERVER['PHP_AUTH_PW'] = $basicAuth[1];
+    }
+    $_SERVER['REQUEST_SCHEME'] = $event['headers']['x-api-scheme'];
+    //$_SERVER['REQUEST_SCHEME'] = $event['headers']['x-forwarded-proto'];
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $event['headers']['referer'])[2];
+    $_SERVER['HTTP_TRANSLATE']==$event['headers']['translate'];//'f'
+    $_SERVER['USER'] = 'qcloud';
     return $path;
 }
 
 function getConfig($str, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     //include 'config.php';
-    $s = file_get_contents('config.php');
+    $s = file_get_contents('.data/config.php');
     //$configs = substr($s, 18, -2);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') {
         $envs = json_decode($configs, true);
-        if (in_array($str, $InnerEnv)) {
+        if (isInnerEnv($str)) {
             if ($disktag=='') $disktag = $_SERVER['disktag'];
             if (isset($envs[$disktag][$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$disktag][$str]);
                 else return $envs[$disktag][$str];
             }
         } else {
             if (isset($envs[$str])) {
-                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
+                if (isBase64Env($str)) return base64y_decode($envs[$str]);
                 else return $envs[$str];
             }
         }
@@ -80,11 +87,9 @@ function getConfig($str, $disktag = '')
 
 function setConfig($arr, $disktag = '')
 {
-    global $InnerEnv;
-    global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     //include 'config.php';
-    $s = file_get_contents('config.php');
+    $s = file_get_contents('.data/config.php');
     //$configs = substr($s, 18, -2);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') $envs = json_decode($configs, true);
@@ -92,8 +97,11 @@ function setConfig($arr, $disktag = '')
     $indisk = 0;
     $operatedisk = 0;
     foreach ($arr as $k => $v) {
-        if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $envs[$k] = base64y_encode($v);
+            else $envs[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $envs[$disktag][$k] = base64y_encode($v);
             else $envs[$disktag][$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -103,9 +111,15 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
-            else $envs[$k] = $v;
+            $envs[$k] = $v;
         }
     }
     if ($indisk) {
@@ -115,13 +129,24 @@ function setConfig($arr, $disktag = '')
         $envs[$disktag] = $diskconfig;
     }
     if ($operatedisk) {
-        $disktags = array_unique($disktags);
-        foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
-        if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
-        else $envs['disktag'] = '';
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $envs['disktag'] = implode('|', $tags);
+            $envs[$arr['disktag_newname']] = $envs[$arr['disktag_rename']];
+            $envs[$arr['disktag_rename']] = '';
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
+            else $envs['disktag'] = '';
+        }
     }
     $envs = array_filter($envs, 'array_value_isnot_null');
-    ksort($envs);
+    //ksort($envs);
     $response = updateEnvironment($envs, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
     WaitSCFStat($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
     return $response;
@@ -260,7 +285,7 @@ language:<br>';
         return message($html, $title, 201);
     }
     $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
-    $title = 'Error';
+    $title = 'Install';
     return message($html, $title, 201);
 }
 
@@ -358,6 +383,7 @@ function copyFolder($from, $to)
 
 function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
+    sortConfig($Envs);
     // 获取当前代码并解压
     //$codeurl = json_decode(getfunctioncodeurl($function_name, $Region, $Namespace, $SecretId, $SecretKey), true)['Response']['Url'];
     //$codezip = '/tmp/oldcode.zip';
@@ -374,7 +400,7 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
     // 将配置写入
     $prestr = '<?php $configs = \'' . PHP_EOL;
     $aftstr = PHP_EOL . '\';';
-    file_put_contents($outPath . 'config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
+    file_put_contents($outPath . '.data/config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
 
     // 将目录中文件打包成zip
     $source = '/tmp/code.zip';
@@ -387,7 +413,7 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
 
     return updateProgram($function_name, $Region, $namespace, $SecretId, $SecretKey, $source);
     $tmp1['Response']['Error']['Message'] = $codeurl;
-    error_log($tmp1['Response']['Error']['Message']);
+    error_log1($tmp1['Response']['Error']['Message']);
     return json_encode($tmp1);
 }
 
@@ -443,7 +469,7 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     }
     WaitSCFStat($function_name, $Region, $Namespace, $SecretId, $SecretKey);
 
-    $s = file_get_contents('config.php');
+    $s = file_get_contents('.data/config.php');
     //$configs = substr($s, 18, -2);
     $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') $envs = json_decode($configs, true);
@@ -451,7 +477,7 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
         $envs[$k] = $v;
     }
     $envs = array_filter($envs, 'array_value_isnot_null');
-    ksort($envs);
+    //ksort($envs);
     $response = updateEnvironment($envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey);
     return $response;
 }
@@ -530,7 +556,7 @@ function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKe
     //    .' -H "X-TC-Version: '.$version.'"'
     //    .' -H "X-TC-Region: '.$region.'"'
     //    ." -d '".$payload."'";
-    //error_log( $curl.PHP_EOL );
+    //error_log1( $curl.PHP_EOL );
     //return '{"response": {"Error": {"Message":"' . $curl . '"}}}';
     $headers['Authorization'] = $authorization;
     $headers['Content-Type'] = 'application/json; charset=utf-8';
@@ -539,7 +565,7 @@ function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKe
     $headers['X-TC-Timestamp'] = $timestamp;
     $headers['X-TC-Version'] = $version;
     $headers['X-TC-Region'] = $region;
-    return curl_request('https://'.$host, $payload, $headers)['body'];
+    return curl('POST', 'https://'.$host, $payload, $headers)['body'];
 }
 
 function api_error($response)
@@ -585,7 +611,7 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
         }
     }
     // 放入配置文件
-    file_put_contents($outPath . '/config.php', file_get_contents(__DIR__.'/../config.php'));
+    file_put_contents($outPath . '/.data/config.php', file_get_contents(__DIR__ . '/../.data/config.php'));
 
     // 将目录中文件打包成zip
     //$zip=new ZipArchive();
@@ -619,3 +645,8 @@ function addFileToZip($zip, $rootpath, $path = '')
     }
     @closedir($path);
 }
+
+function WaitFunction() {
+    if ( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')),true)['Response']['Status']=='Active' ) return true;
+    else return false;
+}

platform/Vercel.php

@@ -0,0 +1,446 @@
+<?php
+// https://vercel.com/docs/api#endpoints/deployments/create-a-new-deployment
+
+function getpath()
+{
+    $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($_SERVER['HTTP_ACCEPT_LANGUAGE'],';')[0],',')[0]);
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    if (isset($_SERVER['HTTP_FLY_CLIENT_IP'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_FLY_CLIENT_IP'];
+    if ($_SERVER['REQUEST_SCHEME']!='http'&&$_SERVER['REQUEST_SCHEME']!='https') {
+        if ($_SERVER['HTTP_X_FORWARDED_PROTO']!='') {
+            $tmp = explode(',', $_SERVER['HTTP_X_FORWARDED_PROTO'])[0];
+            if ($tmp=='http'||$tmp=='https') $_SERVER['REQUEST_SCHEME'] = $tmp;
+        }
+        if ($_SERVER['HTTP_FLY_FORWARDED_PROTO']!='') $_SERVER['REQUEST_SCHEME'] = $_SERVER['HTTP_FLY_FORWARDED_PROTO'];
+    }
+    $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+    $_SERVER['referhost'] = explode('/', $_SERVER['HTTP_REFERER'])[2];
+    $_SERVER['base_path'] = "/";
+    if (isset($_SERVER['UNENCODED_URL'])) $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
+    $p = strpos($_SERVER['REQUEST_URI'],'?');
+    if ($p>0) $path = substr($_SERVER['REQUEST_URI'], 0, $p);
+    else $path = $_SERVER['REQUEST_URI'];
+    $path = path_format( substr($path, strlen($_SERVER['base_path'])) );
+    $_SERVER['DOCUMENT_ROOT'] = '/var/task/user';
+    return $path;
+}
+
+function getGET()
+{
+    if (!$_POST) {
+        if (!!$HTTP_RAW_POST_DATA) {
+            $tmpdata = $HTTP_RAW_POST_DATA;
+        } else {
+            $tmpdata = file_get_contents('php://input');
+        }
+        if (!!$tmpdata) {
+            $postbody = explode("&", $tmpdata);
+            foreach ($postbody as $postvalues) {
+                $pos = strpos($postvalues,"=");
+                $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1));
+            }
+        }
+    }
+    if (isset($_SERVER['UNENCODED_URL'])) $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL'];
+    $p = strpos($_SERVER['REQUEST_URI'],'?');
+    if ($p>0) {
+        $getstr = substr($_SERVER['REQUEST_URI'], $p+1);
+        $getstrarr = explode("&",$getstr);
+        foreach ($getstrarr as $getvalues) {
+            if ($getvalues != '') {
+                $pos = strpos($getvalues, "=");
+            //echo $pos;
+                if ($pos > 0) {
+                    $getarry[urldecode(substr($getvalues, 0, $pos))] = urldecode(substr($getvalues, $pos + 1));
+                } else {
+                    $getarry[urldecode($getvalues)] = true;
+                }
+            }
+        }
+    }
+    if (isset($getarry)) {
+        return $getarry;
+    } else {
+        return [];
+    }
+}
+
+function getConfig($str, $disktag = '')
+{
+    if (isInnerEnv($str)) {
+        if ($disktag=='') $disktag = $_SERVER['disktag'];
+        $tmp = getenv($disktag);
+        if (is_array($tmp)) $env = $tmp;
+        else $env = json_decode($tmp, true);
+        if (isset($env[$str])) {
+            if (isBase64Env($str)) return base64y_decode($env[$str]);
+            else return $env[$str];
+        }
+    } else {
+        if (isBase64Env($str)) return base64y_decode(getenv($str));
+        else return getenv($str);
+    }
+    return '';
+}
+
+function setConfig($arr, $disktag = '')
+{
+    if ($disktag=='') $disktag = $_SERVER['disktag'];
+    $disktags = explode("|", getenv('disktag'));
+    if ($disktag!='') {
+        $tmp = getenv($disktag);
+        if (is_array($tmp)) $diskconfig = $tmp;
+        else $diskconfig = json_decode($tmp, true);
+    }
+    $tmp = [];
+    $indisk = 0;
+    $operatedisk = 0;
+    foreach ($arr as $k => $v) {
+        if (isCommonEnv($k)) {
+            if (isBase64Env($k)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        } elseif (isInnerEnv($k)) {
+            if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v);
+            else $diskconfig[$k] = $v;
+            $indisk = 1;
+        } elseif ($k=='disktag_add') {
+            array_push($disktags, $v);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_del') {
+            $disktags = array_diff($disktags, [ $v ]);
+            $tmp[$v] = '';
+            $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tagvalue = getenv($v);
+            if (is_array($tagvalue)) $tmp[$newtag] = json_encode($tagvalue);
+            else $tmp[$newtag] = $tagvalue;
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
+        } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
+            if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
+        } else {
+            $tmp[$k] = json_encode($v);
+        }
+    }
+    if ($indisk) {
+        $diskconfig = array_filter($diskconfig, 'array_value_isnot_null');
+        ksort($diskconfig);
+        $tmp[$disktag] = json_encode($diskconfig);
+    }
+    if ($operatedisk) {
+        if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') {
+            $tags = [];
+            foreach ($disktags as $tag) {
+                if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']);
+                else array_push($tags, $tag);
+            }
+            $tmp['disktag'] = implode('|', $tags);
+            $tagvalue = getenv($arr['disktag_rename']);
+            if (is_array($tagvalue)) $tmp[$arr['disktag_newname']] = json_encode($tagvalue);
+            else $tmp[$arr['disktag_newname']] = $tagvalue;
+            $tmp[$arr['disktag_rename']] = null;
+        } else {
+            $disktags = array_unique($disktags);
+            foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|';
+            if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1);
+            else $tmp['disktag'] = null;
+        }
+    }
+    foreach ($tmp as $key => $val) if ($val=='') $tmp[$key]=null;
+
+    //error_log1(json_encode($arr, JSON_PRETTY_PRINT) . ' => tmp：' . json_encode($tmp, JSON_PRETTY_PRINT));
+    //echo json_encode($arr, JSON_PRETTY_PRINT) . ' => tmp：' . json_encode($tmp, JSON_PRETTY_PRINT);
+    return setVercelConfig($tmp, getConfig('HerokuappId'), getConfig('APIKey'));
+}
+
+function install()
+{
+    global $constStr;
+    if ($_GET['install1']) {
+        if ($_POST['admin']!='') {
+            $tmp['admin'] = $_POST['admin'];
+            //$tmp['language'] = $_POST['language'];
+            $tmp['timezone'] = $_COOKIE['timezone'];
+            $APIKey = $_POST['APIKey'];
+            //if ($APIKey=='') {
+            //    $APIKey = getConfig('APIKey');
+            //}
+            $tmp['APIKey'] = $APIKey;
+
+            $token = $APIKey;
+            $header["Authorization"] = "Bearer " . $token;
+            $header["Content-Type"] = "application/json";
+            $aliases = json_decode(curl("GET", "https://api.vercel.com/v3/now/aliases", "", $header)['body'], true);
+            $host = splitfirst($_SERVER["host"], "//")[1];
+            foreach ($aliases["aliases"] as $key => $aliase) {
+                if ($host==$aliase["alias"]) $projectId = $aliase["projectId"];
+            }
+            $tmp['HerokuappId'] = $projectId;
+
+            $response = json_decode(setVercelConfig($tmp, $projectId, $APIKey), true);
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 400);
+            } else {
+                /*$html = '<script>
+        var status = "' . $response['status'] . '";
+        var expd = new Date();
+        expd.setTime(expd.getTime()+1000);
+        var expires = "expires="+expd.toGMTString();
+        document.cookie=\'language=; path=/; \'+expires;
+    </script>';
+                return message($html, $title, 201, 1);*/
+                $data["dplId"] = $response['status'];
+                return output(json_encode($data), 201);
+            }
+        }
+    }
+    if ($_GET['install0']) {
+        $html .= '
+    <form action="?install1" method="post" onsubmit="return notnull(this);">
+language:<br>';
+        foreach ($constStr['languages'] as $key1 => $value1) {
+            $html .= '
+        <label><input type="radio" name="language" value="'.$key1.'" '.($key1==$constStr['language']?'checked':'').' onclick="changelanguage(\''.$key1.'\')">'.$value1.'</label><br>';
+        }
+        //if (getConfig('APIKey')=='') 
+        $html .= '<br>
+        <a href="https://vercel.com/account/tokens" target="_blank">' . getconstStr('Create') . ' token</a><br>
+        <label>Token:<input name="APIKey" type="password" placeholder="" value="' . getConfig('APIKey') . '"></label><br>';
+        $html .= '<br>
+        <label>Set admin password:<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>';
+        $html .= '
+        <input type="submit" value="'.getconstStr('Submit').'">
+    </form>
+    <div id="showerror"></div>
+    <script>
+        var nowtime= new Date();
+        var timezone = 0-nowtime.getTimezoneOffset()/60;
+        var expd = new Date();
+        expd.setTime(expd.getTime()+(2*60*60*1000));
+        var expires = "expires="+expd.toGMTString();
+        document.cookie="timezone="+timezone+"; path=/; "+expires;
+        var errordiv = document.getElementById("showerror");
+        function changelanguage(str)
+        {
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=\'+str+\'; path=/; \'+expires;
+            location.href = location.href;
+        }
+        function notnull(t)
+        {
+            if (t.admin.value==\'\') {
+                alert(\'input admin\');
+                return false;
+            }
+            if (t.APIKey.value==\'\') {
+                alert(\'input Token\');
+                return false;
+            }
+            t.style.display = "none";
+            errordiv.innerHTML = "' . getconstStr('Wait') . '";
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", t.action);
+            xhr.onload = function(e) {
+                if (xhr.status==201) {
+                    var res = JSON.parse(xhr.responseText);
+                    getStatus(res.dplId, t.APIKey.value);
+                } else {
+                    t.style.display = "";
+                    errordiv.innerHTML = xhr.status + "<br>" + xhr.responseText;
+                }
+            }
+            xhr.send("admin=" + t.admin.value + "&APIKey=" + t.APIKey.value);
+
+            var x = "";
+            var min = 0;
+            function getStatus(id, VercelToken) {
+                x += ".";
+                min++;
+                var xhr = new XMLHttpRequest();
+                var url = "https://api.vercel.com/v11/now/deployments/" + id;
+                xhr.open("GET", url);
+                xhr.setRequestHeader("Authorization", "Bearer " + VercelToken);
+                xhr.onload = function(e) {
+                    if (xhr.status==200) {
+                        var deployStat = JSON.parse(xhr.responseText).readyState;
+                        if (deployStat=="READY") {
+                            x = "";
+                            min = 0;
+                            errordiv.innerHTML = "Deploy done.";
+                            location.href = "/";
+                        } else {
+                            errordiv.innerHTML = deployStat + ", " + min + ".<br>' . getconstStr('Wait') . ' " + x;
+                            if (deployStat!=="ERROR") setTimeout(function() { getStatus(id, VercelToken) }, 1000);
+                        }
+                    } else {
+                        t.style.display = "";
+                        console.log(xhr.status);
+                        console.log(xhr.responseText);
+                    }
+                }
+                xhr.send(null);
+            }
+
+            return false;
+        }
+    </script>';
+        $title = getconstStr('SelectLanguage');
+        return message($html, $title, 201);
+    }
+
+    if (substr($_SERVER["host"], -10)=="vercel.app") {
+        $html .= '<a href="?install0">' . getconstStr('ClickInstall') . '</a>, ' . getconstStr('LogintoBind');
+        $html .= "<br>Remember: you MUST wait 30-60s after each operate / do some change, that make sure Vercel has done the building<br>" ;
+    } else {
+        $html.= "Please visit form *.vercel.app";
+    }
+    $title = 'Install';
+    return message($html, $title, 201);
+}
+
+// POST /v8/projects/:id/env
+function setVercelConfig($envs, $appId, $token)
+{
+    $url = "https://api.vercel.com/v8/projects/" . $appId . "/env";
+    $header["Authorization"] = "Bearer " . $token;
+    $header["Content-Type"] = "application/json";
+    $response = curl("GET", $url, "", $header);
+    $result = json_decode($response['body'], true);
+    foreach ($result["envs"] as $key => $value) {
+        $existEnvs[$value["key"]] = $value["id"];
+    }
+    $response = null;
+    foreach ($envs as $key => $value) {
+        $tmp = null;
+        $tmp["type"] = "encrypted";
+        $tmp["key"] = $key;
+        $tmp["value"] = $value;
+        $tmp["target"] = [ "development", "production", "preview" ];
+        if (isset($existEnvs[$key])) {
+            if ($value) $response = curl("PATCH", $url . "/" . $existEnvs[$key], json_encode($tmp), $header);
+            else $response = curl("DELETE", $url . "/" . $existEnvs[$key], "", $header);
+        } else {
+            if ($value) $response = curl("POST", $url, json_encode($tmp), $header);
+        }
+        //echo $key . " = " . $value . ", <br>" . json_encode($response, JSON_PRETTY_PRINT) . "<br>";
+        if ($response['stat']!=200) return $response['body'];
+    }
+    return VercelUpdate($appId, $token);
+}
+
+function VercelUpdate($appId, $token, $sourcePath = "")
+{
+    $url = "https://api.vercel.com/v12/now/deployments";
+    $header["Authorization"] = "Bearer " . $token;
+    $header["Content-Type"] = "application/json";
+    $data["name"] = "OneManager";
+    $data["project"] = $appId;
+    $data["target"] = "production";
+    $data["routes"][0]["src"] = "/(.*)";
+    $data["routes"][0]["dest"] = "/api/index.php";
+    $data["functions"]["api/index.php"]["runtime"] = "vercel-php@0.4.0";
+    if ($sourcePath=="") $sourcePath = splitlast(splitlast(__DIR__, "/")[0], "/")[0];
+    //echo $sourcePath . "<br>";
+    getEachFiles($file, $sourcePath);
+    $data["files"] = $file;
+
+    //echo json_encode($data, JSON_PRETTY_PRINT) . " ,data<br>";
+    $response = curl("POST", $url, json_encode($data), $header);
+    $result = json_decode($response["body"], true);
+    $result['status'] = $result['id'];
+    return json_encode($result);
+}
+
+function getEachFiles(&$file, $base, $path = "")
+{
+    //if (substr($base, -1)=="/") $base = substr($base, 0, -1);
+    //if (substr($path, -1)=="/") $path = substr($path, 0, -1);
+    $handler=opendir(path_format($base . "/" . $path));
+    while($filename=readdir($handler)) {
+        if($filename != '.' && $filename != '..' && $filename != '.git'){
+            $fromfile = path_format($base . "/" . $path . "/" . $filename);
+        //echo $fromfile . "<br>";
+            if(is_dir($fromfile)){// 如果读取的某个对象是文件夹，则递归
+                $response = getEachFiles($file, $base, path_format($path . "/" . $filename));
+                if (api_error(setConfigResponse($response))) return $response;
+            }else{
+                $tmp['file'] = path_format($path . "/" . $filename);
+                $tmp['data'] = file_get_contents($fromfile);
+                $file[] = $tmp;
+            }
+        }
+    }
+    closedir($handler);
+    
+    return json_encode( [ 'response' => 'success' ] );
+}
+
+function api_error($response)
+{
+    return isset($response['error']);
+}
+
+function api_error_msg($response)
+{
+    return $response['error']['code'] . '<br>
+' . $response['error']['message'] . '<br>
+<button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
+}
+
+function setConfigResponse($response)
+{
+    return json_decode($response, true);
+}
+
+function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
+{
+    $tmppath = '/tmp';
+
+    // 从github下载对应tar.gz，并解压
+    $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
+    $tarfile = $tmppath . '/github.tar.gz';
+    $githubfile = file_get_contents($url);
+    if (!$githubfile) return '{"error":{"message":"fail to download from github"}}';
+    file_put_contents($tarfile, $githubfile);
+        $phar = new PharData($tarfile); // need php5.3, 7, 8
+        $phar->extractTo($tmppath, null, true);//路径 要解压的文件 是否覆盖
+    unlink($tarfile);
+
+    $outPath = '';
+    $tmp = scandir($tmppath);
+    $name = $auth . '-' . $project;
+    mkdir($tmppath . "/" . $name, 0777);
+    foreach ($tmp as $f) {
+        if ( substr($f, 0, strlen($name)) == $name) {
+            rename($tmppath . '/' . $f, $tmppath . "/" . $name . '/api');
+            $outPath = $tmppath . "/" . $name;
+            break;
+        }
+    }
+    //echo $outPath . "<br>";
+    //error_log1($outPath);
+    if ($outPath=='') return '{"error":{"message":"no outpath"}}';
+
+    return VercelUpdate(getConfig('HerokuappId'), getConfig('APIKey'), $outPath);
+}
+
+function WaitFunction($deployid) {
+    $header["Authorization"] = "Bearer " . getConfig('APIKey');
+    $header["Content-Type"] = "application/json";
+    $url = "https://api.vercel.com/v11/now/deployments/" . $deployid;
+    $response = curl("GET", $url, "", $header);
+    if ($response['stat']==200) {
+        $result = json_decode($response['body'], true);
+        if ($result['readyState']=="READY") return true;
+        if ($result['readyState']=="ERROR") return $response;
+        return false;
+    } else {
+        $response['body'] .= $url;
+        return $response;
+    }
+}

readme.md

@@ -1,11 +1,33 @@
-Install program first, then add onedrive in setup after login.  
-先安装程序，登录后在设置中添加onedrive。  
+# NOTICE: the release is used as archive. 
+# 注意：release只是用来存档的。
+Please read the descriptions of settings before raising an issue.  
+请将设置中所有的设置项的说明都读一遍，有些问题就不用问了。  
 
 # Deploy to Heroku  
 Official: https://heroku.com  
 Demo: https://herooneindex.herokuapp.com/  
 
-How to Install: Click the button [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/qkqpttgf/OneManager-php) to Deploy a new app, or create an app then deploy via connect to your github fork.  
+How to Install:   
+> ~~Click the button [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/qkqpttgf/OneManager-php) to Deploy a new app~~(`"We couldn't deploy your app because the source code violates the Salesforce Acceptable Use and External-Facing Services Policy."`)  
+> Fork this project, create a heroku app, then turn to Deploy tab, deploy via connect to your github fork.   
+
+
+# Deploy to Glitch  
+Official: https://glitch.com/  
+Demo: https://onemanager.glitch.me/  
+
+How to Install: New Project -> Import form Github -> paste "https://github.com/qkqpttgf/OneManager-php", after done, Show -> In a New Window.  
+
+
+# Deploy to Vercel  
+Official: https://vercel.com/  
+Demo: null  
+Notice: 
+> 1, you must wait 30-50s to make sure deploy READY after change config;  
+> 2, the max size of environment is 4k, so you can add 3 onedrive or less;  
+> 3, Vercel limit 100 deploy every day.  
+
+How to Install: https://scfonedrive.github.io/Vercel/Deploy.html .  
 
 
 # Deploy to Tencent Serverless Cloud Function (SCF 腾讯无服务器云函数)  
@@ -13,11 +35,57 @@ Official: https://cloud.tencent.com/product/scf
 DEMO:  无  
 注意：SCF新增限制，环境变量整体最大4KB，所以最多添加4个盘。  
 
-How to Install:  无，（重点：勾选集成响应）  
+How to Install:  
+1，进入函数服务，上方选择地区，然后点击新建。  
+2，输入函数名称，选择模板函数，在模糊搜索中输入onedrive，大小写随意，选择那个【获取onedrive信息.....】，点下一步，在代码界面不用动，直接点完成。  
+3，点击触发管理，创建触发器，触发方式改成API网关触发，底下勾选启用集成响应，提交。  
+4，在触发管理中可以看到一个 访问路径，访问它，开始安装。  
+
+（重点：勾选集成响应）  
   
 添加网盘时，SCF可能会反应不过来，不跳转到微软，导致添加失败，请不要删除这个盘，再添加一次相同标签的盘就可以了。  
 
 
+# Deploy to Huawei cloud Function Graph (FG 华为云函数工作流)  
+Official: https://console.huaweicloud.com/functiongraph/  
+DEMO:  无  
+注意：FG中，环境变量整体大小为2KB，所以最多添加2个盘（一个onedrive一个aliyundrive）。  
+
+How to Install:  
+  1，在函数列表，点右边创建函数  
+  2，输入名称，选择运行时语言为PHP7.3，点上传ZIP文件，选择文件，然后点右边的创建函数（这里的ZIP文件不能直接用从Github上下载的ZIP文件，要将它解压后，去掉外层文件夹后，再压缩为ZIP。）  
+  3，创建触发器：选API网关，安全认证选None，后端超时（毫秒）将5000改成30000，上面创建分组一下，其它的点点点  
+  4，访问触发器给的url，开始安装  
+  5，在触发器界面点触发器名称，跳到API网关管理，右边更多URL，可以添加自定义域名，自定义域名后发现还是要 xxxx.com/函数名 来访问，点上方的编辑，第1页不用改，点下一步，请求Path改成/，注意匹配模式是前缀匹配，Method为ANY，然后不用点下一步了，点立即完成，然后去发布生效  
+
+
+# Deploy to Aliyun Function Compute (FC 阿里云函数计算)  
+Official: https://fc.console.aliyun.com/  
+DEMO:  无  
+
+How to Install:  
+  1，新建函数 -- HTTP函数  
+  2，运行环境选择php7.2  
+  3，触发器认证方式选择anonymous，请求方式里面，点一下GET，再点一下POST，最终框框里面有这2个  
+  4，上传代码  
+  5，触发器中点进去，找到配置自定义域名，点击前往，创建，路径中填 /* ，其它下拉选择。  
+  6，访问你的域名，开始安装  
+
+
+# Deploy to Baidu Cloud Function Compute (CFC 百度云函数计算)  
+Official: https://console.bce.baidu.com/cfc/#/cfc/functions  
+DEMO:  无  
+自定义域名需要另外使用API网关，并备案。  
+
+How to Install:  
+  1，在函数列表，点创建函数  
+  2，创建方式改为空白函数，点下一步  
+  3，输入名称，选择运行时为PHP7.2，点下一步  
+  4，触发器：下拉选择HTTP触发器，URL路径填 /{filepath+} ，HTTP方法全选，身份验证：不验证，点提交  
+  5，进入代码编辑页，编辑类型改上传函数ZIP包，选择文件（这里的ZIP文件不能直接用从Github上下载的ZIP文件，要将它解压后，去掉外层文件夹后，再压缩为ZIP。），开始上传  
+  6，点击右边触发器，复制并访问提供的url，开始安装  
+
+
 # Deploy to Virtual Private Server (VPS 或空间)  
 DEMO:  无  
 How to Install:  
@@ -27,52 +95,12 @@ How to Install:
     开启伪静态(重写)功能，规则在.htaccess文件中，ngnix从里面复制，我们的目的是不管访问什么都让index.php来处理。  
     3.Upload code.  
     上传好代码。  
-    4.Change the file config.php can be read&write (666 is suggested).  
-    让代码中的config.php文件程序可读写，推荐chmod 666 config.php。  
+    4.Change the file .data/config.php can be read&write (666 is suggested).  
+    使web身份可读写代码中的.data/config.php文件，推荐chmod 666 .data/config.php。  
     5.View the website in chrome or other.  
     在浏览器中访问。  
 
 
-# Deploy to Huawei cloud Function Graph (FG 华为云函数工作流)  
-Official: https://console.huaweicloud.com/functiongraph/  
-DEMO:  无  
-注意：FG中，环境变量整体大小为2KB，所以最多添加2个盘。  
-
-How to Install:  
-1，在函数列表，点右边创建函数  
-2，输入名称，选择运行时语言为PHP7.3，点上传ZIP文件，选择文件，然后点右边的创建函数（这里的ZIP文件不能直接用从Github上下载的ZIP文件，要将它解压后，去掉外层文件夹后，再压缩为ZIP。）  
-3，创建触发器：选API网关，安全认证选None，后端超时（毫秒）将5000改成30000，上面创建分组一下，其它的点点点  
-4，访问触发器给的url，开始安装  
-5，在触发器界面点触发器名称，跳到API网关管理，右边更多URL，可以添加自定义域名，自定义域名后发现还是要 xxxx.com/函数名 来访问，点上方的编辑，第1页不用改，点下一步，请求Path改成/，注意匹配模式是前缀匹配，Method为ANY，然后不用点下一步了，点立即完成，然后去发布生效  
-
-
-# Deploy to Aliyun Function Compute (FC 阿里云函数计算)  
-Official: https://fc.console.aliyun.com/  
-DEMO:  无  
-
-How to Install:  
-1，新建函数 -- HTTP函数  
-2，运行环境选择php7.2  
-3，触发器认证方式选择anonymous，请求方式里面，点一下GET，再点一下POST，最终框框里面有这2个  
-4，上传代码  
-5，触发器中点进去，找到配置自定义域名，点击前往，创建，路径中填 /* ，其它下拉选择。  
-6，访问你的域名，开始安装  
-
-
-# Deploy to Baidu Cloud Function Compute (CFC 百度云函数计算)  
-Official: https://console.bce.baidu.com/cfc/#/cfc/functions  
-DEMO:  无  
-自定义域名需要另外使用API网关，并备案。  
-
-How to Install:  
-1，在函数列表，点创建函数  
-2，创建方式改为空白函数，点下一步  
-3，输入名称，选择运行时为PHP7.2，点下一步  
-4，触发器：下拉选择HTTP触发器，URL路径填 /{filepath+} ，HTTP方法全选，身份验证：不验证，点提交  
-5，进入代码编辑页，编辑类型改上传函数ZIP包，选择文件（这里的ZIP文件不能直接用从Github上下载的ZIP文件，要将它解压后，去掉外层文件夹后，再压缩为ZIP。），开始上传  
-6，点击右边触发器，复制并访问提供的url，开始安装  
-
-
 # Features 特性  
 When downloading files, the program produce a direct url, visitor download files from MS OFFICE via the direct url, the server expend a few bandwidth in produce.  
 下载时，由程序解析出直链，浏览器直接从微软Onedrive服务器下载文件，服务器只消耗与微软通信的少量流量。  
@@ -91,5 +119,19 @@ If there is 'index.html' file, program will only show the content of 'index.html
 Click 'EditTime' or 'Size', the list will sort by time or size, Click 'File' can resume sort.  
 点击“时间”、“大小”，可以排序显示，点“文件”恢复原样。  
 
-QQ Group: 943919989 (请看完上面的中英双语再加群，谢谢！)  
+# Functional files 功能性文件  
+### favicon.ico  
+put it in the showing home folder of FIRST disk (maybe not root of onedrive). 放在第一个盘的显示目录（不一定是onedrive根目录）。  
+### index.html  
+show content of index.html as html. 将index.html以静态网页显示出来。  
+### head.md readme.md  
+it will showed at top or bottom as markdown. 以MD语法显示在顶部或底部。  
+### head.omf foot.omf  
+it will showed at top or bottom as html (javascript works!). 以html显示在顶部或底部（可以跑js）。  
+
+# A cup of coffee  
+paypal.me/qkqpttgf  
+
+# Chat  
+QQ Group: 212088653 (请看完上面的中英双语再加群，谢谢！)  
 Telegram Group: https://t.me/joinchat/I_RVc0bqxuxlT-d0cO7ozw  

theme/Onedrive-dev.html

@@ -254,14 +254,14 @@
             <div class="title pull-left">
                 <a href="<!--base_path-->"><!--Sitename--></a>
             </div>
-            <div class="pull-right">
+            <div class="pull-right"><!--
 <!--LoginStart-->
                 <a class="pull-left" onclick="/*login();*/"><!--constStr@Login--></a>
 <!--LoginEnd-->
 <!--AdminStart-->
                 <a class="pull-left" onclick="logout();"><!--constStr@Logout--></a>
 <!--AdminEnd-->
-                &nbsp;| 
+                &nbsp;| -->
                 <div class="pull-right lang">
                     <select name="language" id="language" class="language" onchange="changelanguage(this.options[this.options.selectedIndex].value)">
                         <option value="">Language</option>

theme/apache.html

@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+ <head>
+  <title><!--Sitename--> /<!--PathArrayStart--><!--PathArrayName-->/<!--PathArrayEnd--></title>
+ </head>
+ <body>
+<h1><!--Sitename--> /<!--DiskPathArrayStart--><!--PathArrayName-->/<!--DiskPathArrayEnd--></h1>
+  <table>
+   <tr><th><a href="?C=N;O=D">Name</a></th><th><a href="?C=M;O=A">Last modified</a></th><th><a href="?C=S;O=A">Size</a></th><th><a href="?C=D;O=A">Description</a></th></tr>
+   <tr><th colspan="4"><hr></th></tr>
+<!--BackArrowStart-->
+   <tr><td><a href="<!--BackArrowUrl-->">Parent Directory</a>       </td><td>&nbsp;</td><td align="right">  - </td><td>&nbsp;</td></tr>
+<!--BackArrowEnd-->
+<!--ListStart-->
+<!--IsFolderStart-->
+<!--FolderListStart-->
+   <tr><td><a href="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName-->/</a></td><td align="right"><!--lastModifiedDateTime--></td><td align="right">  - </td><td>&nbsp;</td></tr>
+<!--FolderListEnd-->
+<!--FileListStart-->
+   <tr><td><a href="<!--FileEncodeReplaceUrl-->"><!--FileEncodeReplaceName--></a></td><td align="right"><!--lastModifiedDateTime--></td><td align="right"><!--size--></td><td>&nbsp;</td></tr>
+<!--FileListEnd-->
+<!--IsFolderEnd-->
+<!--ListEnd-->
+   <tr><th colspan="4"><hr></th></tr>
+  </table>
+ </body>
+</html>

theme/classic.html

@@ -3,9 +3,9 @@
     "music":"musical-notes",
     "video":"logo-youtube",
     "img":"image",
-    "office":"paper",
+    "office":"newspaper",
     "txt":"clipboard",
-    "zip":"filing",
+    "zip":"file-tray-full",
     "iso":"disc",
     "apk":"logo-android",
     "exe":"logo-windows",
@@ -31,13 +31,13 @@
         .title{text-align:center;margin-top:1rem;letter-spacing:2px;margin-bottom:2rem}
         .title a{color:#333;text-decoration:none}
         .list-wrapper{width:80%;margin:0 auto 30px;position:relative;box-shadow:0 0 32px 0 rgb(128,128,128);border-radius:15px;}
-        .list-container{position:relative;overflow:hidden;border-radius:15px;}
+        .list-container{position:relative;/*overflow:hidden;*/border-radius:15px;background-color:rgba(245,245,245,0.5);}
+        .list-container,.list-header-container,.list-wrapper,a.back-link:hover,body{color:#24292e}
         .list-header-container{position:relative}
         .list-header-container a.back-link{color:#000;display:inline-block;position:absolute;font-size:16px;margin:20px 10px;padding:10px 10px;vertical-align:middle;text-decoration:none}
-        .list-container,.list-header-container,.list-wrapper,a.back-link:hover,body{color:#24292e}
-        .table-header{margin:0;border:0 none;padding:30px 30px;text-align:left;font-weight:400;color:#000;background-color:rgba(245,245,245,0.5);word-break: break-all;word-wrap: break-word;}
-        .list-body-container{position:relative;left:0;overflow-x:hidden;overflow-y:auto;box-sizing:border-box;background:rgba(245,245,245,0.5)}
-        .more-disk{margin:0;border:0 none;padding:30px 30px;text-align:left;font-weight:400;color:#000;background-color:rgba(245,245,245,0.5);white-space:nowrap;overflow:auto;}
+        .table-header{margin:0;border:0 none;padding:30px 30px;text-align:left;font-weight:400;color:#000;word-break: break-all;word-wrap: break-word;}
+        .list-body-container{position:relative;left:0;box-sizing:border-box;/*overflow-x:hidden;overflow-y:auto;background:rgba(245,245,245,0.5)*/}
+        .more-disk{margin:0;border:0 none;padding:30px 30px;text-align:left;font-weight:400;color:#000;white-space:nowrap;overflow:auto;}
         .more-disk a{margin:0 10px;padding:5px;transition-duration: 0.4s;border-radius: 12px; background-color: white; color: black; border: 2px solid rgba(85,85,85,0.7); }
         .more-disk a:hover, .more-disk a[now]{ background-color: rgba(85,85,85,0.7); color: white; }
         .list-table{width:100%;padding:0 20px 20px 20px;border-spacing:0}
@@ -54,15 +54,16 @@
         .operate{display:inline-table;margin:0;margin-right:5px;list-style:none}
         .operate ul{position:absolute;display:none;background:#fffaaa;border:0px #f7f7f7 solid;border-radius:5px;margin:-7px 0 0 0;padding:0 7px;color:#205D67;z-index:1;}
         .operate:hover ul{position:absolute;display:inline-table;}
+        body .active ul{position:absolute;display:inline-table;} /*for some mobile browser */
         .operate ul li{padding:7px;list-style:none;display:block;}
         .list-table tr[data-to]:hover .operate ul li a{color:black}
 <!--AdminEnd-->
         .operatediv{position:absolute;border:1px #CCCCCC;background-color:#FFFFCC;z-index:2;}
         .operatediv div{margin:16px}
         .operatediv_close{position:absolute;right:3px;top:3px;}
-        .readme{padding:8px;background-color:rgba(245,245,245,0.5);}
+        .readme{padding:8px;}
         .markdown-body, .customfile{padding:20px;text-align:left}
-        @media only screen and (max-width:480px){
+        @media only screen and (orientation: portrait){
 <!--BackgroundMStart-->
             body{background-repeat:no-repeat;background-size:cover;background-attachment:fixed;background-image:url("<!--BackgroundMUrl-->");}
 <!--BackgroundMEnd-->
@@ -85,7 +86,7 @@
         <li class="operate"><ion-icon name="construct"></ion-icon><!--constStr@Operate--><ul>
 <!--IsFolderStart-->
             <li><a onclick="showdiv(event,'create','');"><ion-icon name="add-circle"></ion-icon><!--constStr@Create--></a></li>
-            <li><a onclick="showdiv(event,'encrypt','');"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a></li>
+            <li><a onclick="showdiv(event,'encrypt','');"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a></li>
             <li><a href="?RefreshCache"><ion-icon name="refresh"></ion-icon><!--constStr@RefreshCache--></a></li>
 <!--IsFolderEnd-->
             <li><a href="<!--IsPreview?-->setup"><ion-icon name="settings"></ion-icon><!--constStr@Setup--></a></li>
@@ -156,30 +157,34 @@
                 <div style="padding:20px">
 	            <center>
 	                <form action="" method="post">
-		            <input name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+		            <input id="password1" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
 		            <input type="submit" value="<!--constStr@Submit-->">
 	                </form>
                 </center>
                 </div>
 <!--EncryptedEnd-->
 <!--GuestUploadStart-->
-                <div id="upload_div" style="margin:10px">
-                    <div id="upload_btns" align="center">
-                    <input id="upload_file" type="file" name="upload_filename">
+                <div id="upload_div" style="padding:0 0 16px 0">
+                <div id="upload_btns" align="center">
+                    <select onchange="document.getElementById('upload_file').webkitdirectory=this.value;">
+                        <option value=""><!--constStr@UploadFile--></option>
+                        <option value="1"><!--constStr@UploadFolder--></option>
+                    </select>
+                    <input id="upload_file" type="file" name="upload_filename" multiple="multiple">
                     <input id="upload_submit" onclick="preup();" value="<!--constStr@Upload-->" type="button">
-                    </div>
+                </div>
                 </div>
 <!--GuestUploadEnd-->
 
 <!--IsFileStart-->
-                <div style="margin: 12px 4px 4px; text-align: center">
+                <div style="padding: 12px 4px 4px; text-align: center">
                     <div style="margin: 24px">
                         <textarea id="url" title="url" rows="1" style="width: 100%; margin-top: 2px;" readonly><!--FileEncodeUrl--></textarea>
-                        <a href="<!--FileUrl-->"><ion-icon name="download" style="line-height: 16px;vertical-align: middle;"></ion-icon>&nbsp;<!--constStr@Download--></a>
+                        <a href="<!--FileEncodeUrl-->"><ion-icon name="download" style="line-height: 16px;vertical-align: middle;"></ion-icon>&nbsp;<!--constStr@Download--></a>
                     </div>
                     <div style="margin: 24px">
 <!--IsimgFileStart-->
-                        <img src="<!--FileDownUrl-->" alt="<!--FileName-->" onload="if (this.offsetWidth>document.getElementById('url').offsetWidth) this.style.width='100%';" />
+                        <img src="<!--FileEncodeUrl-->" alt="<!--FileName-->" onload="if (this.offsetWidth>document.getElementById('url').offsetWidth) this.style.width='100%';if (this.offsetHeight>document.documentElement.clientHeight) this.style.height=document.documentElement.clientHeight + 'px';" />
 <!--IsimgFileEnd-->
 <!--IsvideoFileStart-->
                         <div id="video-a0"></div>
@@ -236,7 +241,7 @@
 <!--AdminStart-->
                             <li class="operate"><ion-icon name="construct"></ion-icon><a><!--constStr@Operate--></a>
                             <ul>
-                                <li><a onclick="showdiv(event,'encrypt',<!--filenum-->);"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a></li>
+                                <li><a onclick="showdiv(event,'encrypt',<!--filenum-->);"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a></li>
                                 <li><a onclick="showdiv(event, 'rename',<!--filenum-->);"><ion-icon name="create"></ion-icon><!--constStr@Rename--></a></li>
                                 <li><a onclick="showdiv(event, 'move',<!--filenum-->);"><ion-icon name="move"></ion-icon><!--constStr@Move--></a></li>
                                 <li><a onclick="showdiv(event, 'copy',<!--filenum-->);"><ion-icon name="copy"></ion-icon><!--constStr@Copy--></a></li>
@@ -245,7 +250,7 @@
                             </li>
 <!--AdminEnd-->
                             <ion-icon name="folder"></ion-icon>
-                            <a id="file_a<!--filenum-->" name="folderlist" href="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName--></a>
+                            <a id="file_a<!--filenum-->" name="folderlist" href="<!--FileEncodeReplaceUrl-->/" fileid="<!--FileId-->"><!--FileEncodeReplaceName--></a>
                         </td>
                         <td class="updated_at" id="folder_time<!--filenum-->"><!--lastModifiedDateTime--></td>
                         <td class="size" id="folder_size<!--filenum-->"><!--size--></td>
@@ -265,7 +270,7 @@
                             </li>
 <!--AdminEnd-->
                             <ion-icon name="<!--IconValue-->"></ion-icon>
-                            <a id="file_a<!--filenum-->" name="filelist" href="<!--FileEncodeReplaceUrl-->?preview" target=_blank><!--FileEncodeReplaceName--></a>
+                            <a id="file_a<!--filenum-->" name="filelist" href="<!--FileEncodeReplaceUrl-->?preview" fileid="<!--FileId-->" target=_blank><!--FileEncodeReplaceName--></a>
                             <a class="download" href="<!--FileEncodeReplaceUrl-->"><ion-icon name="download"></ion-icon></a>
                         </td>
                         <td class="updated_at" id="file_time<!--filenum-->"><!--lastModifiedDateTime--></td>
@@ -301,7 +306,7 @@
                 </form>
 <!--MorePageEnd-->
 <!--AdminStart-->
-                <div id="upload_div" style="margin:0 0 16px 0">
+                <div id="upload_div" style="padding:0 0 16px 0">
                 <div id="upload_btns" align="center">
                     <select onchange="document.getElementById('upload_file').webkitdirectory=this.value;">
                         <option value=""><!--constStr@UploadFile--></option>
@@ -353,6 +358,7 @@
                 <label id="rename_label"></label><br><br><a onclick="operatediv_close('rename')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="rename_form" onsubmit="return submit_operate('rename');">
                 <input id="rename_sid" name="rename_sid" type="hidden" value="">
+                <input id="rename_fileid" name="rename_fileid" type="hidden" value="">
                 <input id="rename_hidden" name="rename_oldname" type="hidden" value="">
                 <input id="rename_input" name="rename_newname" type="text" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Rename-->">
@@ -366,6 +372,7 @@
                 <form id="delete_form" onsubmit="return submit_operate('delete');">
                 <label id="delete_input"><!--constStr@Delete-->?</label>
                 <input id="delete_sid" name="delete_sid" type="hidden" value="">
+                <input id="delete_fileid" name="delete_fileid" type="hidden" value="">
                 <input id="delete_hidden" name="delete_name" type="hidden" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Submit-->">
                 </form>
@@ -376,6 +383,7 @@
                 <label id="encrypt_label"></label><br><br><a onclick="operatediv_close('encrypt')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="encrypt_form" onsubmit="return submit_operate('encrypt');">
                 <input id="encrypt_sid" name="encrypt_sid" type="hidden" value="">
+                <input id="encrypt_fileid" name="encrypt_fileid" type="hidden" value="">
                 <input id="encrypt_hidden" name="encrypt_folder" type="hidden" value="">
                 <input id="encrypt_input" name="encrypt_newpass" type="text" value="" placeholder="<!--constStr@InputPasswordUWant-->">
                 <!--EncryptBtnStart--><input name="operate_action" type="submit" value="<!--constStr@Encrypt-->"><!--EncryptBtnEnd--><!--EncryptAlertStart--><br><label><!--constStr@SetpassfileBfEncrypt--></label><!--EncryptAlertEnd-->
@@ -387,6 +395,7 @@
                 <label id="copy_label"></label><br><br><a onclick="operatediv_close('copy')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="copy_form" onsubmit="return submit_operate('copy');">
                 <input id="copy_sid" name="copy_sid" type="hidden" value="">
+                <input id="copy_fileid" name="copy_fileid" type="hidden" value="">
                 <input id="copy_hidden" name="copy_name" type="hidden" value="">
                 <input id="copy_input" name="copy_input" type="hidden" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Copy-->">
@@ -398,6 +407,7 @@
                 <label id="move_label"></label><br><br><a onclick="operatediv_close('move')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="move_form" onsubmit="return submit_operate('move');">
                 <input id="move_sid" name="move_sid" type="hidden" value="">
+                <input id="move_fileid" name="move_fileid" type="hidden" value="">
                 <input id="move_hidden" name="move_name" type="hidden" value="">
                 <select id="move_input" name="move_folder">
 <!--MoveRootStart-->
@@ -416,6 +426,7 @@
                 <a onclick="operatediv_close('create')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="create_form" onsubmit="return submit_operate('create');">
                     <input id="create_sid" name="create_sid" type="hidden" value="">
+                    <input id="create_fileid" name="create_fileid" type="hidden" value="">
                     <input id="create_hidden" type="hidden" value="">
                     <table>
                         <tr>
@@ -452,14 +463,15 @@
     <div id="login_div" class="operatediv" style="display:none">
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
-	        <center>
-	            <form action="<!--IsPreview?-->admin" method="post">
-		        <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
-		        <input type="submit" value="<!--constStr@Login-->">
-	            </form>
+            <center>
+                <form action="<!--IsPreview?-->admin" method="post" onsubmit="return sha1loginpass(this);">
+                    <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+                    <input name="timestamp" type="hidden" value="">
+                    <input type="submit" value="<!--constStr@Login-->">
+                </form>
             </center>
         </div>
-	</div>
+    </div>
 <!--LoginEnd-->
     <div style="color: rgba(247,247,249,0);"><!--FootStr--></div>
 </body>
@@ -468,6 +480,7 @@
 <!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
 <script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
 <!--GuestUploadStart--><script type="text/javascript" src="//cdn.bootcss.com/spark-md5/3.0.0/spark-md5.min.js"></script><!--GuestUploadEnd-->
+<!--AliyundriveUploadJsStart--><script src="https://cdn.bootcss.com/js-sha1/0.6.0/sha1.min.js"></script><!--AliyundriveUploadJsEnd-->
 <!--IsFileStart--><!--IspdfFileStart--><script src="//cdn.bootcss.com/pdf.js/2.3.200/pdf.min.js"></script><!--IspdfFileEnd--><!--IsFileEnd-->
 <!--ListEnd-->
 <script type="text/javascript">
@@ -480,28 +493,32 @@
         document.cookie='language='+str+'; path=/; '+expires;
         location.href = location.href;
     }
-<!--ListStart-->
-    /*var root = '<!--base_disk_path-->';
-    function path_format(path) {
-        path = '/' + path + '/';
-        while (path.indexOf('//') !== -1) {
-            path = path.replace('//', '/')
-        }
-        return path
+<!--LoginStart-->
+    function login() {
+        document.getElementById('mask').style.display='';
+            //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
+        document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
+        document.getElementById('login_div').style.display='';
+        document.getElementById('login_div').style.left=(document.body.clientWidth-document.getElementById('login_div').offsetWidth)/2 +'px';
+        document.getElementById('login_div').style.top=(window.innerHeight-document.getElementById('login_div').offsetHeight)/2+document.body.scrollTop +'px';
+        document.getElementById('login_input').focus();
     }
-    document.querySelectorAll('.table-header').forEach(function (e) {
-        var path = e.innerText;
-        if (path.substr(path.length-1)=='/') path = path.substr(0, path.length-1);
-        var paths = path.split('/');
-        e.innerHTML = '/ ';
-        if (paths <= 2) return;
-        for (var i = 1; i < paths.length - 1; i++) {
-            var to = path_format(root + paths.slice(0, i + 1).join('/'));
-            e.innerHTML += '<a href="' + to + '">' + paths[i] + '</a> / '
+    function sha1loginpass(f) {
+        if (f.password1.value=="") return false;
+        try {
+            timestamp = new Date().getTime() + "";
+            timestamp = timestamp.substr(0, timestamp.length-3);
+            f.timestamp.value = timestamp;
+            f.password1.value = sha1(timestamp + "" + f.password1.value);
+            return true;
+        } catch {
+            alert("sha1.js not loaded.");
+            return false;
         }
-        e.innerHTML += paths[paths.length - 1];
-        e.innerHTML = e.innerHTML.replace(/\s\/\s$/, '')
-    });*/
+    }
+<!--LoginEnd-->
+<!--ListStart-->
+
 <!--IsFileStart-->
     var $url = document.getElementById('url');
     if ($url) {
@@ -584,7 +601,7 @@
             });
         }
     }
-    addVideos(['<!--FileDownUrl-->']);
+    addVideos(['<!--FileEncodeUrl-->']);
 <!--IsvideoFileEnd-->
 <!--IspdfFileStart-->
     pdfjsLib.GlobalWorkerOptions.workerSrc = '//cdn.bootcss.com/pdf.js/2.3.200/pdf.worker.min.js';
@@ -629,7 +646,6 @@
     if ($head) {
         //document.getElementById('head-div').parentNode.insertBefore(document.getElementById('head-div'),document.getElementById('list-div'));
         $head.innerHTML = marked(document.getElementById('head-md').innerText);
-        
     }
 <!--HeadmdEnd-->
 <!--ReadmemdStart-->
@@ -792,6 +808,40 @@
         alert(tmptextarea.innerHTML+"<!--constStr@Success-->");
     }
 <!--UploadJsStart-->
+    function size_format(num) {
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' B';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' KB';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' MB';
+        }
+        return num.toFixed(2) + ' GB';
+    }
+    function seconds2hour(seconds) {
+        let h, m, s;
+        if (parseFloat(seconds)<60) {
+            return seconds + 's';
+        } else {
+            s = (seconds % 60).toFixed(0);
+            m = parseInt(seconds / 60);
+            if (parseInt(m)<60) {
+                return m + 'm' + s + 's';
+            } else {
+                h = parseInt(m / 60);
+                m = m % 60;
+                return h + 'h' + m + 'm' + s + 's';
+            }
+        }
+    }
     function uploadbuttonhide() {
         document.getElementById('upload_btns').style.display='none';
         /*document.getElementById('upload_submit').disabled='disabled';
@@ -806,6 +856,9 @@
         document.getElementById('upload_submit').style.display='';
         document.getElementById('upload_file').style.display='';*/
     }
+    var uploading = new Object();
+<!--UploadJsEnd-->
+<!--OnedriveUploadJsStart-->
     function preup() {
         uploadbuttonhide();
         var files=document.getElementById('upload_file').files;
@@ -818,7 +871,15 @@
         table1.setAttribute('class','list-table');
         var timea=new Date().getTime();
         var i=0;
-        getuplink(i);
+        var uploadList = setInterval(function(){
+            if (i<files.length) {
+                if (Object.keys(uploading).length<5) {
+                    getuplink(i);
+                    i++;
+                }// else console.log(Object.keys(uploading).length);
+            } else clearInterval(uploadList);
+        }, 1000);
+        //getuplink(i);
         function getuplink(i, r=0) {
             var file=files[i];
             var td1;
@@ -831,7 +892,7 @@
                 tr1.appendChild(td1);
                 td1.setAttribute('style','width:30%;word-break:break-word;');
                 td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
-                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size)+' ('+(i+1)+'/'+files.length+')';
                 td2=document.createElement('td');
                 tr1.appendChild(td2);
                 td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
@@ -844,10 +905,13 @@
                 uploadbuttonshow();
                 return;
             }
-            upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            uploading[upbigfilename] = i;
+            var filemd5='';
 <!--GuestStart-->
             function getext(str) {
                 strarry=str.split('.');
+                if (strarry.length==1) return '';
                 ext=strarry[strarry.length-1].toLowerCase();
                 var reg = new RegExp(".","g");
                 var a = str.replace(reg,"");
@@ -875,29 +939,23 @@
             if (asize < file.size) {
                 readblob(asize);
             } else {
-                var filemd5 = spark.end();
+                filemd5 = spark.end();
                 td2.innerHTML='md5: '+filemd5;
+                delete uploading[upbigfilename];
                 upbigfilename = filemd5+ext;
+                uploading[upbigfilename] = i;
 <!--GuestEnd-->
             td2.innerHTML='<!--constStr@GetUploadLink--> ...';
             var xhr1 = new XMLHttpRequest();
-            xhr1.open("GET", '?action=upbigfile&upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
+            xhr1.open("POST", '?action=upbigfile');
+            //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
             xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
             xhr1.onprogress = function(e){
                 td2.innerHTML+='.';
             }
             xhr1.onload = function(e){
-                console.log(xhr1.status+xhr1.responseText);
+                //console.log(xhr1.status+xhr1.responseText);
                 td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
-                if (xhr1.status==409) {
-                    // td2.innerHTML='nameAlreadyExists';
-                    var html=JSON.parse(xhr1.responseText);
-                    td2.innerHTML=html['error']['code']+': '+html['error']['message'];
-<!--GuestStart-->
-                    td2.innerHTML='md5: '+filemd5;
-<!--GuestEnd-->
-                    td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
-                }
                 if (xhr1.status==200) {
                     if (xhr1.responseText=='') {
                         getuplink(i,1);
@@ -910,13 +968,27 @@
                         td2.innerHTML='<!--constStr@UploadStart--> ...';
                         binupfile(file,html['uploadUrl'],timea+'_'+i, upbigfilename);
                     }
-                }
-                if (i<files.length-1) {
+                } else {
+                    if (xhr1.status==409) {
+                        // td2.innerHTML='nameAlreadyExists';
+                        var html=JSON.parse(xhr1.responseText);
+                        td2.innerHTML=html['error']['code']+': '+html['error']['message'];
+<!--GuestStart-->
+                        td2.innerHTML='md5: '+filemd5;
+                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'"><!--constStr@CopyUrl--></button></div>';
+<!--GuestEnd-->
+<!--AdminStart-->
+                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" style="display:none"><!--constStr@CopyUrl--></button></div>';
+<!--AdminEnd-->
+                    }
+                /*if (i<files.length-1) {
                     i++;
                     getuplink(i);
+                }*/
+                    delete uploading[upbigfilename];
                 }
             }
-            xhr1.send(null);
+            xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified +'&filemd5='+ filemd5);
 <!--GuestStart-->
             }
         }
@@ -924,24 +996,7 @@
         }
         uploadbuttonshow();
     }
-    function size_format(num) {
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' B';
-        }
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' KB';
-        }
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' MB';
-        }
-        return num.toFixed(2) + ' GB';
-    }
+
     function binupfile(file,url,tdnum,filename){
         var label=document.getElementById('upfile_td2_'+tdnum);
         var reader = new FileReader();
@@ -952,6 +1007,7 @@
         var newstartsize = 0;
         if(!!file){
             var asize=0;
+            var chunksize=10*1024*1024; // chunk size, max 60M. 每小块上传大小，最大60M，微软建议10M
             var totalsize=file.size;
             var xhr2 = new XMLHttpRequest();
             xhr2.open("GET", url);
@@ -969,8 +1025,6 @@
                     } else {
                         StartStr='<!--constStr@LastUpload-->'+size_format(newstartsize)+ '<br><!--constStr@ThisTime--><!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
                     }
-                    var chunksize=5*1024*1024; // chunk size, max 60M. 每小块上传大小，最大60M，微软建议10M
-                    if (totalsize>200*1024*1024) chunksize=10*1024*1024;
                     function readblob(start) {
                         var end=start+chunksize;
                         var blob = file.slice(start,end);
@@ -980,6 +1034,7 @@
 
                     reader.onload = function(e){
                         var binary = this.result;
+                        var lastCurrentSpeed;
                         var xhr = new XMLHttpRequest();
                         xhr.open("PUT", url, true);
                         //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
@@ -987,10 +1042,11 @@
                         xhr.setRequestHeader('Content-Range', 'bytes ' + asize + '-' + bsize +'/'+ totalsize);
                         xhr.upload.onprogress = function(e){
                             if (e.lengthComputable) {
-                                var tmptime = new Date();
-                                var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
-                                var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
-                                label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+remaintime.toFixed(1)+'s';
+                                let tmptime = new Date();
+                                let tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
+                                lastCurrentSpeed = tmpspeed;
+                                let remaintime = (totalsize-asize-e.loaded)/tmpspeed;
+                                label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+seconds2hour(remaintime.toFixed(1));
                             }
                         }
                         var C_starttime = new Date();
@@ -1015,9 +1071,12 @@
                                 } else {
                                     MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
                                 }
-                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||response.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||response.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                delete uploading[filename];
+                                while (filename.indexOf('%2F')>0) filename = filename.replace('%2F', '/');
+                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
                                 label.innerHTML=StartStr+MiddleStr;
                                 label.style.color='green';
+                                
                                 // uploadbuttonshow();
 <!--AdminStart-->
                                 response.name=file.webkitRelativePath||response.name;
@@ -1026,9 +1085,13 @@
                             } else {
                                 if (!response['nextExpectedRanges']) {
                                     label.innerHTML='<font color="red">'+xhr.responseText+'</font><br>';
+                                    delete uploading[filename];
                                 } else {
                                     var a=response['nextExpectedRanges'][0];
                                     asize=Number( a.slice(0,a.indexOf("-")) );
+                                    chunksize = 10*1024*1024;
+                                    if (lastCurrentSpeed>5*1024*1024) chunksize = 20*1024*1024;
+                                    if (lastCurrentSpeed>10*1024*1024) chunksize = 50*1024*1024;
                                     readblob(asize);
                                 }
                             } } else readblob(asize);
@@ -1041,12 +1104,331 @@
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';
                     }
+                    delete uploading[filename];
                     // uploadbuttonshow();
                 }
             }
         }
     }
-<!--UploadJsEnd-->
+<!--OnedriveUploadJsEnd-->
+<!--AliyundriveUploadJsStart-->
+    function preup() {
+        uploadbuttonhide();
+        var files=document.getElementById('upload_file').files;
+	    if (files.length<1) {
+            uploadbuttonshow();
+            return;
+        };
+        var table1=document.createElement('table');
+        document.getElementById('upload_div').appendChild(table1);
+        table1.setAttribute('class','list-table');
+        var timea=new Date().getTime();
+        var i=0;
+        var uploadList = setInterval(function(){
+            if (i<files.length) {
+                if (Object.keys(uploading).length<5) {
+                    getuplink(i);
+                    i++;
+                }// else console.log(Object.keys(uploading).length);
+            } else clearInterval(uploadList);
+        }, 1000);
+        //getuplink(i);
+        function getuplink(i, r=0) {
+            var file=files[i];
+            var td1;
+            var td2;
+            if (r==0) {
+                var tr1=document.createElement('tr');
+                table1.appendChild(tr1);
+                tr1.setAttribute('data-to',1);
+                td1=document.createElement('td');
+                tr1.appendChild(td1);
+                td1.setAttribute('style','width:30%;word-break:break-word;');
+                td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size)+' ('+(i+1)+'/'+files.length+')';
+                td2=document.createElement('td');
+                tr1.appendChild(td2);
+                td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            }
+            var tdnum = timea+'_'+i;
+            td1=document.getElementById('upfile_td1_'+tdnum);
+            td2=document.getElementById('upfile_td2_'+tdnum);
+            var chunksize=10*1024*1024; // 分块大小
+            //var chunksize=100*1024; // 测试小块
+            /*if (file.size>100*1024*1024*1024) {
+                td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
+                uploadbuttonshow();
+                return;
+            }*/
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            uploading[upbigfilename] = [i];
+            var spark = sha1.create();
+            var reader = new FileReader();
+            var asize = 0;
+            var filesha1;
+            function readblob(start) {
+                var end=start+chunksize;
+                var blob = file.slice(start,end);
+                reader.readAsArrayBuffer(blob);
+            }
+            readblob(asize);
+
+            reader.onload = function(e){
+                td2.innerHTML='<!--constStr@Calculate--> SHA1: '+(asize*100/file.size).toFixed(2)+'%';
+                var binary = this.result;
+                spark.update(binary);
+                asize += chunksize;
+                if (asize < file.size) {
+                    readblob(asize);
+                } else {
+                    filesha1 = spark.hex();
+                    td2.innerHTML='SHA1: ' + filesha1;
+<!--GuestStart-->
+                    function getext(str) {
+                        let p = str.lastIndexOf('.');
+                        if (p===-1) return '';
+                        if (p===0) return '';
+                        return str.substr(p);
+                    }
+                    var ext = getext(file.webkitRelativePath||file.name);
+                    upbigfilename = filesha1 + ext;
+<!--GuestEnd-->
+                    //while (upbigfilename.indexOf('%2F')>0) upbigfilename = upbigfilename.replace('%2F', '/');
+                    td2.innerHTML='<!--constStr@GetUploadLink--> ...';
+                    var html = JSON.parse(localStorage.getItem(filesha1));
+                    //console.log(html);
+                    if (html!==null && ('part_info_list' in html)) {
+                        td2.innerHTML='<!--constStr@UploadStart--> ...';
+                        binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                    } else {
+                        var xhr1 = new XMLHttpRequest();
+                        xhr1.open("POST", '?action=upbigfile');
+                        //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                        xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                        xhr1.onload = function(e){
+                            //console.log(xhr1.status+xhr1.responseText);
+                            td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
+                            if (xhr1.status==201) {
+                                if (xhr1.responseText=='') {
+                                    getuplink(i,1);
+                                    return;
+                                }
+                                var html=JSON.parse(xhr1.responseText);
+                                //console.log(html);
+                                if (!html['part_info_list']) {
+                                    if (html.name!='') {
+                                        if (html.exist==true) td2.innerHTML=html.name+' 文件名已有';
+                                        else if (html.rapid_upload==true) td2.innerHTML=html.name+' 秒传';
+                                        else td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                    } else {
+                                        td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                    }
+                                    delete uploading[upbigfilename];
+                                } else {
+                                    td2.innerHTML='<!--constStr@UploadStart--> ...';
+                                    //console.log(html);
+                                    localStorage.setItem(filesha1, JSON.stringify(html));
+                                    binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                                }
+                            } else {
+                                delete uploading[upbigfilename];
+                            }
+                            /*if (i<files.length-1) {
+                                i++;
+                                getuplink(i);
+                            }*/
+                        }
+                        xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified + '&filesha1=' + filesha1 + '&chunksize=' + chunksize);
+                    }
+                }
+            }
+        }
+        uploadbuttonshow();
+    }
+    function binupfile(file, res, tdnum, filename, filesha1, chunksize) {
+        // xhr.getResponseHeader
+        if (!('ETag' in res)) res['ETag'] = new Array();
+        var fileid = res['file_id'];
+        var uploadid = res['upload_id'];
+        var label=document.getElementById('upfile_td2_'+tdnum);
+        var reader = new FileReader();
+        var StartStr='';
+        var MiddleStr='';
+        var StartTime;
+        var EndTime;
+        var newstartsize = 0;
+        if(!!file){
+            var chunknum = 0;
+            var chunknumtotal = res['part_info_list'].length;
+            var asize=0;
+            var totalsize=file.size;
+            var newstartsize=0;
+            while (res['ETag'][chunknum]!=null) {
+                chunknum++;
+                newstartsize += chunksize;
+            }
+            StartTime = new Date();
+            asize = newstartsize;
+            if (newstartsize==0) {
+                StartStr='<!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            } else {
+                StartStr='<!--constStr@LastUpload-->'+size_format(newstartsize)+ '<br><!--constStr@ThisTime--><!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            }
+            //var chunksize=5*1024*1024; // chunk size, max 60M. 每小块上传大小
+            //if (totalsize>200*1024*1024) chunksize=10*1024*1024;
+            function readblob(start) {
+                var end=start+chunksize;
+                var blob = file.slice(start,end);
+                reader.readAsArrayBuffer(blob);
+                //reader.readAsArrayBuffer(file);
+            }
+            readblob(asize);
+
+            reader.onload = function(e){
+                if (asize>totalsize) {
+                    var xhr1 = new XMLHttpRequest();
+                    xhr1.open("POST", '?action=upbigfile');
+                    //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                    xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    xhr1.onload = function(e){
+                        console.log(xhr1.responseText+','+xhr1.status);
+                        if (xhr1.status==200) {
+                            localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                            var html=JSON.parse(xhr1.responseText);
+                            //response.name=file.webkitRelativePath||response.name;
+                            addelement(html);
+<!--AdminEnd-->
+                            /*if (totalsize>10*1024*1024) {
+                                var xhr3 = new XMLHttpRequest();
+                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr3.send(null);
+                                xhr3.onload = function(e){
+                                    console.log(xhr3.responseText+','+xhr3.status);
+                                }
+                            }*/
+                            EndTime=new Date();
+                            MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                            if (newstartsize==0) {
+                                MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            } else {
+                                MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            }
+                            document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                            label.innerHTML=StartStr+MiddleStr;
+                            label.style.color='green';
+                        } else {
+                            label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                            localStorage.removeItem(filesha1);
+                        }
+                        delete uploading[filename];
+                    }
+                    xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                } else {
+                    var binary = this.result;
+                    var xhr = new XMLHttpRequest();
+                    xhr.open("PUT", res['part_info_list'][chunknum]['upload_url'], true);
+                    //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    bsize=asize+e.loaded-1;
+                    xhr.setRequestHeader('Content-Range', 'bytes ' + asize + '-' + bsize +'/'+ totalsize);
+                    xhr.upload.onprogress = function(e){
+                        if (e.lengthComputable) {
+                            var tmptime = new Date();
+                            var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
+                            var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
+                            label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+seconds2hour(remaintime.toFixed(1));
+                        }
+                    }
+                    var C_starttime = new Date();
+                    xhr.onload = function(e){
+                        if (xhr.status<500) {
+                            //console.log(xhr.responseText);
+                            //console.log(xhr.getResponseHeader('ETag'));
+                        //var response=JSON.parse(xhr.responseText);
+                        if (xhr.responseText==''&&xhr.getResponseHeader('ETag')!='') {
+                            // 有ETag说明本段上传成功
+                            let etag = xhr.getResponseHeader('ETag');
+                            //if (etag.substr(0,1)=='"') etag = etag.substr(1);还就要引号！
+                            //if (etag.substr(-1)=='"') etag = etag.substr(0, etag.length-1);
+                            res['ETag'][chunknum] = etag;
+                            localStorage.setItem(filesha1, JSON.stringify(res));
+                            chunknum++;
+                            asize = bsize + 1;
+                            if (chunknum==chunknumtotal) {
+                                // 上传结束
+                                var xhr1 = new XMLHttpRequest();
+                                xhr1.open("POST", '?action=upbigfile');
+                                //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                                xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr1.onload = function(e){
+                                    console.log(xhr1.responseText+','+xhr1.status);
+                                    if (xhr1.status==200) {
+                                        localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                                        var html=JSON.parse(xhr1.responseText);
+                                        //response.name=file.webkitRelativePath||response.name;
+                                        addelement(html);
+<!--AdminEnd-->
+                                        /*if (totalsize>10*1024*1024) {
+                                            var xhr3 = new XMLHttpRequest();
+                                            xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                            xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                            xhr3.send(null);
+                                            xhr3.onload = function(e){
+                                                console.log(xhr3.responseText+','+xhr3.status);
+                                            }
+                                        }*/
+                                        EndTime=new Date();
+                                        MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                                        if (newstartsize==0) {
+                                            MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        } else {
+                                            MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        }
+                                        document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                        label.innerHTML=StartStr+MiddleStr;
+                                        label.style.color='green';
+                                    } else {
+                                        label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                                        localStorage.removeItem(filesha1);
+                                    }
+                                    delete uploading[filename];
+                                }
+                                xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                                // uploadbuttonshow();
+                            } else {
+                                readblob(asize);
+                            }
+                        } else {
+                            console.log(xhr.status+xhr.responseText);//<PartEtag>
+                            if (xhr.status==409) {
+                                let str = xhr.responseText;
+                                str = str.substr(str.indexOf('<PartEtag>')+10);
+                                str = str.substr(0, str.indexOf('</PartEtag>'));
+                                res['ETag'][chunknum] = str;
+                                localStorage.setItem(filesha1, JSON.stringify(res));
+                                chunknum++;
+                                asize += chunksize;
+                                readblob(asize);
+                            } else {
+                                delete uploading[filename];
+                            }
+                                //label.innerHTML='<font color="red">'+xhr.responseText+'</font><br>';
+                        } } else readblob(asize);
+                    }
+                    xhr.send(binary);
+                }
+            }
+        }
+    }
+<!--AliyundriveUploadJsEnd-->
+<!--GoogledriveUploadJsStart-->
+    function preup() {
+        alert("Stop!\nCan not upload form explorer without token.");
+    }
+<!--GoogledriveUploadJsEnd-->
 <!--ListEnd-->
     function operatediv_close(operate) {
         document.getElementById(operate+'_div').style.display='none';
@@ -1054,9 +1436,28 @@
     }
 <!--AdminStart-->
     function logout() {
-        document.cookie = "admin=; path=/";
+        var expd = new Date();
+        expd.setTime(expd.getTime()+1000);
+        var expires = "expires="+expd.toGMTString();
+        document.cookie = "admin=; path=/; "+expires;
         location.href = location.href;
     }
+    /*for some mobile browser*/
+    function menu_click(e){
+        var ee=document.getElementsByClassName("active");
+        for(var i=0;i<ee.length;i++){
+            ee[i].classList.remove("active");
+        }
+        if(e.type!="mouseout")this.classList.add("active");
+    }
+    (function(){
+        var e=document.getElementsByClassName("operate");
+        document.body.addEventListener("touchstart", menu_click);
+        for(var i=0;i<e.length;i++){
+            e[i].addEventListener("touchstart", menu_click);
+            e[i].addEventListener("mouseout", menu_click);
+        }
+    })();
 <!--IsFolderStart-->
     function showdiv(event,action,num) {
         var $operatediv=document.getElementsByName('operatediv');
@@ -1068,32 +1469,30 @@
         document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
         if (num=='') {
             var str='';
+            var fileid='';
         } else {
-            var str=document.getElementById('file_a'+num).innerText;
-            if (str=='') {
-                str=document.getElementById('file_a'+num).getElementsByTagName("img")[0].alt;
-                if (str=='') {
-                    alert('<!--constStr@GetFileNameFail-->');
-                    operatediv_close(action);
-                    return;
-                }
-            }
-            if (str.substr(-1)==' ') str=str.substr(0,str.length-1);
+            var str=decodeURIComponent(document.getElementById('file_a'+num).href);
+            if (str.substr(-1)==' ') str=str.substr(0, str.length-1);
+            if (str.substr(-1)=='/') str=str.substr(0, str.length-1);
+            if (str.substr(-8)=='?preview') str=str.substr(0, str.length-8);
+            if (str.lastIndexOf('/')>-1) str=str.substr(str.lastIndexOf('/')+1);
+            var fileid=document.getElementById('file_a'+num).attributes['fileid'].nodeValue;
         }
         document.getElementById(action + '_div').style.display='';
         document.getElementById(action + '_label').innerText=str;//.replace(/&/,'&amp;');
         document.getElementById(action + '_sid').value=num;
+        document.getElementById(action + '_fileid').value=fileid;
         document.getElementById(action + '_hidden').value=str;
         if (action=='rename') document.getElementById(action + '_input').value=str;
-        var $e = event || window.event;
-        var $scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+        /*var $e = event || window.event;
+        var $scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;*/
         var $scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-        var $x = $e.pageX || $e.clientX + $scrollX;
+        /*var $x = $e.pageX || $e.clientX + $scrollX;
         var $y = $e.pageY || $e.clientY + $scrollY;
-        if (action=='create') {
+        if (action=='create') {*/
             document.getElementById(action + '_div').style.left=(document.body.clientWidth-document.getElementById(action + '_div').offsetWidth)/2 +'px';
             document.getElementById(action + '_div').style.top=(window.innerHeight-document.getElementById(action + '_div').offsetHeight)/2+$scrollY +'px';
-        } else {
+        /*} else {
             if ($x + document.getElementById(action + '_div').offsetWidth > document.body.clientWidth) {
                 if (document.getElementById(action + '_div').offsetWidth > document.body.clientWidth) {
                     document.getElementById(action + '_div').offsetWidth=document.body.clientWidth+'px';
@@ -1105,15 +1504,15 @@
                 document.getElementById(action + '_div').style.left=$x+'px';
             }
             document.getElementById(action + '_div').style.top=$y+'px';
-        }
+        }*/
         document.getElementById(action + '_input').focus();
     }
     function submit_operate(str) {
         var num=document.getElementById(str+'_sid').value;
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", '?'+serializeForm(str+'_form'));
-        xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
-        xhr.send(null);
+        xhr.open("POST", '');
+        xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+        xhr.setRequestHeader('x-requested-with', 'XMLHttpRequest');
         xhr.onload = function(e){
             var html;
             if (xhr.status<300) {
@@ -1129,10 +1528,12 @@
                     html=JSON.parse(xhr.responseText);
                     addelement(html);
                 }
+                //alert('success');
             } else alert(xhr.status+'\n'+xhr.responseText);
             document.getElementById(str+'_div').style.display='none';
             document.getElementById('mask').style.display='none';
         }
+        xhr.send(serializeForm(str+'_form'));
         return false;
     }
     function addelement(html) {
@@ -1146,15 +1547,16 @@
         a1.target='_blank';
         var td2=document.createElement('td');
         td2.setAttribute('class','updated_at');
-        td2.innerText=html.lastModifiedDateTime.replace(/T/,' ').replace(/Z/,'');
+        if (!!html.time) td2.innerText=html.time.replace(/T/,' ').replace(/Z/,'');
         var td3=document.createElement('td');
         td3.setAttribute('class','size');
-        td3.innerText=size_format(html.size);
-        if (!!html.folder) {
+        if (!!html.size) td3.innerText=size_format(html.size);
+        else td3.innerText='0 B';
+        if (html.type=='folder') {
             a1.href+='/';
             document.getElementById('tr0').parentNode.insertBefore(tr1,document.getElementById('tr0').nextSibling);
         }
-        if (!!html.file) {
+        if (html.type=='file') {
             a1.href+='?preview';
             a1.name='filelist';
             document.getElementById('tr0').parentNode.appendChild(tr1);
@@ -1228,18 +1630,11 @@
     }
 <!--IsFolderEnd-->
 <!--AdminEnd-->
-<!--LoginStart-->
-    function login() {
-        document.getElementById('mask').style.display='';
-            //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
-        document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
-        document.getElementById('login_div').style.display='';
-        document.getElementById('login_div').style.left=(document.body.clientWidth-document.getElementById('login_div').offsetWidth)/2 +'px';
-        document.getElementById('login_div').style.top=(window.innerHeight-document.getElementById('login_div').offsetHeight)/2+document.body.scrollTop +'px';
-        document.getElementById('login_input').focus();
-    }
-<!--LoginEnd-->
+<!--EncryptedStart-->
+    document.getElementById('password1').focus();
+<!--EncryptedEnd-->
 </script>
-<script src="//unpkg.zhimg.com/ionicons@4.4.4/dist/ionicons.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
+<!--LoginStart--><script src="https://cdn.bootcss.com/js-sha1/0.6.0/sha1.min.js"></script><!--LoginEnd-->
 <!--customScript-->
 </html>

theme/iis.html

@@ -0,0 +1,24 @@
+<html>
+    <head>
+        <title><!--Sitename--> - /<!--PathArrayStart--><!--PathArrayName-->/<!--PathArrayEnd--></title>
+    </head>
+    <body>
+        <H1><!--Sitename--> - /<!--DiskPathArrayStart--><!--PathArrayName-->/<!--DiskPathArrayEnd--></H1><hr>
+        <table>
+<!--BackArrowStart-->
+            <tr><td colspan="3"><A HREF="<!--BackArrowUrl-->">[To Parent Directory]</A></td></tr>
+<!--BackArrowEnd-->
+<!--ListStart-->
+<!--IsFolderStart-->
+<!--FolderListStart-->
+            <tr><td><!--lastModifiedDateTime--></td><td align="right" width="20%">&lt;dir&gt;</td><td><A HREF="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName--></A></td></tr>
+<!--FolderListEnd-->
+<!--FileListStart-->
+            <tr><td><!--lastModifiedDateTime--></td><td align="right" width="20%"><!--size--></td><td><A HREF="<!--FileEncodeReplaceUrl-->"><!--FileEncodeReplaceName--></A></td></tr>
+<!--FileListEnd-->
+<!--IsFolderEnd-->
+<!--ListEnd-->
+        </table>
+        <hr>
+    </body>
+</html>

theme/nchyn_grey.html

@@ -3,9 +3,9 @@
     "music":"musical-notes",
     "video":"logo-youtube",
     "img":"image",
-    "office":"paper",
+    "office":"newspaper",
     "txt":"clipboard",
-    "zip":"filing",
+    "zip":"file-tray-full",
     "iso":"disc",
     "apk":"logo-android",
     "exe":"logo-windows",
@@ -45,7 +45,9 @@
     background-image: url('<!--BackgroundUrl-->');
     background-size: cover;
     background-repeat: no-repeat;
-    height: 100%;
+    background-attachment: fixed;
+    background-position: center;
+    height: 100vh;
     <!--BackgroundEnd-->
 }
 
@@ -107,7 +109,7 @@
                             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 <!--IsFolderStart-->
                                 <a  class="dropdown-item" data-toggle="modal" data-target="#NewFileModal"><ion-icon name="create"></ion-icon><!--constStr@Create--></a>
-                                <a  class="dropdown-item" data-toggle="modal" data-target="#exampleencrypt" onclick="document.getElementById('encrypt_hidden').value=''"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a>
+                                <a  class="dropdown-item" data-toggle="modal" data-target="#exampleencrypt" onclick="document.getElementById('encrypt_hidden').value=''"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a>
                                 <a class="dropdown-item" href="?RefreshCache"><ion-icon name="refresh"></ion-icon><!--constStr@RefreshCache--></a>
 <!--IsFolderEnd-->
                                 <a class="dropdown-item" href="<!--IsPreview?-->setup"><ion-icon name="settings"></ion-icon><!--constStr@Setup--></a>
@@ -175,7 +177,7 @@
                 <div style="padding:20px">
 	            <center>
 	                <form action="" method="post">
-		            <input name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+		            <input id="password1" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
 		            <input type="submit" value="<!--constStr@Submit-->">
 	                </form>
                 </center>
@@ -285,7 +287,7 @@
         <ion-icon name="construct"></ion-icon>
     </a>
     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        <a class="dropdown-item" data-toggle="modal" data-target="#exampleencrypt" onclick="document.getElementById('encrypt_hidden').value='<!--FileEncodeReplaceName-->'"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a>
+        <a class="dropdown-item" data-toggle="modal" data-target="#exampleencrypt" onclick="document.getElementById('encrypt_hidden').value='<!--FileEncodeReplaceName-->'"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a>
         <a class="dropdown-item" data-toggle="modal" data-target="#renameModal" onclick="showdiv(event, 'rename',<!--filenum-->);"><ion-icon name="create"></ion-icon><!--constStr@Rename--></a>
         <a class="dropdown-item" data-toggle="modal" data-target="#MoveModal" onclick="showdiv(event, 'move',<!--filenum-->);"><ion-icon name="move"></ion-icon><!--constStr@Move--></a>
         <a class="dropdown-item" data-toggle="modal" data-target="#CopyModal" onclick="showdiv(event, 'copy',<!--filenum-->);"><ion-icon name="copy"></ion-icon><!--constStr@Copy--></a>
@@ -677,13 +679,17 @@ return false;
 <!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
 <script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
 <!--GuestUploadStart--><script type="text/javascript" src="//cdn.bootcss.com/spark-md5/3.0.0/spark-md5.min.js"></script><!--GuestUploadEnd-->
+<!--AliyundriveUploadJsStart--><script src="//cdn.bootcdn.net/ajax/libs/js-sha1/0.6.0/sha1.min.js"></script><!--AliyundriveUploadJsEnd-->
 <!--IsFileStart--><!--IspdfFileStart--><script src="//cdn.bootcss.com/pdf.js/2.3.200/pdf.min.js"></script><!--IspdfFileEnd--><!--IsFileEnd-->
 <!--ListEnd-->
 <script type="text/javascript">
     function changelanguage(str)
     {
         if (str=='Language') str = '';
-        document.cookie='language='+str+'; path=/';
+        var expd = new Date();
+        expd.setTime(expd.getTime()+(2*60*60*1000));
+        var expires = "expires="+expd.toGMTString();
+        document.cookie='language='+str+'; path=/; '+expires;
         location.href = location.href;
     }
 <!--ListStart-->
@@ -790,14 +796,20 @@ return false;
             });
         }
     }
-    addVideos(['<!--FileDownUrl-->']);
+    addVideos(['<!--FileEncodeUrl-->']);
 <!--IsvideoFileEnd-->
 <!--IspdfFileStart-->
     pdfjsLib.GlobalWorkerOptions.workerSrc = '//cdn.bootcss.com/pdf.js/2.3.200/pdf.worker.min.js';
-    var loadingTask = pdfjsLib.getDocument({ url: '<!--FileDownUrl-->', });
+    var loadingTask = pdfjsLib.getDocument({
+        url: '<!--FileDownUrl-->',
+        cMapUrl: "//cdn.jsdelivr.net/npm/pdfjs-dist@2.2.228/cmaps/",
+        cMapPacked: true,
+        rangeChunkSize: 65535
+    });
     loadingTask.promise.then(function(pdf) {
         var pagenum =  pdf.numPages;
         var pdfContainer = document.getElementById('pdf-d');
+        pdfContainer.innerHTML = '';
         for (var i=1;i<=pagenum;i++) {
             var canvasNew = document.createElement('canvas');
             canvasNew.id = 'pdf-c'+i;
@@ -829,7 +841,6 @@ return false;
     if ($head) {
         //document.getElementById('head-div').parentNode.insertBefore(document.getElementById('head-div'),document.getElementById('list-div'));
         $head.innerHTML = marked(document.getElementById('head-md').innerText);
-
     }
 <!--HeadmdEnd-->
 <!--ReadmemdStart-->
@@ -840,29 +851,35 @@ return false;
 <!--ReadmemdEnd-->
 <!--ShowThumbnailsStart-->
     function showthumbnails(obj) {
+        images = [<!--ImgExts-->];
         var files=document.getElementsByName('filelist');
         for ($i=0;$i<files.length;$i++) {
             str=files[$i].innerText;
             if (str.substr(-1)==' ') str=str.substr(0,str.length-1);
-            if (!str) return;
+            if (!str) continue;
             strarry=str.split('.');
             ext=strarry[strarry.length-1].toLowerCase();
-            images = [<!--ImgExts-->];
-            if (images.indexOf(ext)>-1) get_thumbnails_url(str, files[$i]);
+            if (images.indexOf(ext)>-1) {
+                var url=files[$i].href;
+                url=url.substr(0,url.length-8);
+                if (document.getElementById('originalpic').checked==true) {
+                    files[$i].parentNode.parentNode.innerHTML='<td colspan="3"><img src="'+url+'" alt="'+str+'" onload="if (this.offsetWidth>document.getElementById(\'list-div\').offsetWidth) this.style.width=\'100%\';"></td>';
+                    $i--;
+                } else {
+                    url+='?thumbnails';
+                    get_thumbnails_url(url, str, files[$i]);
+                }
+            }
         }
         obj.disabled='disabled';
     }
-    function get_thumbnails_url(str, filea) {
-        if (!str) return;
-        var nurl=window.location.href;
-        if (nurl.substr(-1)!="/") nurl+="/";
+    function get_thumbnails_url(url, name, filea) {
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", nurl+str+'?thumbnails', true);
-                //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
+        xhr.open("GET", url, true);
         xhr.send('');
         xhr.onload = function(e){
             if (xhr.status==200) {
-                if (xhr.responseText!='') filea.innerHTML='<img src="'+xhr.responseText+'" alt="'+str+'">';
+                if (xhr.responseText!='') filea.innerHTML='<img src="'+xhr.responseText+'" alt="'+name+'">';
             } else console.log(xhr.status+'\n'+xhr.responseText);
         }
     }
@@ -986,76 +1003,6 @@ return false;
         alert(tmptextarea.innerHTML+"<!--constStr@Success-->");
     }
 <!--UploadJsStart-->
-    function uploadbuttonhide() {
-        document.getElementById('upload_btns').style.display='none';
-        /*document.getElementById('upload_submit').disabled='disabled';
-        document.getElementById('upload_file').disabled='disabled';
-        document.getElementById('upload_submit').style.display='none';
-        document.getElementById('upload_file').style.display='none';*/
-    }
-    function uploadbuttonshow() {
-        document.getElementById('upload_btns').style.display='';
-        /*document.getElementById('upload_file').disabled='';
-        document.getElementById('upload_submit').disabled='';
-        document.getElementById('upload_submit').style.display='';
-        document.getElementById('upload_file').style.display='';*/
-    }
-    function preup() {
-        uploadbuttonhide();
-        var files=document.getElementById('upload_file').files;
-	    if (files.length<1) {
-            uploadbuttonshow();
-            return;
-        };
-        var table1=document.createElement('table');
-        document.getElementById('uploading_div').appendChild(table1);
-        table1.setAttribute('class','list-table');
-        var timea=new Date().getTime();
-        var i=0;
-        getuplink(i);
-        function getuplink(i) {
-            var file=files[i];
-            var tr1=document.createElement('tr');
-            table1.appendChild(tr1);
-            tr1.setAttribute('data-to',1);
-            var td1=document.createElement('td');
-            tr1.appendChild(td1);
-            td1.setAttribute('style','width:30%');
-            td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
-            td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
-            var td2=document.createElement('td');
-            tr1.appendChild(td2);
-            td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
-            td2.innerHTML='<!--constStr@GetUploadLink--> ...';
-            if (file.size>100*1024*1024*1024) {
-                td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
-                uploadbuttonshow();
-                return;
-            }
-            var xhr1 = new XMLHttpRequest();
-            xhr1.open("GET", '?action=upbigfile&upbigfilename='+ encodeURIComponent((file.webkitRelativePath||file.name)) +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
-            xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
-            xhr1.send(null);
-            xhr1.onload = function(e){
-                td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
-                if (xhr1.status==200) {
-                    console.log(xhr1.responseText);
-                    var html=JSON.parse(xhr1.responseText);
-                    if (!html['uploadUrl']) {
-                        td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
-                        uploadbuttonshow();
-                    } else {
-                        td2.innerHTML='<!--constStr@UploadStart--> ...';
-                        binupfile(file,html['uploadUrl'],timea+'_'+i);
-                    }
-                }
-                if (i<files.length-1) {
-                    i++;
-                    getuplink(i);
-                }
-            }
-        }
-    }
     function size_format(num) {
         if (num>1024) {
             num=num/1024;
@@ -1074,7 +1021,145 @@ return false;
         }
         return num.toFixed(2) + ' GB';
     }
-    function binupfile(file,url,tdnum){
+    function uploadbuttonhide() {
+        document.getElementById('upload_btns').style.display='none';
+        /*document.getElementById('upload_submit').disabled='disabled';
+        document.getElementById('upload_file').disabled='disabled';
+        document.getElementById('upload_submit').style.display='none';
+        document.getElementById('upload_file').style.display='none';*/
+    }
+    function uploadbuttonshow() {
+        document.getElementById('upload_btns').style.display='';
+        /*document.getElementById('upload_file').disabled='';
+        document.getElementById('upload_submit').disabled='';
+        document.getElementById('upload_submit').style.display='';
+        document.getElementById('upload_file').style.display='';*/
+    }
+<!--UploadJsEnd-->
+<!--OnedriveUploadJsStart-->
+    function preup() {
+        uploadbuttonhide();
+        var files=document.getElementById('upload_file').files;
+	    if (files.length<1) {
+            uploadbuttonshow();
+            return;
+        };
+        var table1=document.createElement('table');
+        document.getElementById('upload_div').appendChild(table1);
+        table1.setAttribute('class','list-table');
+        var timea=new Date().getTime();
+        var i=0;
+        getuplink(i);
+        function getuplink(i, r=0) {
+            var file=files[i];
+            var td1;
+            var td2;
+            if (r==0) {
+                var tr1=document.createElement('tr');
+                table1.appendChild(tr1);
+                tr1.setAttribute('data-to',1);
+                td1=document.createElement('td');
+                tr1.appendChild(td1);
+                td1.setAttribute('style','width:30%;word-break:break-word;');
+                td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
+                td2=document.createElement('td');
+                tr1.appendChild(td2);
+                td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            }
+            var tdnum = timea+'_'+i;
+            td1=document.getElementById('upfile_td1_'+tdnum);
+            td2=document.getElementById('upfile_td2_'+tdnum);
+            if (file.size>100*1024*1024*1024) {
+                td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
+                uploadbuttonshow();
+                return;
+            }
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            var filemd5='';
+<!--GuestStart-->
+            function getext(str) {
+                strarry=str.split('.');
+                if (strarry.length==1) return '';
+                ext=strarry[strarry.length-1].toLowerCase();
+                var reg = new RegExp(".","g");
+                var a = str.replace(reg,"");
+                if (a == ext) ext = "";
+                else ext = "." + ext;
+                return ext;
+            }
+        var ext = getext(file.webkitRelativePath||file.name);
+        var spark = new SparkMD5.ArrayBuffer();
+        var reader = new FileReader();
+        var chunksize=10*1024*1024;
+        var asize = 0;
+        function readblob(start) {
+            var end=start+chunksize;
+            var blob = file.slice(start,end);
+            reader.readAsArrayBuffer(blob);
+        }
+        readblob(asize);
+
+        reader.onload = function(e){
+            td2.innerHTML='<!--constStr@Calculate--> md5: '+(asize*100/file.size).toFixed(2)+'%';
+            var binary = this.result;
+            spark.append(binary);
+            asize += chunksize;
+            if (asize < file.size) {
+                readblob(asize);
+            } else {
+                filemd5 = spark.end();
+                td2.innerHTML='md5: '+filemd5;
+                upbigfilename = filemd5+ext;
+<!--GuestEnd-->
+            td2.innerHTML='<!--constStr@GetUploadLink--> ...';
+            var xhr1 = new XMLHttpRequest();
+            xhr1.open("POST", '?action=upbigfile');
+            xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+            xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+            xhr1.onprogress = function(e){
+                td2.innerHTML+='.';
+            }
+            xhr1.onload = function(e){
+                //console.log(xhr1.status+xhr1.responseText);
+                td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
+                if (xhr1.status==409) {
+                    // td2.innerHTML='nameAlreadyExists';
+                    var html=JSON.parse(xhr1.responseText);
+                    td2.innerHTML=html['error']['code']+': '+html['error']['message'];
+<!--GuestStart-->
+                    td2.innerHTML='md5: '+filemd5;
+<!--GuestEnd-->
+                    td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                }
+                if (xhr1.status==200) {
+                    if (xhr1.responseText=='') {
+                        getuplink(i,1);
+                        return;
+                    }
+                    var html=JSON.parse(xhr1.responseText);
+                    if (!html['uploadUrl']) {
+                        td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                    } else {
+                        td2.innerHTML='<!--constStr@UploadStart--> ...';
+                        binupfile(file,html['uploadUrl'],timea+'_'+i, upbigfilename);
+                    }
+                }
+                if (i<files.length-1) {
+                    i++;
+                    getuplink(i);
+                }
+            }
+            xhr1.send('upbigfilename='+ encodeURIComponent(upbigfilename) +'&filesize='+ file.size +'&filelastModified='+ file.lastModified +'&filemd5='+ filemd5);
+<!--GuestStart-->
+            }
+        }
+<!--GuestEnd-->
+        }
+        uploadbuttonshow();
+    }
+
+    function binupfile(file,url,tdnum,filename){
         var label=document.getElementById('upfile_td2_'+tdnum);
         var reader = new FileReader();
         var StartStr='';
@@ -1095,9 +1180,7 @@ return false;
                     var a = html['nextExpectedRanges'][0];
                     newstartsize = Number( a.slice(0,a.indexOf("-")) );
                     StartTime = new Date();
-<!--AdminStart-->
                     asize = newstartsize;
-<!--AdminEnd-->
                     if (newstartsize==0) {
                         StartStr='<!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
                     } else {
@@ -1111,19 +1194,9 @@ return false;
                         reader.readAsArrayBuffer(blob);
                     }
                     readblob(asize);
-<!--LoginStart-->
-                    var spark = new SparkMD5.ArrayBuffer();
-<!--LoginEnd-->
+
                     reader.onload = function(e){
                         var binary = this.result;
-<!--LoginStart-->
-                        spark.append(binary);
-                        if (asize < newstartsize) {
-                            asize += chunksize;
-                            readblob(asize);
-                            return;
-                        }
-<!--LoginEnd-->
                         var xhr = new XMLHttpRequest();
                         xhr.open("PUT", url, true);
                         //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
@@ -1143,39 +1216,15 @@ return false;
                             var response=JSON.parse(xhr.responseText);
                             if (response['size']>0) {
                                 // contain size, upload finish. 有size说明是最终返回，上传结束
-                                var xhr3 = new XMLHttpRequest();
-                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+encodeURIComponent((file.webkitRelativePath||file.name)));
-                                xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
-                                xhr3.send(null);
-                                xhr3.onload = function(e){
-                                    console.log(xhr3.responseText+','+xhr3.status);
-                                }
-<!--LoginStart-->
-                                var filemd5 = spark.end();
-                                var xhr4 = new XMLHttpRequest();
-                                xhr4.open("GET", '?action=uploaded_rename&filename='+encodeURIComponent((file.webkitRelativePath||file.name))+'&filemd5='+filemd5);
-                                xhr4.setRequestHeader('x-requested-with','XMLHttpRequest');
-                                xhr4.send(null);
-                                xhr4.onload = function(e){
-                                    console.log(xhr4.responseText+','+xhr4.status);
-                                    var filename;
-                                    //if (xhr4.status==200) filename = JSON.parse(xhr4.responseText)['name'];
-                                    //if (xhr4.status==409) filename = filemd5 + (file.webkitRelativePath||file.name).substr((file.webkitRelativePath||file.name).indexOf('.'));
-                                    filename = JSON.parse(xhr4.responseText)['name'];
-                                    if (filename=='') {
-                                        alert('<!--constStr@UploadErrorUpAgain-->');
-                                        uploadbuttonshow();
-                                        return;
+                                if (totalsize>10*1024*1024) {
+                                    var xhr3 = new XMLHttpRequest();
+                                    xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                    xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                    xhr3.send(null);
+                                    xhr3.onload = function(e){
+                                        console.log(xhr3.responseText+','+xhr3.status);
                                     }
-                                    var lasturl = location.href;
-                                    if (lasturl.substr(lasturl.length-1)!='/') lasturl += '/';
-                                    lasturl += filename + '?preview';
-                                    //window.open(lasturl);
-                                    document.getElementById('upfile_a_'+tdnum).href = lasturl;
-                                    document.getElementById('upfile_a1_'+tdnum).href = filename;
-                                    document.getElementById('upfile_cpbt_'+tdnum).style.display = "";
                                 }
-<!--LoginEnd-->
                                 EndTime=new Date();
                                 MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
                                 if (newstartsize==0) {
@@ -1183,10 +1232,13 @@ return false;
                                 } else {
                                     MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
                                 }
-                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path-->'+response.name+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path-->'+response.name+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                while (filename.indexOf('%2F')>0) filename = filename.replace('%2F', '/');
+                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
                                 label.innerHTML=StartStr+MiddleStr;
-                                uploadbuttonshow();
+                                label.style.color='green';
+                                // uploadbuttonshow();
 <!--AdminStart-->
+                                response.name=file.webkitRelativePath||response.name;
                                 addelement(response);
 <!--AdminEnd-->
                             } else {
@@ -1202,17 +1254,299 @@ return false;
                         xhr.send(binary);
                     }
                 } else {
-                    if (window.location.pathname.indexOf('%23')>0||(file.webkitRelativePath||file.name).indexOf('%23')>0) {
+                    if (window.location.pathname.indexOf('%23')>0||filename.indexOf('%23')>0) {
                         label.innerHTML='<font color="red"><!--constStr@UploadFail23--></font>';
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';
                     }
-                    uploadbuttonshow();
+                    // uploadbuttonshow();
                 }
             }
         }
     }
-<!--UploadJsEnd-->
+<!--OnedriveUploadJsEnd-->
+<!--AliyundriveUploadJsStart-->
+    function preup() {
+        uploadbuttonhide();
+        var files=document.getElementById('upload_file').files;
+	    if (files.length<1) {
+            uploadbuttonshow();
+            return;
+        };
+        var table1=document.createElement('table');
+        document.getElementById('upload_div').appendChild(table1);
+        table1.setAttribute('class','list-table');
+        var timea=new Date().getTime();
+        var i=0;
+        getuplink(i);
+        function getuplink(i, r=0) {
+            var file=files[i];
+            var td1;
+            var td2;
+            if (r==0) {
+                var tr1=document.createElement('tr');
+                table1.appendChild(tr1);
+                tr1.setAttribute('data-to',1);
+                td1=document.createElement('td');
+                tr1.appendChild(td1);
+                td1.setAttribute('style','width:30%;word-break:break-word;');
+                td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
+                td2=document.createElement('td');
+                tr1.appendChild(td2);
+                td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            }
+            var tdnum = timea+'_'+i;
+            td1=document.getElementById('upfile_td1_'+tdnum);
+            td2=document.getElementById('upfile_td2_'+tdnum);
+            var chunksize=10*1024*1024; // 分块大小
+            //var chunksize=100*1024; // 测试小块
+            /*if (file.size>100*1024*1024*1024) {
+                td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
+                uploadbuttonshow();
+                return;
+            }*/
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            var reader = new FileReader();
+            reader.onprogress = function(e) {
+                td2.innerText = '计算SHA1... ' + (e.loaded*100/file.size).toFixed(2) + " %";
+            }
+            reader.onload = function(e) {
+                var filesha1 = sha1(this.result);
+<!--GuestStart-->
+                function getext(str) {
+                    let p = str.lastIndexOf('.');
+                    if (p===-1) return '';
+                    if (p===0) return '';
+                    return str.substr(p);
+                }
+                var ext = getext(file.webkitRelativePath||file.name);
+                upbigfilename = filesha1 + ext;
+<!--GuestEnd-->
+                while (upbigfilename.indexOf('%2F')>0) upbigfilename = upbigfilename.replace('%2F', '/');
+                td2.innerHTML='<!--constStr@GetUploadLink--> ...';
+                var html = JSON.parse(localStorage.getItem(filesha1));
+                //console.log(html);
+                if (html!==null && ('part_info_list' in html)) {
+                    td2.innerHTML='<!--constStr@UploadStart--> ...';
+                    binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                } else {
+                    var xhr1 = new XMLHttpRequest();
+                    xhr1.open("POST", '?action=upbigfile');
+                    xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                    xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    xhr1.onload = function(e){
+                        //console.log(xhr1.status+xhr1.responseText);
+                        td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
+                        if (xhr1.status==201) {
+                            if (xhr1.responseText=='') {
+                                getuplink(i,1);
+                                return;
+                            }
+                            var html=JSON.parse(xhr1.responseText);
+                            //console.log(html);
+                            if (!html['part_info_list']) {
+                                if (html.name!='') {
+                                    if (html.exist==true) td2.innerHTML=html.name+' 文件名已有';
+                                    else if (html.rapid_upload==true) td2.innerHTML=html.name+' 秒传';
+                                    else td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                    td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                } else {
+                                    td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                }
+                            } else {
+                                td2.innerHTML='<!--constStr@UploadStart--> ...';
+                                //console.log(html);
+                                localStorage.setItem(filesha1, JSON.stringify(html));
+                                binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                            }
+                        }
+                        if (i<files.length-1) {
+                            i++;
+                            getuplink(i);
+                        }
+                    }
+                    xhr1.send('upbigfilename='+ encodeURIComponent(upbigfilename) +'&filesize='+ file.size +'&filelastModified='+ file.lastModified + '&filesha1=' + filesha1 + '&chunksize=' + chunksize);
+                }
+            }
+            reader.readAsArrayBuffer(file);
+        }
+        uploadbuttonshow();
+    }
+    function binupfile(file, res, tdnum, filename, filesha1, chunksize) {
+        // xhr.getResponseHeader
+        if (!('ETag' in res)) res['ETag'] = new Array();
+        var fileid = res['file_id'];
+        var uploadid = res['upload_id'];
+        var label=document.getElementById('upfile_td2_'+tdnum);
+        var reader = new FileReader();
+        var StartStr='';
+        var MiddleStr='';
+        var StartTime;
+        var EndTime;
+        var newstartsize = 0;
+        if(!!file){
+            var chunknum = 0;
+            var chunknumtotal = res['part_info_list'].length;
+            var asize=0;
+            var totalsize=file.size;
+            var newstartsize=0;
+            while (res['ETag'][chunknum]!=null) {
+                chunknum++;
+                newstartsize += chunksize;
+            }
+            StartTime = new Date();
+            asize = newstartsize;
+            if (newstartsize==0) {
+                StartStr='<!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            } else {
+                StartStr='<!--constStr@LastUpload-->'+size_format(newstartsize)+ '<br><!--constStr@ThisTime--><!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            }
+            //var chunksize=5*1024*1024; // chunk size, max 60M. 每小块上传大小
+            //if (totalsize>200*1024*1024) chunksize=10*1024*1024;
+            function readblob(start) {
+                var end=start+chunksize;
+                var blob = file.slice(start,end);
+                reader.readAsArrayBuffer(blob);
+                //reader.readAsArrayBuffer(file);
+            }
+            readblob(asize);
+
+            reader.onload = function(e){
+                if (asize>totalsize) {
+                    var xhr1 = new XMLHttpRequest();
+                    xhr1.open("POST", '?action=upbigfile');
+                    xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                    xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    xhr1.onload = function(e){
+                        console.log(xhr1.responseText+','+xhr1.status);
+                        if (xhr1.status==200) {
+                            localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                            var html=JSON.parse(xhr1.responseText);
+                            //response.name=file.webkitRelativePath||response.name;
+                            addelement(html);
+<!--AdminEnd-->
+                            /*if (totalsize>10*1024*1024) {
+                                var xhr3 = new XMLHttpRequest();
+                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr3.send(null);
+                                xhr3.onload = function(e){
+                                    console.log(xhr3.responseText+','+xhr3.status);
+                                }
+                            }*/
+                            EndTime=new Date();
+                            MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                            if (newstartsize==0) {
+                                MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            } else {
+                                MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            }
+                            document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                            label.innerHTML=StartStr+MiddleStr;
+                            label.style.color='green';
+                        } else {
+                            label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                            localStorage.removeItem(filesha1);
+                        }
+                    }
+                    xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                } else {
+                    var binary = this.result;
+                    var xhr = new XMLHttpRequest();
+                    xhr.open("PUT", res['part_info_list'][chunknum]['upload_url'], true);
+                    //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    bsize=asize+e.loaded-1;
+                    xhr.setRequestHeader('Content-Range', 'bytes ' + asize + '-' + bsize +'/'+ totalsize);
+                    xhr.upload.onprogress = function(e){
+                        if (e.lengthComputable) {
+                            var tmptime = new Date();
+                            var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
+                            var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
+                            label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+remaintime.toFixed(1)+'s';
+                        }
+                    }
+                    var C_starttime = new Date();
+                    xhr.onload = function(e){
+                        if (xhr.status<500) {
+                            //console.log(xhr.responseText);
+                            //console.log(xhr.getResponseHeader('ETag'));
+                        //var response=JSON.parse(xhr.responseText);
+                        if (xhr.responseText==''&&xhr.getResponseHeader('ETag')!='') {
+                            // 有ETag说明本段上传成功
+                            let etag = xhr.getResponseHeader('ETag');
+                            //if (etag.substr(0,1)=='"') etag = etag.substr(1);还就要引号！
+                            //if (etag.substr(-1)=='"') etag = etag.substr(0, etag.length-1);
+                            res['ETag'][chunknum] = etag;
+                            localStorage.setItem(filesha1, JSON.stringify(res));
+                            chunknum++;
+                            asize = bsize + 1;
+                            if (chunknum==chunknumtotal) {
+                                // 上传结束
+                                var xhr1 = new XMLHttpRequest();
+                                xhr1.open("POST", '?action=upbigfile');
+                                xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                                xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr1.onload = function(e){
+                                    console.log(xhr1.responseText+','+xhr1.status);
+                                    if (xhr1.status==200) {
+                                        localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                                        var html=JSON.parse(xhr1.responseText);
+                                        //response.name=file.webkitRelativePath||response.name;
+                                        addelement(html);
+<!--AdminEnd-->
+                                        /*if (totalsize>10*1024*1024) {
+                                            var xhr3 = new XMLHttpRequest();
+                                            xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                            xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                            xhr3.send(null);
+                                            xhr3.onload = function(e){
+                                                console.log(xhr3.responseText+','+xhr3.status);
+                                            }
+                                        }*/
+                                        EndTime=new Date();
+                                        MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                                        if (newstartsize==0) {
+                                            MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        } else {
+                                            MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        }
+                                        document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                        label.innerHTML=StartStr+MiddleStr;
+                                        label.style.color='green';
+                                    } else {
+                                        label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                                        localStorage.removeItem(filesha1);
+                                    }
+                                }
+                                xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                                // uploadbuttonshow();
+                            } else {
+                                readblob(asize);
+                            }
+                        } else {
+                            console.log(xhr.status+xhr.responseText);//<PartEtag>
+                            if (xhr.status==409) {
+                                let str = xhr.responseText;
+                                str = str.substr(str.indexOf('<PartEtag>')+10);
+                                str = str.substr(0, str.indexOf('</PartEtag>'));
+                                res['ETag'][chunknum] = str;
+                                localStorage.setItem(filesha1, JSON.stringify(res));
+                                chunknum++;
+                                asize += chunksize;
+                                readblob(asize);
+                            }
+                                //label.innerHTML='<font color="red">'+xhr.responseText+'</font><br>';
+                        } } else readblob(asize);
+                    }
+                    xhr.send(binary);
+                }
+            }
+        }
+    }
+<!--AliyundriveUploadJsEnd-->
 <!--ListEnd-->
     function operatediv_close(operate) {
         document.getElementById(operate+'_div').style.display='none';
@@ -1220,7 +1554,10 @@ return false;
     }
 <!--AdminStart-->
     function logout() {
-        document.cookie = "admin=; path=/";
+        var expd = new Date();
+        expd.setTime(expd.getTime()+1000);
+        var expires = "expires="+expd.toGMTString();
+        document.cookie = "admin=; path=/; "+expires;
         location.href = location.href;
     }
 <!--IsFolderStart-->
@@ -1229,26 +1566,24 @@ return false;
         for ($i=0;$i<$operatediv.length;$i++) {
             $operatediv[$i].style.display='none';
         }
-        document.getElementById('mask').style.display='none';
+        document.getElementById('mask').style.display='';
         //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
         document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
         if (num=='') {
             var str='';
+            var fileid='';
         } else {
-            var str=document.getElementById('file_a'+num).innerText;
-            if (str=='') {
-                str=document.getElementById('file_a'+num).getElementsByTagName("img")[0].alt;
-                if (str=='') {
-                    alert('<!--constStr@GetFileNameFail-->');
-                    operatediv_close(action);
-                    return;
-                }
-            }
-            if (str.substr(-1)==' ') str=str.substr(0,str.length-1);
+            var str=decodeURIComponent(document.getElementById('file_a'+num).href);
+            if (str.substr(-1)==' ') str=str.substr(0, str.length-1);
+            if (str.substr(-1)=='/') str=str.substr(0, str.length-1);
+            if (str.substr(-8)=='?preview') str=str.substr(0, str.length-8);
+            if (str.lastIndexOf('/')>-1) str=str.substr(str.lastIndexOf('/')+1);
+            var fileid=document.getElementById('file_a'+num).attributes['fileid'].nodeValue;
         }
         document.getElementById(action + '_div').style.display='';
         document.getElementById(action + '_label').innerText=str;//.replace(/&/,'&amp;');
         document.getElementById(action + '_sid').value=num;
+        document.getElementById(action + '_fileid').value=fileid;
         document.getElementById(action + '_hidden').value=str;
         if (action=='rename') document.getElementById(action + '_input').value=str;
         var $e = event || window.event;
@@ -1277,9 +1612,9 @@ return false;
     function submit_operate(str) {
         var num=document.getElementById(str+'_sid').value;
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", '?'+serializeForm(str+'_form'));
-        xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
-        xhr.send(null);
+        xhr.open("POST", '');
+        xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+        xhr.setRequestHeader('x-requested-with', 'XMLHttpRequest');
         xhr.onload = function(e){
             var html;
             if (xhr.status<300) {
@@ -1295,10 +1630,12 @@ return false;
                     html=JSON.parse(xhr.responseText);
                     addelement(html);
                 }
+                //alert('success');
             } else alert(xhr.status+'\n'+xhr.responseText);
             document.getElementById(str+'_div').style.display='none';
             document.getElementById('mask').style.display='none';
         }
+        xhr.send(serializeForm(str+'_form'));
         return false;
     }
     function addelement(html) {
@@ -1312,15 +1649,16 @@ return false;
         a1.target='_blank';
         var td2=document.createElement('td');
         td2.setAttribute('class','updated_at');
-        td2.innerText=html.lastModifiedDateTime.replace(/T/,' ').replace(/Z/,'');
+        if (!!html.time) td2.innerText=html.time.replace(/T/,' ').replace(/Z/,'');
         var td3=document.createElement('td');
         td3.setAttribute('class','size');
-        td3.innerText=size_format(html.size);
-        if (!!html.folder) {
+        if (!!html.size) td3.innerText=size_format(html.size);
+        else td3.innerText='0 B';
+        if (html.type=='folder') {
             a1.href+='/';
             document.getElementById('tr0').parentNode.insertBefore(tr1,document.getElementById('tr0').nextSibling);
         }
-        if (!!html.file) {
+        if (html.type=='file') {
             a1.href+='?preview';
             a1.name='filelist';
             document.getElementById('tr0').parentNode.appendChild(tr1);
@@ -1396,7 +1734,7 @@ return false;
 <!--AdminEnd-->
 <!--LoginStart-->
     function login() {
-        document.getElementById('mask').style.display='none';
+        document.getElementById('mask').style.display='';
             //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
         document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
         document.getElementById('login_div').style.display='';
@@ -1405,8 +1743,11 @@ return false;
         document.getElementById('login_input').focus();
     }
 <!--LoginEnd-->
+<!--EncryptedStart-->
+    document.getElementById('password1').focus();
+<!--EncryptedEnd-->
 </script>
-<script src="//unpkg.zhimg.com/ionicons@4.4.4/dist/ionicons.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/jquery/3.3.1/jquery.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
 <script src="//cdn.bootcdn.net/ajax/libs/twitter-bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>

theme/nginx.html

@@ -0,0 +1,24 @@
+<html>
+    <head>
+        <title><!--Sitename--> - /<!--PathArrayStart--><!--PathArrayName-->/<!--PathArrayEnd--></title>
+    </head>
+    <body>
+        <H1><!--Sitename--> - /<!--DiskPathArrayStart--><!--PathArrayName-->/<!--DiskPathArrayEnd--></H1><hr>
+        <table>
+<!--BackArrowStart-->
+            <tr><td colspan="3"><A HREF="<!--BackArrowUrl-->">../</A></td></tr>
+<!--BackArrowEnd-->
+<!--ListStart-->
+<!--IsFolderStart-->
+<!--FolderListStart-->
+            <tr><td><A HREF="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName-->/</A></td><td align="right"><!--lastModifiedDateTime--></td><td align="right">-</td></tr>
+<!--FolderListEnd-->
+<!--FileListStart-->
+            <tr><td><A HREF="<!--FileEncodeReplaceUrl-->"><!--FileEncodeReplaceName--></A></td><td align="right"><!--lastModifiedDateTime--></td><td align="right"><!--size--></td></tr>
+<!--FileListEnd-->
+<!--IsFolderEnd-->
+<!--ListEnd-->
+        </table>
+        <hr>
+    </body>
+</html>

theme/onemoe.html

@@ -3,9 +3,9 @@
     "music":"musical-notes",
     "video":"logo-youtube",
     "img":"image",
-    "office":"paper",
+    "office":"newspaper",
     "txt":"clipboard",
-    "zip":"filing",
+    "zip":"file-tray-full",
     "iso":"disc",
     "apk":"logo-android",
     "exe":"logo-windows",
@@ -24,9 +24,12 @@
     <link rel="icon" href="<!--base_path-->favicon.ico" type="image/x-icon">
     <link rel="shortcut icon" href="<!--base_path-->favicon.ico" type="image/x-icon">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/kizx/onemoe-theme/onemoe.min.css" type="text/css" />
-<!--BackgroundStart-->
+	<!--BackgroundStart-->
     <style>body{background-repeat:no-repeat;background-size:cover;background-attachment:fixed;background-position-x:center;background-image:url("<!--BackgroundUrl-->")}</style>
-<!--BackgroundEnd-->
+    <!--BackgroundEnd-->
+	<!--BackgroundMStart-->
+    <style>@media screen and (orientation:portrait){body{background-image:url("<!--BackgroundMUrl-->");}}</style>
+    <!--BackgroundMEnd-->
 	<script type="text/javascript">if(window.console&&window.console.log){console.log("%c Onemoe Theme %c https://github.com/kizx/onemoe-theme ","color: #fff; margin: 1em 0; padding: 5px 0; background: #673ab7;","margin: 1em 0; padding: 5px 0; background: #efefef;")}</script>
     <!--customCss-->
 </head>
@@ -40,7 +43,7 @@
         <li class="operate"><ion-icon name="construct"></ion-icon><!--constStr@Operate--><ul>
 <!--IsFolderStart-->
             <li><a onclick="showdiv(event,'create','');"><ion-icon name="add-circle"></ion-icon><!--constStr@Create--></a></li>
-            <li><a onclick="showdiv(event,'encrypt','');"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a></li>
+            <li><a onclick="showdiv(event,'encrypt','');"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a></li>
             <li><a href="?RefreshCache"><ion-icon name="refresh"></ion-icon><!--constStr@RefreshCache--></a></li>
 <!--IsFolderEnd-->
             <li><a href="<!--IsPreview?-->setup"><ion-icon name="settings"></ion-icon><!--constStr@Setup--></a></li>
@@ -104,42 +107,41 @@
     <div class="list-wrapper" id="list-div">
         <div class="list-container">
             <div class="list-header-container">
-<!--BackArrowStart-->
-                <a href="<!--BackArrowUrl-->" class="back-link">
-                    <ion-icon name="arrow-back"></ion-icon>
-                </a>
-<!--BackArrowEnd-->
-                <h3 class="table-header"><!--PathArrayStart--> / <a href="<!--PathArrayLink-->"><!--PathArrayName--></a><!--PathArrayEnd--></h3>
+                <h3 class="table-header"><a href="<!--base_path-->"><!--constStr@Home--></a><!--DiskPathArrayStart--> / <a href="<!--PathArrayLink-->"><!--PathArrayName--></a><!--DiskPathArrayEnd--></h3>
             </div>
             <div class="list-body-container">
 <!--EncryptedStart-->
                 <div style="padding:20px">
 	            <center>
 	                <form action="" method="post">
-		            <input name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+		            <input id="password1" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
 		            <input type="submit" value="<!--constStr@Submit-->">
 	                </form>
                 </center>
                 </div>
 <!--EncryptedEnd-->
 <!--GuestUploadStart-->
-                <div id="upload_div" style="margin:10px">
-                    <div id="upload_btns" align="center">
-                    <input id="upload_file" type="file" name="upload_filename">
+                <div id="upload_div" style="padding:0 0 16px 0">
+                <div id="upload_btns" align="center">
+                    <select onchange="document.getElementById('upload_file').webkitdirectory=this.value;">
+                        <option value=""><!--constStr@UploadFile--></option>
+                        <option value="1"><!--constStr@UploadFolder--></option>
+                    </select>
+                    <input id="upload_file" type="file" name="upload_filename" multiple="multiple">
                     <input id="upload_submit" onclick="preup();" value="<!--constStr@Upload-->" type="button">
-                    </div>
+                </div>
                 </div>
 <!--GuestUploadEnd-->
 
 <!--IsFileStart-->
-                <div style="margin: 12px 4px 4px; text-align: center">
+                <div style="padding: 12px 4px 4px; text-align: center">
                     <div style="margin: 24px">
                         <textarea id="url" title="url" rows="1" style="width: 100%; margin-top: 2px;" readonly><!--FileEncodeUrl--></textarea>
-                        <a href="<!--FileUrl-->"><ion-icon name="download" style="line-height: 16px;vertical-align: middle;"></ion-icon>&nbsp;<!--constStr@Download--></a>
+                        <a href="<!--FileEncodeUrl-->"><ion-icon name="download" style="line-height: 16px;vertical-align: middle;"></ion-icon>&nbsp;<!--constStr@Download--></a>
                     </div>
                     <div style="margin: 24px">
 <!--IsimgFileStart-->
-                        <img src="<!--FileDownUrl-->" alt="<!--FileName-->" onload="if (this.offsetWidth>document.getElementById('url').offsetWidth) this.style.width='100%';" />
+                        <img src="<!--FileEncodeUrl-->" alt="<!--FileName-->" onload="if (this.offsetWidth>document.getElementById('url').offsetWidth) this.style.width='100%';" />
 <!--IsimgFileEnd-->
 <!--IsvideoFileStart-->
                         <div id="video-a0"></div>
@@ -196,7 +198,7 @@
 <!--AdminStart-->
                             <li class="operate"><ion-icon name="construct"></ion-icon><a><!--constStr@Operate--></a>
                             <ul>
-                                <li><a onclick="showdiv(event,'encrypt',<!--filenum-->);"><ion-icon name="lock"></ion-icon><!--constStr@Encrypt--></a></li>
+                                <li><a onclick="showdiv(event,'encrypt',<!--filenum-->);"><ion-icon name="lock-closed"></ion-icon><!--constStr@Encrypt--></a></li>
                                 <li><a onclick="showdiv(event, 'rename',<!--filenum-->);"><ion-icon name="create"></ion-icon><!--constStr@Rename--></a></li>
                                 <li><a onclick="showdiv(event, 'move',<!--filenum-->);"><ion-icon name="move"></ion-icon><!--constStr@Move--></a></li>
                                 <li><a onclick="showdiv(event, 'copy',<!--filenum-->);"><ion-icon name="copy"></ion-icon><!--constStr@Copy--></a></li>
@@ -205,7 +207,7 @@
                             </li>
 <!--AdminEnd-->
                             <ion-icon name="folder"></ion-icon>
-                            <a id="file_a<!--filenum-->" name="folderlist" href="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName--></a>
+                            <a id="file_a<!--filenum-->" name="folderlist" href="<!--FileEncodeReplaceUrl-->/" fileid="<!--FileId-->"><!--FileEncodeReplaceName--></a>
                         </td>
                         <td class="updated_at" id="folder_time<!--filenum-->"><!--lastModifiedDateTime--></td>
                         <td class="size" id="folder_size<!--filenum-->"><!--size--></td>
@@ -225,7 +227,7 @@
                             </li>
 <!--AdminEnd-->
                             <ion-icon name="<!--IconValue-->"></ion-icon>
-                            <a id="file_a<!--filenum-->" name="filelist" href="<!--FileEncodeReplaceUrl-->?preview" target=_blank><!--FileEncodeReplaceName--></a>
+                            <a id="file_a<!--filenum-->" name="filelist" href="<!--FileEncodeReplaceUrl-->?preview" fileid="<!--FileId-->" target=_blank><!--FileEncodeReplaceName--></a>
                             <a class="download" href="<!--FileEncodeReplaceUrl-->"><ion-icon name="download"></ion-icon></a>
                         </td>
                         <td class="updated_at" id="file_time<!--filenum-->"><!--lastModifiedDateTime--></td>
@@ -261,7 +263,7 @@
                 </form>
 <!--MorePageEnd-->
 <!--AdminStart-->
-                <div id="upload_div" style="margin:0 0 16px 0">
+                <div id="upload_div" style="padding:0 0 16px 0">
                 <div id="upload_btns" align="center">
                     <select onchange="document.getElementById('upload_file').webkitdirectory=this.value;">
                         <option value=""><!--constStr@UploadFile--></option>
@@ -273,10 +275,10 @@
                 </div>
 <!--AdminEnd-->
 <!--IsFolderEnd-->
-<!--ListEnd-->
             </div>
         </div>
     </div>
+<!--ListEnd-->
 <!--ReadmemdStart-->
     <div class="list-wrapper" id="readme-div">
         <div class="list-container">
@@ -313,6 +315,7 @@
                 <label id="rename_label"></label><br><br><a onclick="operatediv_close('rename')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="rename_form" onsubmit="return submit_operate('rename');">
                 <input id="rename_sid" name="rename_sid" type="hidden" value="">
+                <input id="rename_fileid" name="rename_fileid" type="hidden" value="">
                 <input id="rename_hidden" name="rename_oldname" type="hidden" value="">
                 <input id="rename_input" name="rename_newname" type="text" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Rename-->">
@@ -326,6 +329,7 @@
                 <form id="delete_form" onsubmit="return submit_operate('delete');">
                 <label id="delete_input"><!--constStr@Delete-->?</label>
                 <input id="delete_sid" name="delete_sid" type="hidden" value="">
+                <input id="delete_fileid" name="delete_fileid" type="hidden" value="">
                 <input id="delete_hidden" name="delete_name" type="hidden" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Submit-->">
                 </form>
@@ -336,6 +340,7 @@
                 <label id="encrypt_label"></label><br><br><a onclick="operatediv_close('encrypt')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="encrypt_form" onsubmit="return submit_operate('encrypt');">
                 <input id="encrypt_sid" name="encrypt_sid" type="hidden" value="">
+                <input id="encrypt_fileid" name="encrypt_fileid" type="hidden" value="">
                 <input id="encrypt_hidden" name="encrypt_folder" type="hidden" value="">
                 <input id="encrypt_input" name="encrypt_newpass" type="text" value="" placeholder="<!--constStr@InputPasswordUWant-->">
                 <!--EncryptBtnStart--><input name="operate_action" type="submit" value="<!--constStr@Encrypt-->"><!--EncryptBtnEnd--><!--EncryptAlertStart--><br><label><!--constStr@SetpassfileBfEncrypt--></label><!--EncryptAlertEnd-->
@@ -347,6 +352,7 @@
                 <label id="copy_label"></label><br><br><a onclick="operatediv_close('copy')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="copy_form" onsubmit="return submit_operate('copy');">
                 <input id="copy_sid" name="copy_sid" type="hidden" value="">
+                <input id="copy_fileid" name="copy_fileid" type="hidden" value="">
                 <input id="copy_hidden" name="copy_name" type="hidden" value="">
                 <input id="copy_input" name="copy_input" type="hidden" value="">
                 <input name="operate_action" type="submit" value="<!--constStr@Copy-->">
@@ -358,6 +364,7 @@
                 <label id="move_label"></label><br><br><a onclick="operatediv_close('move')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="move_form" onsubmit="return submit_operate('move');">
                 <input id="move_sid" name="move_sid" type="hidden" value="">
+                <input id="move_fileid" name="move_fileid" type="hidden" value="">
                 <input id="move_hidden" name="move_name" type="hidden" value="">
                 <select id="move_input" name="move_folder">
 <!--MoveRootStart-->
@@ -376,6 +383,7 @@
                 <a onclick="operatediv_close('create')" class="operatediv_close"><!--constStr@Close--></a>
                 <form id="create_form" onsubmit="return submit_operate('create');">
                     <input id="create_sid" name="create_sid" type="hidden" value="">
+                    <input id="create_fileid" name="create_fileid" type="hidden" value="">
                     <input id="create_hidden" type="hidden" value="">
                     <table>
                         <tr>
@@ -412,14 +420,15 @@
     <div id="login_div" class="operatediv" style="display:none">
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
-	        <center>
-	            <form action="<!--IsPreview?-->admin" method="post">
-		        <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
-		        <input type="submit" value="<!--constStr@Login-->">
-	            </form>
+            <center>
+                <form action="<!--IsPreview?-->admin" method="post" onsubmit="return sha1loginpass(this);">
+                    <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+                    <input name="timestamp" type="hidden" value="">
+                    <input type="submit" value="<!--constStr@Login-->">
+                </form>
             </center>
         </div>
-	</div>
+    </div>
 <!--LoginEnd-->
     <div style="color: rgba(247,247,249,0);"><!--FootStr--></div>
 </body>
@@ -428,6 +437,7 @@
 <!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
 <script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
 <!--GuestUploadStart--><script type="text/javascript" src="//cdn.bootcss.com/spark-md5/3.0.0/spark-md5.min.js"></script><!--GuestUploadEnd-->
+<!--AliyundriveUploadJsStart--><script src="https://cdn.bootcss.com/js-sha1/0.6.0/sha1.min.js"></script><!--AliyundriveUploadJsEnd-->
 <!--IsFileStart--><!--IspdfFileStart--><script src="//cdn.bootcss.com/pdf.js/2.3.200/pdf.min.js"></script><!--IspdfFileEnd--><!--IsFileEnd-->
 <!--ListEnd-->
 <script type="text/javascript">
@@ -440,28 +450,32 @@
         document.cookie='language='+str+'; path=/; '+expires;
         location.href = location.href;
     }
-<!--ListStart-->
-    /*var root = '<!--base_disk_path-->';
-    function path_format(path) {
-        path = '/' + path + '/';
-        while (path.indexOf('//') !== -1) {
-            path = path.replace('//', '/')
-        }
-        return path
+<!--LoginStart-->
+    function login() {
+        document.getElementById('mask').style.display='';
+            //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
+        document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
+        document.getElementById('login_div').style.display='';
+        document.getElementById('login_div').style.left=(document.body.clientWidth-document.getElementById('login_div').offsetWidth)/2 +'px';
+        document.getElementById('login_div').style.top=(window.innerHeight-document.getElementById('login_div').offsetHeight)/2+document.body.scrollTop +'px';
+        document.getElementById('login_input').focus();
     }
-    document.querySelectorAll('.table-header').forEach(function (e) {
-        var path = e.innerText;
-        if (path.substr(path.length-1)=='/') path = path.substr(0, path.length-1);
-        var paths = path.split('/');
-        e.innerHTML = '/ ';
-        if (paths <= 2) return;
-        for (var i = 1; i < paths.length - 1; i++) {
-            var to = path_format(root + paths.slice(0, i + 1).join('/'));
-            e.innerHTML += '<a href="' + to + '">' + paths[i] + '</a> / '
+    function sha1loginpass(f) {
+        if (f.password1.value=="") return false;
+        try {
+            timestamp = new Date().getTime() + "";
+            timestamp = timestamp.substr(0, timestamp.length-3);
+            f.timestamp.value = timestamp;
+            f.password1.value = sha1(timestamp + "" + f.password1.value);
+            return true;
+        } catch {
+            alert("sha1.js not loaded.");
+            return false;
         }
-        e.innerHTML += paths[paths.length - 1];
-        e.innerHTML = e.innerHTML.replace(/\s\/\s$/, '')
-    });*/
+    }
+<!--LoginEnd-->
+<!--ListStart-->
+
 <!--IsFileStart-->
     var $url = document.getElementById('url');
     if ($url) {
@@ -544,7 +558,7 @@
             });
         }
     }
-    addVideos(['<!--FileDownUrl-->']);
+    addVideos(['<!--FileEncodeUrl-->']);
 <!--IsvideoFileEnd-->
 <!--IspdfFileStart-->
     pdfjsLib.GlobalWorkerOptions.workerSrc = '//cdn.bootcss.com/pdf.js/2.3.200/pdf.worker.min.js';
@@ -589,7 +603,6 @@
     if ($head) {
         //document.getElementById('head-div').parentNode.insertBefore(document.getElementById('head-div'),document.getElementById('list-div'));
         $head.innerHTML = marked(document.getElementById('head-md').innerText);
-        
     }
 <!--HeadmdEnd-->
 <!--ReadmemdStart-->
@@ -609,15 +622,13 @@
             strarry=str.split('.');
             ext=strarry[strarry.length-1].toLowerCase();
             if (images.indexOf(ext)>-1) {
+                var url=files[$i].href;
+                url=url.substr(0,url.length-8);
                 if (document.getElementById('originalpic').checked==true) {
-                    var url=files[$i].href;
-                    url=url.substr(0,url.length-8);
                     files[$i].parentNode.parentNode.innerHTML='<td colspan="3"><img src="'+url+'" alt="'+str+'" onload="if (this.offsetWidth>document.getElementById(\'list-div\').offsetWidth) this.style.width=\'100%\';"></td>';
                     $i--;
                 } else {
-                    var nurl=window.location.href;
-                    if (nurl.substr(-1)!="/") nurl+="/";
-                    var url=nurl+str+'?thumbnails';
+                    url+='?thumbnails';
                     get_thumbnails_url(url, str, files[$i]);
                 }
             }
@@ -754,6 +765,40 @@
         alert(tmptextarea.innerHTML+"<!--constStr@Success-->");
     }
 <!--UploadJsStart-->
+    function size_format(num) {
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' B';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' KB';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' MB';
+        }
+        return num.toFixed(2) + ' GB';
+    }
+    function seconds2hour(seconds) {
+        let h, m, s;
+        if (parseFloat(seconds)<60) {
+            return seconds + 's';
+        } else {
+            s = (seconds % 60).toFixed(0);
+            m = parseInt(seconds / 60);
+            if (parseInt(m)<60) {
+                return m + 'm' + s + 's';
+            } else {
+                h = parseInt(m / 60);
+                m = m % 60;
+                return h + 'h' + m + 'm' + s + 's';
+            }
+        }
+    }
     function uploadbuttonhide() {
         document.getElementById('upload_btns').style.display='none';
         /*document.getElementById('upload_submit').disabled='disabled';
@@ -768,6 +813,9 @@
         document.getElementById('upload_submit').style.display='';
         document.getElementById('upload_file').style.display='';*/
     }
+    var uploading = new Object();
+<!--UploadJsEnd-->
+<!--OnedriveUploadJsStart-->
     function preup() {
         uploadbuttonhide();
         var files=document.getElementById('upload_file').files;
@@ -780,7 +828,15 @@
         table1.setAttribute('class','list-table');
         var timea=new Date().getTime();
         var i=0;
-        getuplink(i);
+        var uploadList = setInterval(function(){
+            if (i<files.length) {
+                if (Object.keys(uploading).length<5) {
+                    getuplink(i);
+                    i++;
+                }// else console.log(Object.keys(uploading).length);
+            } else clearInterval(uploadList);
+        }, 1000);
+        //getuplink(i);
         function getuplink(i, r=0) {
             var file=files[i];
             var td1;
@@ -793,7 +849,7 @@
                 tr1.appendChild(td1);
                 td1.setAttribute('style','width:30%;word-break:break-word;');
                 td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
-                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size)+' ('+(i+1)+'/'+files.length+')';
                 td2=document.createElement('td');
                 tr1.appendChild(td2);
                 td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
@@ -806,10 +862,13 @@
                 uploadbuttonshow();
                 return;
             }
-            upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            uploading[upbigfilename] = i;
+            var filemd5='';
 <!--GuestStart-->
             function getext(str) {
                 strarry=str.split('.');
+                if (strarry.length==1) return '';
                 ext=strarry[strarry.length-1].toLowerCase();
                 var reg = new RegExp(".","g");
                 var a = str.replace(reg,"");
@@ -837,29 +896,21 @@
             if (asize < file.size) {
                 readblob(asize);
             } else {
-                var filemd5 = spark.end();
+                filemd5 = spark.end();
                 td2.innerHTML='md5: '+filemd5;
                 upbigfilename = filemd5+ext;
 <!--GuestEnd-->
             td2.innerHTML='<!--constStr@GetUploadLink--> ...';
             var xhr1 = new XMLHttpRequest();
-            xhr1.open("GET", '?action=upbigfile&upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
+            xhr1.open("POST", '?action=upbigfile');
+            //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
             xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
             xhr1.onprogress = function(e){
                 td2.innerHTML+='.';
             }
             xhr1.onload = function(e){
-                console.log(xhr1.status+xhr1.responseText);
+                //console.log(xhr1.status+xhr1.responseText);
                 td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
-                if (xhr1.status==409) {
-                    // td2.innerHTML='nameAlreadyExists';
-                    var html=JSON.parse(xhr1.responseText);
-                    td2.innerHTML=html['error']['code']+': '+html['error']['message'];
-<!--GuestStart-->
-                    td2.innerHTML='md5: '+filemd5;
-<!--GuestEnd-->
-                    td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
-                }
                 if (xhr1.status==200) {
                     if (xhr1.responseText=='') {
                         getuplink(i,1);
@@ -872,13 +923,27 @@
                         td2.innerHTML='<!--constStr@UploadStart--> ...';
                         binupfile(file,html['uploadUrl'],timea+'_'+i, upbigfilename);
                     }
-                }
-                if (i<files.length-1) {
+                } else {
+                    if (xhr1.status==409) {
+                        // td2.innerHTML='nameAlreadyExists';
+                        var html=JSON.parse(xhr1.responseText);
+                        td2.innerHTML=html['error']['code']+': '+html['error']['message'];
+<!--GuestStart-->
+                        td2.innerHTML='md5: '+filemd5;
+                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'"><!--constStr@CopyUrl--></button></div>';
+<!--GuestEnd-->
+<!--AdminStart-->
+                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||file.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" style="display:none"><!--constStr@CopyUrl--></button></div>';
+<!--AdminEnd-->
+                    }
+                /*if (i<files.length-1) {
                     i++;
                     getuplink(i);
+                }*/
+                    delete uploading[upbigfilename];
                 }
             }
-            xhr1.send(null);
+            xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified +'&filemd5='+ filemd5);
 <!--GuestStart-->
             }
         }
@@ -886,24 +951,7 @@
         }
         uploadbuttonshow();
     }
-    function size_format(num) {
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' B';
-        }
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' KB';
-        }
-        if (num>1024) {
-            num=num/1024;
-        } else {
-            return num.toFixed(2) + ' MB';
-        }
-        return num.toFixed(2) + ' GB';
-    }
+
     function binupfile(file,url,tdnum,filename){
         var label=document.getElementById('upfile_td2_'+tdnum);
         var reader = new FileReader();
@@ -952,7 +1000,7 @@
                                 var tmptime = new Date();
                                 var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
                                 var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
-                                label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+remaintime.toFixed(1)+'s';
+                                label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+seconds2hour(remaintime.toFixed(1));
                             }
                         }
                         var C_starttime = new Date();
@@ -961,12 +1009,14 @@
                             var response=JSON.parse(xhr.responseText);
                             if (response['size']>0) {
                                 // contain size, upload finish. 有size说明是最终返回，上传结束
-                                var xhr3 = new XMLHttpRequest();
-                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
-                                xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
-                                xhr3.send(null);
-                                xhr3.onload = function(e){
-                                    console.log(xhr3.responseText+','+xhr3.status);
+                                if (totalsize>10*1024*1024) {
+                                    var xhr3 = new XMLHttpRequest();
+                                    xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                    xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                    xhr3.send(null);
+                                    xhr3.onload = function(e){
+                                        console.log(xhr3.responseText+','+xhr3.status);
+                                    }
                                 }
                                 EndTime=new Date();
                                 MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
@@ -975,8 +1025,12 @@
                                 } else {
                                     MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
                                 }
-                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||response.name)+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+(file.webkitRelativePath||response.name)+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                delete uploading[filename];
+                                while (filename.indexOf('%2F')>0) filename = filename.replace('%2F', '/');
+                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
                                 label.innerHTML=StartStr+MiddleStr;
+                                label.style.color='green';
+                                
                                 // uploadbuttonshow();
 <!--AdminStart-->
                                 response.name=file.webkitRelativePath||response.name;
@@ -985,6 +1039,7 @@
                             } else {
                                 if (!response['nextExpectedRanges']) {
                                     label.innerHTML='<font color="red">'+xhr.responseText+'</font><br>';
+                                    delete uploading[filename];
                                 } else {
                                     var a=response['nextExpectedRanges'][0];
                                     asize=Number( a.slice(0,a.indexOf("-")) );
@@ -1000,12 +1055,332 @@
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';
                     }
+                    delete uploading[filename];
                     // uploadbuttonshow();
                 }
             }
         }
     }
-<!--UploadJsEnd-->
+<!--OnedriveUploadJsEnd-->
+<!--AliyundriveUploadJsStart-->
+    function preup() {
+        uploadbuttonhide();
+        var files=document.getElementById('upload_file').files;
+	    if (files.length<1) {
+            uploadbuttonshow();
+            return;
+        };
+        var table1=document.createElement('table');
+        document.getElementById('upload_div').appendChild(table1);
+        table1.setAttribute('class','list-table');
+        var timea=new Date().getTime();
+        var i=0;
+        var uploadList = setInterval(function(){
+            if (i<files.length) {
+                if (Object.keys(uploading).length<5) {
+                    getuplink(i);
+                    i++;
+                }// else console.log(Object.keys(uploading).length);
+            } else clearInterval(uploadList);
+        }, 1000);
+        //getuplink(i);
+        function getuplink(i, r=0) {
+            var file=files[i];
+            var td1;
+            var td2;
+            if (r==0) {
+                var tr1=document.createElement('tr');
+                table1.appendChild(tr1);
+                tr1.setAttribute('data-to',1);
+                td1=document.createElement('td');
+                tr1.appendChild(td1);
+                td1.setAttribute('style','width:30%;word-break:break-word;');
+                td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size)+' ('+(i+1)+'/'+files.length+')';
+                td2=document.createElement('td');
+                tr1.appendChild(td2);
+                td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            }
+            var tdnum = timea+'_'+i;
+            td1=document.getElementById('upfile_td1_'+tdnum);
+            td2=document.getElementById('upfile_td2_'+tdnum);
+            var chunksize=10*1024*1024; // 分块大小
+            //var chunksize=100*1024; // 测试小块
+            /*if (file.size>100*1024*1024*1024) {
+                td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
+                uploadbuttonshow();
+                return;
+            }*/
+            var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+            uploading[upbigfilename] = [i];
+            var spark = sha1.create();
+            var reader = new FileReader();
+            var chunksize=10*1024*1024;
+            var asize = 0;
+            var filesha1;
+            function readblob(start) {
+                var end=start+chunksize;
+                var blob = file.slice(start,end);
+                reader.readAsArrayBuffer(blob);
+            }
+            readblob(asize);
+
+            reader.onload = function(e){
+                td2.innerHTML='<!--constStr@Calculate--> SHA1: '+(asize*100/file.size).toFixed(2)+'%';
+                var binary = this.result;
+                spark.update(binary);
+                asize += chunksize;
+                if (asize < file.size) {
+                    readblob(asize);
+                } else {
+                    filesha1 = spark.hex();
+                    td2.innerHTML='SHA1: ' + filesha1;
+<!--GuestStart-->
+                    function getext(str) {
+                        let p = str.lastIndexOf('.');
+                        if (p===-1) return '';
+                        if (p===0) return '';
+                        return str.substr(p);
+                    }
+                    var ext = getext(file.webkitRelativePath||file.name);
+                    upbigfilename = filesha1 + ext;
+<!--GuestEnd-->
+                    //while (upbigfilename.indexOf('%2F')>0) upbigfilename = upbigfilename.replace('%2F', '/');
+                    td2.innerHTML='<!--constStr@GetUploadLink--> ...';
+                    var html = JSON.parse(localStorage.getItem(filesha1));
+                    //console.log(html);
+                    if (html!==null && ('part_info_list' in html)) {
+                        td2.innerHTML='<!--constStr@UploadStart--> ...';
+                        binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                    } else {
+                        var xhr1 = new XMLHttpRequest();
+                        xhr1.open("POST", '?action=upbigfile');
+                        //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                        xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                        xhr1.onload = function(e){
+                            //console.log(xhr1.status+xhr1.responseText);
+                            td2.innerHTML='<font color="red">'+xhr1.responseText+'</font>';
+                            if (xhr1.status==201) {
+                                if (xhr1.responseText=='') {
+                                    getuplink(i,1);
+                                    return;
+                                }
+                                var html=JSON.parse(xhr1.responseText);
+                                //console.log(html);
+                                if (!html['part_info_list']) {
+                                    if (html.name!='') {
+                                        if (html.exist==true) td2.innerHTML=html.name+' 文件名已有';
+                                        else if (html.rapid_upload==true) td2.innerHTML=html.name+' 秒传';
+                                        else td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                        td1.innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+td1.innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                    } else {
+                                        td2.innerHTML='<font color="red">'+xhr1.responseText+'</font><br>';
+                                    }
+                                    delete uploading[upbigfilename];
+                                } else {
+                                    td2.innerHTML='<!--constStr@UploadStart--> ...';
+                                    //console.log(html);
+                                    localStorage.setItem(filesha1, JSON.stringify(html));
+                                    binupfile(file, html, timea+'_'+i, upbigfilename, filesha1, chunksize);
+                                }
+                            } else {
+                                delete uploading[upbigfilename];
+                            }
+                            /*if (i<files.length-1) {
+                                i++;
+                                getuplink(i);
+                            }*/
+                        }
+                        xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified + '&filesha1=' + filesha1 + '&chunksize=' + chunksize);
+                    }
+                }
+            }
+        }
+        uploadbuttonshow();
+    }
+    function binupfile(file, res, tdnum, filename, filesha1, chunksize) {
+        // xhr.getResponseHeader
+        if (!('ETag' in res)) res['ETag'] = new Array();
+        var fileid = res['file_id'];
+        var uploadid = res['upload_id'];
+        var label=document.getElementById('upfile_td2_'+tdnum);
+        var reader = new FileReader();
+        var StartStr='';
+        var MiddleStr='';
+        var StartTime;
+        var EndTime;
+        var newstartsize = 0;
+        if(!!file){
+            var chunknum = 0;
+            var chunknumtotal = res['part_info_list'].length;
+            var asize=0;
+            var totalsize=file.size;
+            var newstartsize=0;
+            while (res['ETag'][chunknum]!=null) {
+                chunknum++;
+                newstartsize += chunksize;
+            }
+            StartTime = new Date();
+            asize = newstartsize;
+            if (newstartsize==0) {
+                StartStr='<!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            } else {
+                StartStr='<!--constStr@LastUpload-->'+size_format(newstartsize)+ '<br><!--constStr@ThisTime--><!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
+            }
+            //var chunksize=5*1024*1024; // chunk size, max 60M. 每小块上传大小
+            //if (totalsize>200*1024*1024) chunksize=10*1024*1024;
+            function readblob(start) {
+                var end=start+chunksize;
+                var blob = file.slice(start,end);
+                reader.readAsArrayBuffer(blob);
+                //reader.readAsArrayBuffer(file);
+            }
+            readblob(asize);
+
+            reader.onload = function(e){
+                if (asize>totalsize) {
+                    var xhr1 = new XMLHttpRequest();
+                    xhr1.open("POST", '?action=upbigfile');
+                    //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                    xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    xhr1.onload = function(e){
+                        console.log(xhr1.responseText+','+xhr1.status);
+                        if (xhr1.status==200) {
+                            localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                            var html=JSON.parse(xhr1.responseText);
+                            //response.name=file.webkitRelativePath||response.name;
+                            addelement(html);
+<!--AdminEnd-->
+                            /*if (totalsize>10*1024*1024) {
+                                var xhr3 = new XMLHttpRequest();
+                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr3.send(null);
+                                xhr3.onload = function(e){
+                                    console.log(xhr3.responseText+','+xhr3.status);
+                                }
+                            }*/
+                            EndTime=new Date();
+                            MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                            if (newstartsize==0) {
+                                MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            } else {
+                                MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                            }
+                            document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                            label.innerHTML=StartStr+MiddleStr;
+                            label.style.color='green';
+                        } else {
+                            label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                            localStorage.removeItem(filesha1);
+                        }
+                        delete uploading[filename];
+                    }
+                    xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                } else {
+                    var binary = this.result;
+                    var xhr = new XMLHttpRequest();
+                    xhr.open("PUT", res['part_info_list'][chunknum]['upload_url'], true);
+                    //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
+                    bsize=asize+e.loaded-1;
+                    xhr.setRequestHeader('Content-Range', 'bytes ' + asize + '-' + bsize +'/'+ totalsize);
+                    xhr.upload.onprogress = function(e){
+                        if (e.lengthComputable) {
+                            var tmptime = new Date();
+                            var tmpspeed = e.loaded*1000/(tmptime.getTime()-C_starttime.getTime());
+                            var remaintime = (totalsize-asize-e.loaded)/tmpspeed;
+                            label.innerHTML=StartStr+'<!--constStr@Upload--> ' +size_format(asize+e.loaded)+ ' / '+size_format(totalsize) + ' = ' + ((asize+e.loaded)*100/totalsize).toFixed(2) + '% <!--constStr@AverageSpeed-->:'+size_format((asize+e.loaded-newstartsize)*1000/(tmptime.getTime()-StartTime.getTime()))+'/s<br><!--constStr@CurrentSpeed--> '+size_format(tmpspeed)+'/s <!--constStr@Expect--> '+seconds2hour(remaintime.toFixed(1));
+                        }
+                    }
+                    var C_starttime = new Date();
+                    xhr.onload = function(e){
+                        if (xhr.status<500) {
+                            //console.log(xhr.responseText);
+                            //console.log(xhr.getResponseHeader('ETag'));
+                        //var response=JSON.parse(xhr.responseText);
+                        if (xhr.responseText==''&&xhr.getResponseHeader('ETag')!='') {
+                            // 有ETag说明本段上传成功
+                            let etag = xhr.getResponseHeader('ETag');
+                            //if (etag.substr(0,1)=='"') etag = etag.substr(1);还就要引号！
+                            //if (etag.substr(-1)=='"') etag = etag.substr(0, etag.length-1);
+                            res['ETag'][chunknum] = etag;
+                            localStorage.setItem(filesha1, JSON.stringify(res));
+                            chunknum++;
+                            asize = bsize + 1;
+                            if (chunknum==chunknumtotal) {
+                                // 上传结束
+                                var xhr1 = new XMLHttpRequest();
+                                xhr1.open("POST", '?action=upbigfile');
+                                //xhr1.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                                xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                xhr1.onload = function(e){
+                                    console.log(xhr1.responseText+','+xhr1.status);
+                                    if (xhr1.status==200) {
+                                        localStorage.removeItem(filesha1);
+<!--AdminStart-->
+                                        var html=JSON.parse(xhr1.responseText);
+                                        //response.name=file.webkitRelativePath||response.name;
+                                        addelement(html);
+<!--AdminEnd-->
+                                        /*if (totalsize>10*1024*1024) {
+                                            var xhr3 = new XMLHttpRequest();
+                                            xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
+                                            xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
+                                            xhr3.send(null);
+                                            xhr3.onload = function(e){
+                                                console.log(xhr3.responseText+','+xhr3.status);
+                                            }
+                                        }*/
+                                        EndTime=new Date();
+                                        MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
+                                        if (newstartsize==0) {
+                                            MiddleStr += '<!--constStr@AverageSpeed-->:'+size_format(totalsize*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        } else {
+                                            MiddleStr += '<!--constStr@ThisTime--><!--constStr@AverageSpeed-->:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
+                                        }
+                                        document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+filename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<!--base_disk_path--><!--Path-->'+filename+'" id="upfile_a1_'+tdnum+'"></a><!--constStr@UploadComplete--><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <!--AdminStart--> style="display:none"<!--AdminEnd--> ><!--constStr@CopyUrl--></button></div>';
+                                        label.innerHTML=StartStr+MiddleStr;
+                                        label.style.color='green';
+                                    } else {
+                                        label.innerHTML= '<font color="red">' + xhr1.status + ',' + xhr1.responseText + '</font>';
+                                        localStorage.removeItem(filesha1);
+                                    }
+                                    delete uploading[filename];
+                                }
+                                xhr1.send('uploadid=' + uploadid + '&fileid=' + fileid + '&etag=' + JSON.stringify(res['ETag']));
+                                // uploadbuttonshow();
+                            } else {
+                                readblob(asize);
+                            }
+                        } else {
+                            console.log(xhr.status+xhr.responseText);//<PartEtag>
+                            if (xhr.status==409) {
+                                let str = xhr.responseText;
+                                str = str.substr(str.indexOf('<PartEtag>')+10);
+                                str = str.substr(0, str.indexOf('</PartEtag>'));
+                                res['ETag'][chunknum] = str;
+                                localStorage.setItem(filesha1, JSON.stringify(res));
+                                chunknum++;
+                                asize += chunksize;
+                                readblob(asize);
+                            } else {
+                                delete uploading[filename];
+                            }
+                                //label.innerHTML='<font color="red">'+xhr.responseText+'</font><br>';
+                        } } else readblob(asize);
+                    }
+                    xhr.send(binary);
+                }
+            }
+        }
+    }
+<!--AliyundriveUploadJsEnd-->
+<!--GoogledriveUploadJsStart-->
+    function preup() {
+        alert("Stop!\nCan not upload form explorer without token.");
+    }
+<!--GoogledriveUploadJsEnd-->
 <!--ListEnd-->
     function operatediv_close(operate) {
         document.getElementById(operate+'_div').style.display='none';
@@ -1013,9 +1388,28 @@
     }
 <!--AdminStart-->
     function logout() {
-        document.cookie = "admin=; path=/";
+        var expd = new Date();
+        expd.setTime(expd.getTime()+1000);
+        var expires = "expires="+expd.toGMTString();
+        document.cookie = "admin=; path=/; "+expires;
         location.href = location.href;
     }
+    /*for some mobile browser*/
+    function menu_click(e){
+        var ee=document.getElementsByClassName("active");
+        for(var i=0;i<ee.length;i++){
+            ee[i].classList.remove("active");
+        }
+        if(e.type!="mouseout")this.classList.add("active");
+    }
+    (function(){
+        var e=document.getElementsByClassName("operate");
+        document.body.addEventListener("touchstart", menu_click);
+        for(var i=0;i<e.length;i++){
+            e[i].addEventListener("touchstart", menu_click);
+            e[i].addEventListener("mouseout", menu_click);
+        }
+    })();
 <!--IsFolderStart-->
     function showdiv(event,action,num) {
         var $operatediv=document.getElementsByName('operatediv');
@@ -1027,21 +1421,19 @@
         document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
         if (num=='') {
             var str='';
+            var fileid='';
         } else {
-            var str=document.getElementById('file_a'+num).innerText;
-            if (str=='') {
-                str=document.getElementById('file_a'+num).getElementsByTagName("img")[0].alt;
-                if (str=='') {
-                    alert('<!--constStr@GetFileNameFail-->');
-                    operatediv_close(action);
-                    return;
-                }
-            }
-            if (str.substr(-1)==' ') str=str.substr(0,str.length-1);
+            var str=decodeURIComponent(document.getElementById('file_a'+num).href);
+            if (str.substr(-1)==' ') str=str.substr(0, str.length-1);
+            if (str.substr(-1)=='/') str=str.substr(0, str.length-1);
+            if (str.substr(-8)=='?preview') str=str.substr(0, str.length-8);
+            if (str.lastIndexOf('/')>-1) str=str.substr(str.lastIndexOf('/')+1);
+            var fileid=document.getElementById('file_a'+num).attributes['fileid'].nodeValue;
         }
         document.getElementById(action + '_div').style.display='';
         document.getElementById(action + '_label').innerText=str;//.replace(/&/,'&amp;');
         document.getElementById(action + '_sid').value=num;
+        document.getElementById(action + '_fileid').value=fileid;
         document.getElementById(action + '_hidden').value=str;
         if (action=='rename') document.getElementById(action + '_input').value=str;
         var $e = event || window.event;
@@ -1070,9 +1462,9 @@
     function submit_operate(str) {
         var num=document.getElementById(str+'_sid').value;
         var xhr = new XMLHttpRequest();
-        xhr.open("GET", '?'+serializeForm(str+'_form'));
-        xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
-        xhr.send(null);
+        xhr.open("POST", '');
+        xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+        xhr.setRequestHeader('x-requested-with', 'XMLHttpRequest');
         xhr.onload = function(e){
             var html;
             if (xhr.status<300) {
@@ -1088,10 +1480,12 @@
                     html=JSON.parse(xhr.responseText);
                     addelement(html);
                 }
+                //alert('success');
             } else alert(xhr.status+'\n'+xhr.responseText);
             document.getElementById(str+'_div').style.display='none';
             document.getElementById('mask').style.display='none';
         }
+        xhr.send(serializeForm(str+'_form'));
         return false;
     }
     function addelement(html) {
@@ -1105,15 +1499,16 @@
         a1.target='_blank';
         var td2=document.createElement('td');
         td2.setAttribute('class','updated_at');
-        td2.innerText=html.lastModifiedDateTime.replace(/T/,' ').replace(/Z/,'');
+        if (!!html.time) td2.innerText=html.time.replace(/T/,' ').replace(/Z/,'');
         var td3=document.createElement('td');
         td3.setAttribute('class','size');
-        td3.innerText=size_format(html.size);
-        if (!!html.folder) {
+        if (!!html.size) td3.innerText=size_format(html.size);
+        else td3.innerText='0 B';
+        if (html.type=='folder') {
             a1.href+='/';
             document.getElementById('tr0').parentNode.insertBefore(tr1,document.getElementById('tr0').nextSibling);
         }
-        if (!!html.file) {
+        if (html.type=='file') {
             a1.href+='?preview';
             a1.name='filelist';
             document.getElementById('tr0').parentNode.appendChild(tr1);
@@ -1187,18 +1582,11 @@
     }
 <!--IsFolderEnd-->
 <!--AdminEnd-->
-<!--LoginStart-->
-    function login() {
-        document.getElementById('mask').style.display='';
-            //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
-        document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
-        document.getElementById('login_div').style.display='';
-        document.getElementById('login_div').style.left=(document.body.clientWidth-document.getElementById('login_div').offsetWidth)/2 +'px';
-        document.getElementById('login_div').style.top=(window.innerHeight-document.getElementById('login_div').offsetHeight)/2+document.body.scrollTop +'px';
-        document.getElementById('login_input').focus();
-    }
-<!--LoginEnd-->
+<!--EncryptedStart-->
+    document.getElementById('password1').focus();
+<!--EncryptedEnd-->
 </script>
-<script src="//unpkg.zhimg.com/ionicons@4.4.4/dist/ionicons.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
+<!--LoginStart--><script src="https://cdn.bootcss.com/js-sha1/0.6.0/sha1.min.js"></script><!--LoginEnd-->
 <!--customScript-->
 </html>

update.sh

@@ -62,11 +62,10 @@ OneManagerPath=`cd $(dirname $0);pwd -P`
 cd ${OneManagerPath}
 
 git clone ${branch} ${gitsource}
-[ g"$install" == g"1" ] || \mv -b config.php OneManager-php/
+[ g"$install" == g"1" ] || \mv -b .data/config.php OneManager-php/.data/
 \mv -b OneManager-php/* ./
 \mv -b OneManager-php/.[^.]* ./
 rm -rf *~
-rm -rf .[^.]*~
+#rm -rf .[^.]*~
 rm -rf OneManager-php
-chmod 666 config.php
-
+chmod 666 .data/config.php

version

@@ -1,7 +1,46 @@
+20210817-2030.39
+fix bugs in Vercel. add wait function in operating. change update method in SCF. add payme in readme.
+修复一些Vercel上的bug。在操作完后添加等待功能，确认平台已经准备好。SCF的更新方式改变。在readme中添加讨饭链接。
+
+20210804-1535.38
+try fix "&"/"&" in filename. try show an img too height. change upload chunk size when upload speed>10M/s. fix forceHttps when custom domain in Glitch. fix ionicons svg lost.try use file id when rename. background (or other) based on width/height not only width. fix some bugs. Pre-Add platform Vercel, just wait bugs fixed.
+尝试修复文件名含 "&"/"&"。尝试在一屏内显示过长的图片。上传时分割的块大小随着上传速度改变。修复Glitch中使用自定义域名时forceHttps问题。修复ionicons图标失踪。尝试在重命名时使用file id来操作。背景（或其它）基于长宽来看是竖屏还是横屏，不再只看宽度。修复其它bug。预加入Vercel平台，等修复bugs。
+20210512-1648.37
+add setting "forceHttps", can force 302 jump to https. fix preview office files. fix manage in safari.fix disktag can be "home". fix some bugs.
+新增一个设置，可以强制跳转https。修复office文档预览。修复safari上点不了管理。盘的标签可以是home了，随便命名了。修复一些其它问题。
+20210331-1530.36
+admin can only use classic theme after admin login, and guest can not change theme now. fix: Sharelink can not work in php8. show disk space. limit 5 files in uploading. do with activityLimitReached. fix some bugs.
+暂时解决昨天阿里云盘最新防盗链。管理登录后只能用classic主题，游客不能再切换主题了。修复Sharelink在php8下不能正常工作。显示盘空间。同时上传文件数限制5个。对activityLimitReached稍微处理。修复一些bug。
+20210313-1352.35
+use driveId, after update, <font color="red">Aliyundrive and Googledrive please click the Change link after Driver type</font>. try fix: php8 will run error 500. change layout in settup. fix: uploading non-englist file name. try fix: sha1 a big file.
+换用driveId，更新后<font color="red">Aliyundrive与Googledrive请点一下那个切换链接</font>。尝试修复php8的500 ERROR。改变设置页面的布局。修复上传中文名文件时最终文件以url代码命名。阿里云盘上传时可以sha1大文件了。
+20210311-2004.34
+try fix: can not login, sha1.js not loaded(changed a cdn), show error log.
+尝试修复登录不了的情况：可能sha1.js没有载入（换了源），在登录页显示出错信息。
+20210309-1718.33
+Googledrive can operate now, but the uploading can not done on explorer without token. Onedrive try deal with activeLimit. Can change admin password now. Admin password will sha1 when submitting. Fix some bugs.
+Googledrive可以管理操作了，但因为没法在浏览器端不带token上传，所以上传操作作罢。Onedrive尝试处理activeLimit。可以修改admin密码了。登录等提交admin密码时，会sha1加密再提交。修复一些bug。
+20210301-1745.32
+Onedrive client secret extend. export&import config. adding Googledrive. add reffer: only listing domains can refer.  add diskDescription: tips of disk. Heroku change function_name to HerokuappId. try fix domainforproxy. fix create in Aliyundrive. fix other bugs.
+Onedrive 的client延期。可以导入导出配置了。初步添加Googledrive。添加reffer：只有指定域名能引用。添加diskDescription：可以对盘备注了。Heroku中将function_name改为使用HerokuappId。尝试修复domainforproxy在个人帐号时的问题。修复阿里云盘不能新建与加密。修复其它bug。
+20210118-1600.31
+can change Ondrive to Sharepoint, can copy a disk. fix a bug that 500 error in setup.
+Onedrive跟Sharepoint可以切换了，可以复制一个盘。修复bug。
+20210115-1111.30
+<font color=red>v3, after update, please AddDisk again, please set passfile again.</font> themes of php deleted, or you can use branch v2_last.
+<font color=red>v3，一键升级后请重新添加盘，passfile失效，重新设置。</font>php主题删掉了，要么就用v2_last分支。
+20201229.29
+Modify tags, change sequence of disk.
+可以修改标签，移动标签顺序。
+20201215-1400.28
+fix: hackers can upload files to ANY folder (or create a new folder) in your Onedrive. add language zh-tw. now, on heroku, xhr can post. fix: 2 or more space in file name cause bugs.
+修复：构造代码后可以上传文件到你Onedrive的任意目录（甚至创建新目录）。新增zh-tw语言。xhr的post在heroku会接收了，改回post。修复：文件名有多个空格相连时造成bug。
+20201106-1730.27
+Add theme. A code used in CloudFlare Workers. Admin not need password in folder. Add caddy2 rewrite rule. Add new platform Glitch. <font color=red>web hosting and VPS user should backup your config.php, after update, copy it to .data foloder.</font>
+添加主题。添加一段用于CF workers的代码。加密目录管理员不需要密码了。添加caddy2伪静态。新增Glitch平台。<font color=red>虚拟主机与VPS用户请备份config.php，升级后，手动将它覆盖到.data目录。</font>
 20200828-1420.26
 nginx rewrite rule exclude .well-known folder, as auto SSL. add web.config to rewrite in IIS. now in windwos can do with \ in path. in aliyun FC & huawei FG API, use my code. CN 21Vianet client_id&secret expire. update description now only show new.
 nginx的伪静态中排除.well-known目录，方便自动SSL。添加IIS的伪静态。与linux不同，处理windows下目录用\分隔。FC、FG中使用自己代码对接平台。<font color=red>世纪互联旧API即将过期失效，升级后世纪互联的盘需要删除重新添加。</font>更新说明只显示部分。
-
 20200817-1740.25
 when multy disks, now will default show disks as folders in root, if set autoJumpFirstDisk 1, it will auto jump to first disk.
 多盘时，在网站根目录，默认会将各盘当成文件夹显示，可以去设置中设置autoJumpFirstDisk为1，这样可以跟以前一样自动跳到第一个盘。

writeable.sh

@@ -1,3 +1,3 @@
 OneManagerPath=`cd $(dirname $0);pwd -P`
 cd ${OneManagerPath}
-chmod 666 config.php
+chmod 666 .data/config.php