Merge pull request #165 from david082321/patch-1

add language zh-tw

.htaccess

@@ -2,14 +2,25 @@
 # # LoadModule rewrite_module modules/mod_rewrite.so
 # # AllowOverride All
 RewriteEngine On
+# RewriteCond $1 !^(.well-known)
 RewriteRule ^(.*) index.php?/$1 [L]
 
 ###-----------------------------------
-# # nginx
-# rewrite ^(.*) /index.php?/$1 last;
+### nginx
+# rewrite ^/(?!.well-known)(.*)$ /index.php?/$1 last;
 #
-# # caddy
+### 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;
+}

common.php

@@ -6,6 +6,7 @@ global $ShowedCommonEnv;
 global $InnerEnv;
 global $ShowedInnerEnv;
 global $Base64Env;
+global $timezones;
 
 $Base64Env = [
     //'APIKey', // used in heroku.
@@ -18,7 +19,9 @@ $Base64Env = [
     //'HW_secret', // used in FG.
     //'admin',
     //'adminloginpage',
+    //'autoJumpFirstDisk',
     'background',
+    'backgroundm',
     'diskname',
     //'disableShowThumb',
     //'disableChangeTheme',
@@ -62,7 +65,9 @@ $CommonEnv = [
     'HW_secret', // used in FG.
     'admin',
     'adminloginpage',
+    'autoJumpFirstDisk',
     'background',
+    'backgroundm',
     'disktag',
     'disableShowThumb',
     'disableChangeTheme',
@@ -88,7 +93,9 @@ $ShowedCommonEnv = [
     //'HW_secret', // used in FG.
     //'admin',
     'adminloginpage',
+    'autoJumpFirstDisk',
     'background',
+    'backgroundm',
     //'disktag',
     'disableShowThumb',
     'disableChangeTheme',
@@ -198,9 +205,6 @@ function main($path)
         }
     }
     if (isset($_COOKIE['language'])&&$_COOKIE['language']!='') $constStr['language'] = $_COOKIE['language'];
-    //if (!$constStr['language']) $constStr['language'] = getConfig('language');
-    /*echo 'firstacceptlanguage:'.$_SERVER['firstacceptlanguage'].'
-    '.'lan:'.$constStr['language'];*/
     if ($constStr['language']=='') $constStr['language'] = 'en-us';
     $_SERVER['language'] = $constStr['language'];
     $_SERVER['timezone'] = getConfig('timezone');
@@ -222,14 +226,13 @@ function main($path)
         }
         if (getConfig('admin')!='') {
             if ($_POST['password1']==getConfig('admin')) {
-                return adminform('admin',md5($_POST['password1']),$url);
+                return adminform('admin', pass2cookie('admin', $_POST['password1']), $url);
             } else return adminform();
         } else {
             return output('', 302, [ 'Location' => $url ]);
         }
     }
-    if (getConfig('admin')!='')
-        if ( isset($_COOKIE['admin'])&&$_COOKIE['admin']==md5(getConfig('admin')) ) {
+    if ( isset($_COOKIE['admin'])&&$_COOKIE['admin']==pass2cookie('admin', getConfig('admin')) ) {
         $_SERVER['admin']=1;
         $_SERVER['needUpdate'] = needUpdate();
     } else {
@@ -247,31 +250,42 @@ function main($path)
     $_SERVER['sitename'] = getConfig('sitename');
     if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
     $_SERVER['base_disk_path'] = $_SERVER['base_path'];
-    $disktags = explode("|",getConfig('disktag'));
+    $disktags = explode("|", getConfig('disktag'));
 //    echo 'count$disk:'.count($disktags);
     if (count($disktags)>1) {
         if ($path=='/'||$path=='') {
-            if ($_GET['json']) {
-                // return a json
+            if (getConfig('autoJumpFirstDisk')) return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
+            $files['showname'] = 'root';
             $files['folder']['childCount'] = count($disktags);
             foreach ($disktags as $disktag) {
                 $files['children'][$disktag]['folder'] = 1;
                 $files['children'][$disktag]['name'] = $disktag;
+                $files['children'][$disktag]['showname'] = getConfig('diskname', $disktag);
             }
+            if ($_GET['json']) {
+                // return a json
                 return files_json($files);
-            } // else return render_list($path, $files);
-            return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
             }
+        } else {
             $_SERVER['disktag'] = splitfirst( substr(path_format($path), 1), '/' )[0];
             //$pos = strpos($path, '/');
             //if ($pos>1) $_SERVER['disktag'] = substr($path, 0, $pos);
             if (!in_array($_SERVER['disktag'], $disktags)) {
-            $tmp = path_format($_SERVER['base_path'].'/'.$disktags[0].'/'.$path);
-            return output('Please visit <a href="'.$tmp.'">'.$tmp.'</a>.', 302, [ 'Location' => $tmp ]);
+                $tmp = path_format($_SERVER['base_path'] . '/' . $disktags[0] . '/' . $path);
+                if (!!$_GET) {
+                    $tmp .= '?';
+                    foreach ($_GET as $k => $v) {
+                        if ($v === true) $tmp .= $k . '&';
+                        else $tmp .= $k . '=' . $v . '&';
+                    }
+                    $tmp = substr($tmp, 0, -1);
+                }
+                return output('Please visit <a href="' . $tmp . '">' . $tmp . '</a>.', 302, [ 'Location' => $tmp ]);
                 //return message('<meta http-equiv="refresh" content="2;URL='.$_SERVER['base_path'].'">Please visit from <a href="'.$_SERVER['base_path'].'">Home Page</a>.', 'Error', 404);
             }
-        $path = substr($path, strlen('/'.$_SERVER['disktag']));
-        if ($_SERVER['disktag']!='') $_SERVER['base_disk_path'] = path_format($_SERVER['base_disk_path']. '/' . $_SERVER['disktag'] . '/');
+            $path = substr($path, strlen('/' . $_SERVER['disktag']));
+            if ($_SERVER['disktag']!='') $_SERVER['base_disk_path'] = path_format($_SERVER['base_disk_path'] . '/' . $_SERVER['disktag'] . '/');
+        }
     } else $_SERVER['disktag'] = $disktags[0];
 //    echo 'main.disktag:'.$_SERVER['disktag'].'，path:'.$path.'
 //';
@@ -281,15 +295,17 @@ function main($path)
     $_SERVER['ajax']=0;
     if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) if ($_SERVER['HTTP_X_REQUESTED_WITH']=='XMLHttpRequest') $_SERVER['ajax']=1;
 
+    if ($_SERVER['admin']) if (isset($_GET['AddDisk'])) return get_refresh_token();
+
+    if ($files['showname'] == 'root') return render_list($path, $files);
     config_oauth();
-    if ($_SERVER['admin']) if (isset($_GET['AddDisk'])||isset($_GET['authorization_code'])) return get_refresh_token();
     $refresh_token = getConfig('refresh_token');
-    //if (!$refresh_token) return get_refresh_token();
     if (!$refresh_token) {
         return render_list();
     } else {
-        if (!($_SERVER['access_token'] = getcache('access_token'))) {
-            get_access_token($refresh_token);
+        if (!($_SERVER['access_token'] = getcache('access_token', $_SERVER['disktag']))) {
+            $response = get_access_token($refresh_token);
+            if (isset($response['stat'])) return message($response['body'], 'Error', $response['stat']);
         }
 
         if ($_SERVER['ajax']) {
@@ -306,7 +322,7 @@ function main($path)
                 $tmp = MSAPI('DELETE', $filename, '', $_SERVER['access_token']);
                 $path1 = path_format($_SERVER['list_path'] . path_format($path));
                 if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-                savecache('path_' . $path1, json_decode('{}',true), 1);
+                savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
                 return output($tmp['body'],$tmp['stat']);
             }
             if ($_GET['action']=='uploaded_rename') {
@@ -328,7 +344,7 @@ function main($path)
                 }
                 $path1 = path_format($_SERVER['list_path'] . path_format($path));
                 if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-                savecache('path_' . $path1, json_decode('{}',true), 1);
+                savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
                 return output($tmp['body'],$tmp['stat']);
             }
             if ($_GET['action']=='upbigfile') return bigfileupload($path);
@@ -338,7 +354,7 @@ function main($path)
             if ($tmp['statusCode'] > 0) {
                 $path1 = path_format($_SERVER['list_path'] . path_format($path));
                 if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-                savecache('path_' . $path1, json_decode('{}',true), 1);
+                savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
                 return $tmp;
             }
         } else {
@@ -388,7 +404,11 @@ function main($path)
                     $url = proxy_replace_domain($url, $domainforproxy);
                 }
                 if ( strtolower(splitlast($files['name'],'.')[1])=='html' ) return output($files['content']['body'], $files['content']['stat']);
-                else return output('', 302, [ 'Location' => $url ]);
+                else {
+                    if ($_SERVER['HTTP_RANGE']!='') $header['Range'] = $_SERVER['HTTP_RANGE'];
+                    $header['Location'] = $url;
+                    return output('', 302, $header);
+                }
             }
         }
         if ( isset($files['folder']) || isset($files['file']) ) {
@@ -404,6 +424,11 @@ function main($path)
     }
 }
 
+function pass2cookie($name, $pass)
+{
+    return md5($name . ':' . md5($pass));
+}
+
 function proxy_replace_domain($url, $domainforproxy)
 {
     $tmp = splitfirst($url, '//');
@@ -448,7 +473,7 @@ function files_json($files)
             $tmp1['mime'] = $file['file']['mimeType'];
             array_push($tmp['list'], $tmp1);
         }
-    } else return output('', 404);
+    } else return output(var_dump($files), 404);
     return output(json_encode($tmp), 200, ['Content-Type' => 'application/json']);
 }
 
@@ -472,12 +497,14 @@ function get_access_token($refresh_token)
         if (!$_SERVER['access_token']) {
             error_log($domain . "/personal/" . $account . "/_api/web/GetListUsingPath(DecodedUrl=@a1)/RenderListDataAsStream?@a1='" . urlencode("/personal/" . $account . "/Documents") . "'&RootFolder=" . urlencode("/personal/" . $account . "/Documents/") . "&TryNewExperienceSingle=TRUE");
             error_log('failed to get share access_token. response' . json_encode($ret));
-            throw new Exception($response['stat'].', failed to get share access_token.'.$response['body']);
+            $response['body'] .= '\nfailed to get shareurl access_token.';
+            return $response;
+            //throw new Exception($response['stat'].', failed to get share access_token.'.$response['body']);
         }
         $tmp = $ret;
         $tmp['access_token'] = '******';
         error_log('['.$_SERVER['disktag'].'] Get access token:'.json_encode($tmp, JSON_PRETTY_PRINT));
-        savecache('access_token', $_SERVER['access_token']);
+        savecache('access_token', $_SERVER['access_token'], $_SERVER['disktag']);
         $tmp1 = [];
         $tmp1['shareapiurl'] = $_SERVER['api_url'];
         if (getConfig('shareapiurl')=='') setConfig($tmp1);
@@ -491,16 +518,19 @@ function get_access_token($refresh_token)
         if (!isset($ret['access_token'])) {
             error_log($_SERVER['oauth_url'] . 'token'.'?client_id='. $_SERVER['client_id'] .'&client_secret='. $_SERVER['client_secret'] .'&grant_type=refresh_token&requested_token_use=on_behalf_of&refresh_token=' . substr($refresh_token, 0, 20) . '******' . substr($refresh_token, -20));
             error_log('failed to get ['.$_SERVER['disktag'].'] access_token. response' . json_encode($ret));
-            throw new Exception($response['stat'].', failed to get ['.$_SERVER['disktag'].'] access_token.'.$response['body']);
+            $response['body'] .= '\nfailed to get ['.$_SERVER['disktag'].'] access_token.';
+            return $response;
+            //throw new Exception($response['stat'].', failed to get ['.$_SERVER['disktag'].'] access_token.'.$response['body']);
         }
         $tmp = $ret;
         $tmp['access_token'] = '******';
         $tmp['refresh_token'] = '******';
         error_log('['.$_SERVER['disktag'].'] Get access token:'.json_encode($tmp, JSON_PRETTY_PRINT));
         $_SERVER['access_token'] = $ret['access_token'];
-        savecache('access_token', $_SERVER['access_token'], $ret['expires_in'] - 300);
+        savecache('access_token', $_SERVER['access_token'], $_SERVER['disktag'], $ret['expires_in'] - 300);
         if (time()>getConfig('token_expires')) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+7*24*60*60 ]);
     }
+    return 0;
 }
 
 function list_files($path)
@@ -534,16 +564,36 @@ function isHideFile($name)
     return false;
 }
 
-function getcache($str)
+function getcache($str, $disktag = '')
 {
-    $cache = new \Doctrine\Common\Cache\FilesystemCache(sys_get_temp_dir(), __DIR__.'/Onedrive/'.$_SERVER['disktag']);
+    $cache = filecache($disktag);
     return $cache->fetch($str);
 }
 
-function savecache($key, $value, $exp = 1800)
+function savecache($key, $value, $disktag = '', $exp = 1800)
 {
-    $cache = new \Doctrine\Common\Cache\FilesystemCache(sys_get_temp_dir(), __DIR__.'/Onedrive/'.$_SERVER['disktag']);
-    $cache->save($key, $value, $exp);
+    $cache = filecache($disktag);
+    return $cache->save($key, $value, $exp);
+}
+
+function filecache($disktag)
+{
+    $dir = sys_get_temp_dir();
+    if (!is_writable($dir)) {
+        $tmp = __DIR__ . '/tmp/';
+        if (file_exists($tmp)) {
+            if ( is_writable($tmp) ) $dir = $tmp;
+        } elseif ( mkdir($tmp) ) $dir = $tmp;
+    }
+    $tag = __DIR__ . '/OneManager/' . $disktag;
+    while (strpos($tag, '/')>-1) $tag = str_replace('/', '_', $tag);
+    if (strpos($tag, ':')>-1) {
+        $tag = str_replace(':', '_', $tag);
+        $tag = str_replace('\\', '_', $tag);
+    }
+    // error_log('DIR:' . $dir . ' TAG: ' . $tag);
+    $cache = new \Doctrine\Common\Cache\FilesystemCache($dir, $tag);
+    return $cache;
 }
 
 function getconstStr($str)
@@ -575,10 +625,10 @@ function config_oauth()
         if (getConfig('usesharepoint')=='on') $_SERVER['api_url'] = 'https://graph.microsoft.com/v1.0/sites/' . getConfig('siteid') . '/drive/root';
     }
     if (getConfig('Drive_ver')=='CN') {
-        // CN
+        // CN 21Vianet
         // https://portal.azure.cn
-        $_SERVER['client_id'] = '04c3ca0b-8d07-4773-85ad-98b037d25631';
-        $_SERVER['client_secret'] = 'h8@B7kFVOmj0+8HKBWeNTgl@pU/z4yLB';
+        $_SERVER['client_id'] = '31f3bed5-b9d9-4173-86a4-72c73d278617';
+        $_SERVER['client_secret'] = 'P5-ZNtFK-tT90J.We_-DcsuB8uV7AfjL8Y';
         $_SERVER['oauth_url'] = 'https://login.partner.microsoftonline.cn/common/oauth2/v2.0/';
         $_SERVER['api_url'] = 'https://microsoftgraph.chinacloudapi.cn/v1.0/me/drive/root';
         $_SERVER['scope'] = 'https://microsoftgraph.chinacloudapi.cn/Files.ReadWrite.All offline_access';
@@ -600,7 +650,7 @@ function get_siteid($access_token)
     $sharepointSiteAddress = getConfig('sharepointSiteAddress');
     while (substr($sharepointSiteAddress, -1)=='/') $sharepointSiteAddress = substr($sharepointSiteAddress, 0, -1);
     $tmp = splitlast($sharepointSiteAddress, '/');
-    $sharepointname = $tmp[1];
+    $sharepointname = urlencode($tmp[1]);
     $tmp = splitlast($tmp[0], '/');
     $sharepointname = $tmp[1] . '/' . $sharepointname;
     if (getConfig('Drive_ver')=='MS') $url = 'https://graph.microsoft.com/v1.0/sites/root:/'.$sharepointname;
@@ -614,7 +664,9 @@ function get_siteid($access_token)
     }
     if ($response['stat']!=200) {
         error_log('failed to get siteid. response' . json_encode($response));
-        throw new Exception($response['stat'].', failed to get siteid.'.$response['body']);
+        $response['body'] .= '\nfailed to get siteid.';
+        return $response;
+        //throw new Exception($response['stat'].', failed to get siteid.'.$response['body']);
     }
     return json_decode($response['body'],true)['id'];
 }
@@ -650,22 +702,43 @@ function path_format($path)
     return $path;
 }
 
-function spurlencode($str,$split='')
+function spurlencode($str, $split='')
 {
     $str = str_replace(' ', '%20',$str);
     $tmp='';
     if ($split!='') {
-        $tmparr=explode($split,$str);
-        for($x=0;$x<count($tmparr);$x++) {
-            if ($tmparr[$x]!='') $tmp .= $split . urlencode($tmparr[$x]);
+        $tmparr=explode($split, $str);
+        foreach ($tmparr as $str1) {
+            $tmp .= urlencode($str1) . $split;
         }
+        $tmp = substr($tmp, 0, -strlen($split));
     } else {
         $tmp = urlencode($str);
     }
     $tmp = str_replace('%2520', '%20',$tmp);
+    $tmp = str_replace('%26amp%3B', '&',$tmp);
     return $tmp;
 }
 
+function base64y_encode($str)
+{
+    $str = base64_encode($str);
+    while (substr($str,-1)=='=') $str=substr($str,0,-1);
+    while (strpos($str, '+')!==false) $str = str_replace('+', '-', $str);
+    while (strpos($str, '/')!==false) $str = str_replace('/', '_', $str);
+    return $str;
+}
+
+function base64y_decode($str)
+{
+    while (strpos($str, '_')!==false) $str = str_replace('_', '/', $str);
+    while (strpos($str, '-')!==false) $str = str_replace('-', '+', $str);
+    while (strlen($str)%4) $str .= '=';
+    $str = base64_decode($str);
+    if (strpos($str, '%')!==false) $str = urldecode($str);
+    return $str;
+}
+
 function equal_replace($str, $add = false)
 {
     if ($add) {
@@ -691,6 +764,42 @@ function array_value_isnot_null($arr)
     return $arr!=='';
 }
 
+function curl($method, $url, $data = '', $headers = [], $returnheader = 0)
+{
+    //if (!isset($headers['Accept'])) $headers['Accept'] = '*/*';
+    //if (!isset($headers['Referer'])) $headers['Referer'] = $url;
+    //if (!isset($headers['Content-Type'])) $headers['Content-Type'] = 'application/x-www-form-urlencoded';
+    $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, $returnheader);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $sendHeaders);
+    //$response['body'] = curl_exec($ch);
+    if ($returnheader) {
+        list($returnhead, $response['body']) = explode("\r\n\r\n", curl_exec($ch));
+        foreach (explode("\r\n", $returnhead) as $head) {
+            $tmp = explode(': ', $head);
+            $heads[$tmp[0]] = $tmp[1];
+        }
+        $response['returnhead'] = $heads;
+    } else {
+        $response['body'] = curl_exec($ch);
+    }
+    $response['stat'] = curl_getinfo($ch,CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    return $response;
+}
+
 function curl_request($url, $data = false, $headers = [], $returnheader = 0)
 {
     if (!isset($headers['Accept'])) $headers['Accept'] = '*/*';
@@ -762,7 +871,7 @@ function gethiddenpass($path,$passfile)
 {
     $path1 = path_format($_SERVER['list_path'] . path_format($path));
     if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-    $password=getcache('path_' . $path1 . '/?password');
+    $password=getcache('path_' . $path1 . '/?password', $_SERVER['disktag']);
     if ($password=='') {
         $ispassfile = fetch_files(path_format($path . '/' . urlencode($passfile)));
         //echo $path . '<pre>' . json_encode($ispassfile, JSON_PRETTY_PRINT) . '</pre>';
@@ -772,14 +881,14 @@ function gethiddenpass($path,$passfile)
                 $passwordf=explode("\n",$arr['body']);
                 $password=$passwordf[0];
                 if ($password!='') $password=md5($password);
-                savecache('path_' . $path1 . '/?password', $password);
+                savecache('path_' . $path1 . '/?password', $password, $_SERVER['disktag']);
                 return $password;
             } else {
                 //return md5('DefaultP@sswordWhenNetworkError');
                 return md5( md5(time()).rand(1000,9999) );
             }
         } else {
-            savecache('path_' . $path1 . '/?password', 'null');
+            savecache('path_' . $path1 . '/?password', 'null', $_SERVER['disktag']);
             if ($path !== '' ) {
                 $path = substr($path,0,strrpos($path,'/'));
                 return gethiddenpass($path,$passfile);
@@ -826,10 +935,13 @@ function message($message, $title = 'Message', $statusCode = 200)
 
 function needUpdate()
 {
-    $current_ver = file_get_contents(__DIR__ . '/version');
-    $current_ver = substr($current_ver, strpos($current_ver, '.')+1);
+    $slash = '/';
+    if (strpos(__DIR__, ':')) $slash = '\\';
+    $current_version = file_get_contents(__DIR__ . $slash . 'version');
+    $current_ver = substr($current_version, strpos($current_version, '.')+1);
     $current_ver = explode(urldecode('%0A'),$current_ver)[0];
     $current_ver = explode(urldecode('%0D'),$current_ver)[0];
+    $split = splitfirst($current_version, '.' . $current_ver)[0] . '.' . $current_ver;
     //$github_version = file_get_contents('https://raw.githubusercontent.com/qkqpttgf/OneManager-php/master/version');
     $tmp = curl_request('https://raw.githubusercontent.com/qkqpttgf/OneManager-php/master/version');
     if ($tmp['stat']==0) return 0;
@@ -838,7 +950,9 @@ function needUpdate()
     $github_ver = explode(urldecode('%0A'),$github_ver)[0];
     $github_ver = explode(urldecode('%0D'),$github_ver)[0];
     if ($current_ver != $github_ver) {
-        $_SERVER['github_version'] = $github_version;
+        //$_SERVER['github_version'] = $github_version;
+        $_SERVER['github_ver_new'] = splitfirst($github_version, $split)[0];
+        $_SERVER['github_ver_old'] = splitfirst($github_version, $_SERVER['github_ver_new'])[1];
         return 1;
     }
     return 0;
@@ -856,6 +970,7 @@ function output($body, $statusCode = 200, $headers = ['Content-Type' => 'text/ht
 
 function passhidden($path)
 {
+    if ($_SERVER['admin']) return 0;
     $path = str_replace('+','%2B',$path);
     $path = str_replace('&amp;','&', path_format(urldecode($path)));
     if (getConfig('passfile') != '') {
@@ -888,9 +1003,9 @@ function size_format($byte)
 
 function time_format($ISO)
 {
+    if ($ISO=='') return date('Y-m-d H:i:s');
     $ISO = str_replace('T', ' ', $ISO);
     $ISO = str_replace('Z', ' ', $ISO);
-    //return $ISO;
     return date('Y-m-d H:i:s',strtotime($ISO . " UTC"));
 }
 
@@ -899,7 +1014,7 @@ function get_thumbnails_url($path = '/', $location = 0)
     $path1 = path_format($path);
     $path = path_format($_SERVER['list_path'] . path_format($path));
     if ($path!='/'&&substr($path,-1)=='/') $path=substr($path,0,-1);
-    $thumb_url = getcache('thumb_'.$path);
+    $thumb_url = getcache('thumb_'.$path, $_SERVER['disktag']);
     if ($thumb_url=='') {
         $url = $_SERVER['api_url'];
         if ($path !== '/') {
@@ -909,7 +1024,7 @@ function get_thumbnails_url($path = '/', $location = 0)
         $url .= ':/thumbnails/0/medium';
         $files = json_decode(curl_request($url, false, ['Authorization' => 'Bearer ' . $_SERVER['access_token']])['body'], true);
         if (isset($files['url'])) {
-            savecache('thumb_'.$path, $files['url']);
+            savecache('thumb_'.$path, $files['url'], $_SERVER['disktag']);
             $thumb_url = $files['url'];
         }
     }
@@ -929,6 +1044,10 @@ function get_thumbnails_url($path = '/', $location = 0)
 
 function bigfileupload($path)
 {
+    if (!$_SERVER['admin']) {
+        if (!is_guestup_path($path)) return output('Not_Guest_Upload_Folder', 400);
+        if (strpos($_GET['upbigfilename'], '../')!==false) return output('Not_Allow_Cross_Path', 400);
+    }
     $path1 = path_format($_SERVER['list_path'] . path_format($path));
     if (substr($path1,-1)=='/') $path1=substr($path1,0,-1);
     if ($_GET['upbigfilename']!=''&&$_GET['filesize']>0) {
@@ -942,6 +1061,7 @@ function bigfileupload($path)
         $fileinfo['size'] = $_GET['filesize'];
         $fileinfo['lastModified'] = $_GET['lastModified'];
         $filename = spurlencode($_GET['upbigfilename'],'/');
+        if ($fileinfo['size']>10*1024*1024) {
             $cachefilename = spurlencode( $fileinfo['path'] . '/.' . $fileinfo['lastModified'] . '_' . $fileinfo['size'] . '_' . $fileinfo['name'] . '.tmp', '/');
             $getoldupinfo=fetch_files(path_format($path . '/' . $cachefilename));
             //echo json_encode($getoldupinfo, JSON_PRETTY_PRINT);
@@ -950,12 +1070,15 @@ function bigfileupload($path)
                 $getoldupinfo = json_decode($getoldupinfo_j['body'], true);
                 if ( json_decode( curl_request($getoldupinfo['uploadUrl'])['body'], true)['@odata.context']!='' ) return output($getoldupinfo_j['body'], $getoldupinfo_j['stat']);
             }
+        }
         //if (!$_SERVER['admin']) $filename = spurlencode( $fileinfo['name'] ) . '.scfupload';
-        $response=MSAPI('createUploadSession',path_format($path1 . '/' . $filename),'{"item": { "@microsoft.graph.conflictBehavior": "fail"  }}',$_SERVER['access_token']);
+        $response = MSAPI('createUploadSession', path_format($path1 . '/' . $filename), '{"item": { "@microsoft.graph.conflictBehavior": "fail"  }}', $_SERVER['access_token']);
+        if ($response['stat']<500) {
             $responsearry = json_decode($response['body'],true);
             if (isset($responsearry['error'])) return output($response['body'], $response['stat']);
             $fileinfo['uploadUrl'] = $responsearry['uploadUrl'];
-        MSAPI('PUT', path_format($path1 . '/' . $cachefilename), json_encode($fileinfo, JSON_PRETTY_PRINT), $_SERVER['access_token'])['body'];
+            if ($fileinfo['size']>10*1024*1024) MSAPI('PUT', path_format($path1 . '/' . $cachefilename), json_encode($fileinfo, JSON_PRETTY_PRINT), $_SERVER['access_token']);
+        }
         return output($response['body'], $response['stat']);
     }
     return output('error', 400);
@@ -963,34 +1086,34 @@ function bigfileupload($path)
 
 function adminform($name = '', $pass = '', $path = '')
 {
-    $statusCode = 401;
-    $html = '<html><head><title>'.getconstStr('AdminLogin').'</title><meta charset=utf-8></head>';
+    $html = '<html><head><title>' . getconstStr('AdminLogin') . '</title><meta charset=utf-8></head>';
     if ($name!=''&&$pass!='') {
-        $html .= '<body>'.getconstStr('LoginSuccess').'</body></html>';
-        $statusCode = 302;
+        $html .= '<meta http-equiv="refresh" content="3;URL=' . $path . '"><body>' . getconstStr('LoginSuccess') . '</body></html>';
+        $statusCode = 201;
         date_default_timezone_set('UTC');
         $header = [
-            'Set-Cookie' => $name.'='.$pass.'; path=/; expires='.date(DATE_COOKIE,strtotime('+1hour')),
-            'Location' => $path,
+            'Set-Cookie' => $name . '=' . $pass . '; path=/; expires=' . date(DATE_COOKIE, strtotime('+7day')),
+            //'Location' => $path,
             'Content-Type' => 'text/html'
         ];
-        return output($html,$statusCode,$header);
+        return output($html, $statusCode, $header);
     }
+    $statusCode = 401;
     $html .= '
     <body>
 	<div>
-	  <center><h4>'.getconstStr('InputPassword').'</h4>
+	  <center><h4>' . getconstStr('InputPassword') . '</h4>
 	  <form action="" method="post">
 		  <div>
 		    <input name="password1" type="password"/>
-		    <input type="submit" value="'.getconstStr('Login').'">
+		    <input type="submit" value="' . getconstStr('Login') . '">
           </div>
 	  </form>
       </center>
 	</div>
 ';
     $html .= '</body></html>';
-    return output($html,$statusCode);
+    return output($html, $statusCode);
 }
 
 function adminoperate($path)
@@ -1005,7 +1128,7 @@ function adminoperate($path)
         $data = '{"name":"' . $_GET['rename_newname'] . '"}';
                 //echo $oldname;
         $result = MSAPI('PATCH',$oldname,$data,$_SERVER['access_token']);
-        //savecache('path_' . $path1, json_decode('{}',true), 1);
+        //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
         return output($result['body'], $result['stat']);
     }
     if (isset($_GET['delete_name'])) {
@@ -1014,7 +1137,7 @@ function adminoperate($path)
         $filename = path_format($path1 . '/' . $filename);
                 //echo $filename;
         $result = MSAPI('DELETE', $filename, '', $_SERVER['access_token']);
-        //savecache('path_' . $path1, json_decode('{}',true), 1);
+        //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
         return output($result['body'], $result['stat']);
     }
     if (isset($_GET['operate_action'])&&$_GET['operate_action']==getconstStr('Encrypt')) {
@@ -1022,12 +1145,12 @@ function adminoperate($path)
         if (getConfig('passfile')=='') return message(getconstStr('SetpassfileBfEncrypt'),'',403);
         if ($_GET['encrypt_folder']=='/') $_GET['encrypt_folder']=='';
         $foldername = spurlencode($_GET['encrypt_folder']);
-        $filename = path_format($path1 . '/' . $foldername . '/' . getConfig('passfile'));
+        $filename = path_format($path1 . '/' . $foldername . '/' . urlencode(getConfig('passfile')));
                 //echo $foldername;
         $result = MSAPI('PUT', $filename, $_GET['encrypt_newpass'], $_SERVER['access_token']);
         $path1 = path_format($path1 . '/' . $foldername );
         if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-        savecache('path_' . $path1 . '/?password', '', 1);
+        savecache('path_' . $path1 . '/?password', '', $_SERVER['disktag'], 1);
         return output($result['body'], $result['stat']);
     }
     if (isset($_GET['move_folder'])) {
@@ -1038,14 +1161,18 @@ function adminoperate($path)
         if ($moveable) {
             $filename = spurlencode($_GET['move_name']);
             $filename = path_format($path1 . '/' . $filename);
-            $foldername = path_format('/'.urldecode($path1).'/'.$_GET['move_folder']);
+            if ($_GET['move_folder'] == '/../') {
+                $foldername = path_format('/' . urldecode($path1) . '/');
+                $foldername = substr($foldername, 0, -1);
+                $foldername = splitlast($foldername, '/')[0];
+            } else $foldername = path_format('/' . urldecode($path1) . '/' . $_GET['move_folder']);
             $data = '{"parentReference":{"path": "/drive/root:'.$foldername.'"}}';
             $result = MSAPI('PATCH', $filename, $data, $_SERVER['access_token']);
-            //savecache('path_' . $path1, json_decode('{}',true), 1);
+            //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
             if ($_GET['move_folder'] == '/../') $path2 = path_format( substr($path1, 0, strrpos($path1, '/')) . '/' );
             else $path2 = path_format( $path1 . '/' . $_GET['move_folder'] . '/' );
             if ($path2!='/'&&substr($path2,-1)=='/') $path2=substr($path2,0,-1);
-            savecache('path_' . $path2, json_decode('{}',true), 1);
+            savecache('path_' . $path2, json_decode('{}',true), $_SERVER['disktag'], 1);
             return output($result['body'], $result['stat']);
         } else {
             return output('{"error":"'.getconstStr('CannotMove').'"}', 403);
@@ -1081,10 +1208,10 @@ function adminoperate($path)
             $result = MSAPI('copy', $filename, $data, $_SERVER['access_token']);
         }
         //echo $result['stat'].$result['body'];
-            //savecache('path_' . $path1, json_decode('{}',true), 1);
+            //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
             //if ($_GET['move_folder'] == '/../') $path2 = path_format( substr($path1, 0, strrpos($path1, '/')) . '/' );
             //else $path2 = path_format( $path1 . '/' . $_GET['move_folder'] . '/' );
-            //savecache('path_' . $path2, json_decode('{}',true), 1);
+            //savecache('path_' . $path2, json_decode('{}',true), $_SERVER['disktag'], 1);
         return output($result['body'], $result['stat']);
     }
     if (isset($_POST['editfile'])) {
@@ -1111,14 +1238,14 @@ function adminoperate($path)
             $data = '{ "name": "' . $_GET['create_name'] . '",  "folder": { },  "@microsoft.graph.conflictBehavior": "rename" }';
             $result = MSAPI('children', $path1, $data, $_SERVER['access_token']);
         }
-        //savecache('path_' . $path1, json_decode('{}',true), 1);
+        //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1);
         return output($result['body'], $result['stat']);
     }
     if (isset($_GET['RefreshCache'])) {
         $path1 = path_format($_SERVER['list_path'] . path_format($path));
         if ($path1!='/'&&substr($path1,-1)=='/') $path1=substr($path1,0,-1);
-        savecache('path_' . $path1 . '/?password', '', 1);
-        savecache('customTheme', '', 1);
+        savecache('path_' . $path1 . '/?password', '', $_SERVER['disktag'], 1);
+        savecache('customTheme', '', '', 1);
         return message('<meta http-equiv="refresh" content="2;URL=./">', getconstStr('RefreshCache'), 302);
     }
     return $tmparr;
@@ -1232,7 +1359,7 @@ function fetch_files($path = '/')
     $path1 = path_format($path);
     $path = path_format($_SERVER['list_path'] . path_format($path));
     if ($path!='/'&&substr($path,-1)=='/') $path=substr($path,0,-1);
-    if (!($files = getcache('path_' . $path))) {
+    if (!($files = getcache('path_' . $path, $_SERVER['disktag']))) {
         // https://docs.microsoft.com/en-us/graph/api/driveitem-get?view=graph-rest-1.0
         // https://docs.microsoft.com/zh-cn/graph/api/driveitem-put-content?view=graph-rest-1.0&tabs=http
         // https://developer.microsoft.com/zh-cn/graph/graph-explorer
@@ -1240,13 +1367,13 @@ function fetch_files($path = '/')
         $parentpath = $pos[0];
         if ($parentpath=='') $parentpath = '/';
         $filename = $pos[1];
-        if ($parentfiles = getcache('path_' . $parentpath)) {
+        if ($parentfiles = getcache('path_' . $parentpath, $_SERVER['disktag'])) {
             if (isset($parentfiles['children'][$filename][$_SERVER['DownurlStrName']])) {
                 if (in_array(splitlast($filename,'.')[1], $exts['txt'])) {
                     if (!(isset($parentfiles['children'][$filename]['content'])&&$parentfiles['children'][$filename]['content']['stat']==200)) {
                         $content1 = curl_request($parentfiles['children'][$filename][$_SERVER['DownurlStrName']]);
                         $parentfiles['children'][$filename]['content'] = $content1;
-                        savecache('path_' . $parentpath, $parentfiles);
+                        savecache('path_' . $parentpath, $parentfiles, $_SERVER['disktag']);
                     }
                 }
                 return $parentfiles['children'][$filename];
@@ -1289,7 +1416,7 @@ function fetch_files($path = '/')
                     //if (isset($files['children'])) {
                         $files['children'] = children_name($files['children']);
                     //}
-                    savecache('path_' . $path, $files);
+                    savecache('path_' . $path, $files, $_SERVER['disktag']);
                 }
             }
             if (isset($files['file'])) {
@@ -1297,7 +1424,7 @@ function fetch_files($path = '/')
                     if (!(isset($files['content'])&&$files['content']['stat']==200)) {
                         $content1 = curl_request($files[$_SERVER['DownurlStrName']]);
                         $files['content'] = $content1;
-                        savecache('path_' . $path, $files);
+                        savecache('path_' . $path, $files, $_SERVER['disktag']);
                     }
                 }
             }
@@ -1338,21 +1465,21 @@ function fetch_files_children($files, $path, $page)
     if ($path!='/'&&substr($path,-1)=='/') $path=substr($path,0,-1);
     $cachefilename = '.SCFcache_'.$_SERVER['function_name'];
     $maxpage = ceil($files['folder']['childCount']/200);
-    if (!($files['children'] = getcache('files_' . $path . '_page_' . $page))) {
+    if (!($files['children'] = getcache('files_' . $path . '_page_' . $page, $_SERVER['disktag']))) {
         // down cache file get jump info. 下载cache文件获取跳页链接
         $cachefile = fetch_files(path_format($path1 . '/' .$cachefilename));
         if ($cachefile['size']>0) {
             $pageinfo = curl_request($cachefile[$_SERVER['DownurlStrName']])['body'];
             $pageinfo = json_decode($pageinfo,true);
             for ($page4=1;$page4<$maxpage;$page4++) {
-                savecache('nextlink_' . $path . '_page_' . $page4, $pageinfo['nextlink_' . $path . '_page_' . $page4]);
+                savecache('nextlink_' . $path . '_page_' . $page4, $pageinfo['nextlink_' . $path . '_page_' . $page4], $_SERVER['disktag']);
                 $pageinfocache['nextlink_' . $path . '_page_' . $page4] = $pageinfo['nextlink_' . $path . '_page_' . $page4];
             }
         }
         $pageinfochange=0;
         for ($page1=$page;$page1>=1;$page1--) {
             $page3=$page1-1;
-            $url = getcache('nextlink_' . $path . '_page_' . $page3);
+            $url = getcache('nextlink_' . $path . '_page_' . $page3, $_SERVER['disktag']);
             if ($url == '') {
                 if ($page1==1) {
                     $url = $_SERVER['api_url'];
@@ -1365,10 +1492,10 @@ function fetch_files_children($files, $path, $page)
                     }
                     $children = json_decode(curl_request($url, false, ['Authorization' => 'Bearer ' . $_SERVER['access_token']])['body'], true);
                     // echo $url . '<br><pre>' . json_encode($children, JSON_PRETTY_PRINT) . '</pre>';
-                    savecache('files_' . $path . '_page_' . $page1, $children['value']);
-                    $nextlink=getcache('nextlink_' . $path . '_page_' . $page1);
+                    savecache('files_' . $path . '_page_' . $page1, $children['value'], $_SERVER['disktag']);
+                    $nextlink=getcache('nextlink_' . $path . '_page_' . $page1, $_SERVER['disktag']);
                     if ($nextlink!=$children['@odata.nextLink']) {
-                        savecache('nextlink_' . $path . '_page_' . $page1, $children['@odata.nextLink']);
+                        savecache('nextlink_' . $path . '_page_' . $page1, $children['@odata.nextLink'], $_SERVER['disktag']);
                         $pageinfocache['nextlink_' . $path . '_page_' . $page1] = $children['@odata.nextLink'];
                         $pageinfocache = clearbehindvalue($path,$page1,$maxpage,$pageinfocache);
                         $pageinfochange = 1;
@@ -1377,10 +1504,10 @@ function fetch_files_children($files, $path, $page)
                     for ($page2=$page1+1;$page2<=$page;$page2++) {
                         sleep(1);
                         $children = json_decode(curl_request($url, false, ['Authorization' => 'Bearer ' . $_SERVER['access_token']])['body'], true);
-                        savecache('files_' . $path . '_page_' . $page2, $children['value']);
-                        $nextlink=getcache('nextlink_' . $path . '_page_' . $page2);
+                        savecache('files_' . $path . '_page_' . $page2, $children['value'], $_SERVER['disktag']);
+                        $nextlink=getcache('nextlink_' . $path . '_page_' . $page2, $_SERVER['disktag']);
                         if ($nextlink!=$children['@odata.nextLink']) {
-                            savecache('nextlink_' . $path . '_page_' . $page2, $children['@odata.nextLink']);
+                            savecache('nextlink_' . $path . '_page_' . $page2, $children['@odata.nextLink'], $_SERVER['disktag']);
                             $pageinfocache['nextlink_' . $path . '_page_' . $page2] = $children['@odata.nextLink'];
                             $pageinfocache = clearbehindvalue($path,$page2,$maxpage,$pageinfocache);
                             $pageinfochange = 1;
@@ -1401,10 +1528,10 @@ function fetch_files_children($files, $path, $page)
                 for ($page2=$page3+1;$page2<=$page;$page2++) {
                     sleep(1);
                     $children = json_decode(curl_request($url, false, ['Authorization' => 'Bearer ' . $_SERVER['access_token']])['body'], true);
-                    savecache('files_' . $path . '_page_' . $page2, $children['value'], 3300);
-                    $nextlink=getcache('nextlink_' . $path . '_page_' . $page2);
+                    savecache('files_' . $path . '_page_' . $page2, $children['value'], $_SERVER['disktag'], 3300);
+                    $nextlink=getcache('nextlink_' . $path . '_page_' . $page2, $_SERVER['disktag']);
                     if ($nextlink!=$children['@odata.nextLink']) {
-                        savecache('nextlink_' . $path . '_page_' . $page2, $children['@odata.nextLink'], 3300);
+                        savecache('nextlink_' . $path . '_page_' . $page2, $children['@odata.nextLink'], $_SERVER['disktag'], 3300);
                         $pageinfocache['nextlink_' . $path . '_page_' . $page2] = $children['@odata.nextLink'];
                         $pageinfocache = clearbehindvalue($path,$page2,$maxpage,$pageinfocache);
                         $pageinfochange = 1;
@@ -1425,8 +1552,8 @@ function fetch_files_children($files, $path, $page)
     } else {
         $files['folder']['page']=$page;
         for ($page4=1;$page4<=$maxpage;$page4++) {
-            if (!($url = getcache('nextlink_' . $path . '_page_' . $page4))) {
-                if ($files['folder'][$path.'_'.$page4]!='') savecache('nextlink_' . $path . '_page_' . $page4, $files['folder'][$path.'_'.$page4]);
+            if (!($url = getcache('nextlink_' . $path . '_page_' . $page4, $_SERVER['disktag']))) {
+                if ($files['folder'][$path.'_'.$page4]!='') savecache('nextlink_' . $path . '_page_' . $page4, $files['folder'][$path.'_'.$page4], $_SERVER['disktag']);
             } else {
                 $files['folder'][$path.'_'.$page4] = $url;
             }
@@ -1439,10 +1566,11 @@ function get_refresh_token()
 {
     global $constStr;
     global $CommonEnv;
+    config_oauth();
     $envs = '';
     foreach ($CommonEnv as $env) $envs .= '\'' . $env . '\', ';
     $url = path_format($_SERVER['PHP_SELF'] . '/');
-    if (isset($_GET['authorization_code']) && isset($_GET['code'])) {
+    if (isset($_GET['install2']) && isset($_GET['code'])) {
         $_SERVER['disktag'] = $_COOKIE['disktag'];
         config_oauth();
         $tmp = curl_request($_SERVER['oauth_url'] . 'token', 'client_id=' . $_SERVER['client_id'] .'&client_secret=' . $_SERVER['client_secret'] . '&grant_type=authorization_code&requested_token_use=on_behalf_of&redirect_uri=' . $_SERVER['redirect_uri'] .'&code=' . $_GET['code']);
@@ -1464,14 +1592,23 @@ function get_refresh_token()
         </script>';
             $tmptoken['refresh_token'] = $refresh_token;
             $tmptoken['token_expires'] = time()+7*24*60*60;
-            if (getConfig('usesharepoint')=='on') $tmptoken['siteid'] = get_siteid($ret['access_token']);
-            setConfig($tmptoken, $_COOKIE['disktag']);
-            savecache('access_token', $ret['access_token'], $ret['expires_in'] - 60);
-            //WaitSCFStat();
+            if (getConfig('usesharepoint')=='on') {
+                $tmp1 = get_siteid($ret['access_token']);
+                if (isset($tmp1['stat'])) return message($tmp1['body'], 'Error', $tmp1['stat']);
+                $tmptoken['siteid'] = $tmp1;
+            } 
+            $response = setConfigResponse( setConfig($tmptoken, $_COOKIE['disktag']) );
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 201);
+            } else {
+                savecache('access_token', $ret['access_token'], $_SERVER['disktag'], $ret['expires_in'] - 60);
                 $str .= '
                 <meta http-equiv="refresh" content="5;URL=' . $url . '">';
                 return message($str, getconstStr('WaitJumpIndex'));
             }
+        }
         return message('<pre>' . json_encode(json_decode($tmp['body']), JSON_PRETTY_PRINT) . '</pre>', $tmp['stat']);
         //return message('<pre>' . json_encode($ret, JSON_PRETTY_PRINT) . '</pre>', 500);
     }
@@ -1705,7 +1842,9 @@ function EnvOpt($needUpdate = 0)
             </td>
         </tr>';
         } elseif ($key=='theme') {
-            $theme_arr = scandir(__DIR__.'/theme');
+            $slash = '/';
+            if (strpos(__DIR__, ':')) $slash = '\\';
+            $theme_arr = scandir(__DIR__ . $slash . 'theme');
             $html .= '
         <tr>
             <td><label>' . $key . '</label></td>
@@ -1789,6 +1928,8 @@ function EnvOpt($needUpdate = 0)
         $canOneKeyUpate = 1;
     } elseif (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') {
         $canOneKeyUpate = 1;
+    } elseif ($_SERVER['BCE_CFC_RUNTIME_NAME']=='php7') {
+        $canOneKeyUpate = 1;
     } elseif ($_SERVER['_APP_SHARE_DIR']==='/var/share/CFF/processrouter') {
         $canOneKeyUpate = 1;
     } else {
@@ -1840,8 +1981,12 @@ function EnvOpt($needUpdate = 0)
 ';
     }
     if ($needUpdate) {
-        $html .= '<div style="position:relative;word-wrap: break-word;">
-        ' . str_replace("\r", '<br>',$_SERVER['github_version']) . '
+        $html .= '<div style="position: relative; word-wrap: break-word;">
+        ' . str_replace("\r", '<br>', $_SERVER['github_ver_new']) . '
+</div>
+<button onclick="document.getElementById(\'github_ver_old\').style.display=(document.getElementById(\'github_ver_old\').style.display==\'none\'?\'\':\'none\');">More...</button>
+<div id="github_ver_old" style="position: relative; word-wrap: break-word; display: none">
+        ' . str_replace("\r", '<br>', $_SERVER['github_ver_old']) . '
 </div>';
     }/* else {
         $html .= getconstStr('NotNeedUpdate');
@@ -1854,6 +1999,9 @@ function render_list($path = '', $files = '')
     global $exts;
     global $constStr;
 
+    $slash = '/';
+    if (strpos(__DIR__, ':')) $slash = '\\';
+
     if (isset($files['children']['index.html']) && !$_SERVER['admin']) {
         $htmlcontent = fetch_files(spurlencode(path_format(urldecode($path) . '/index.html'),'/'))['content'];
         return output($htmlcontent['body'], $htmlcontent['stat']);
@@ -1906,22 +2054,22 @@ function render_list($path = '', $files = '')
     //$authinfo = $path . '<br><pre>' . json_encode($files, JSON_PRETTY_PRINT) . '</pre>';
 
     if (isset($_COOKIE['theme'])&&$_COOKIE['theme']!='') $theme = $_COOKIE['theme'];
-    if ( !file_exists(__DIR__.'/theme/'.$theme) ) $theme = '';
+    if ( !file_exists(__DIR__ . $slash .'theme' . $slash . $theme) ) $theme = '';
     if ( $theme=='' ) {
         $tmp = getConfig('customTheme');
         if ( $tmp!='' ) $theme = $tmp;
     }
     if ( $theme=='' ) {
         $theme = getConfig('theme');
-        if ( $theme=='' || !file_exists(__DIR__.'/theme/'.$theme) ) $theme = 'classic.html';
+        if ( $theme=='' || !file_exists(__DIR__ . $slash .'theme' . $slash . $theme) ) $theme = 'classic.html';
     }
     if (substr($theme,-4)=='.php') {
         @ob_start();
         include 'theme/'.$theme;
         $html = ob_get_clean();
     } else {
-        if (file_exists(__DIR__.'/theme/'.$theme)) {
-            $file_path = __DIR__.'/theme/'.$theme;
+        if (file_exists(__DIR__ . $slash .'theme' . $slash . $theme)) {
+            $file_path = __DIR__ . $slash .'theme' . $slash . $theme;
             $html = file_get_contents($file_path);
         } else {
             if (!($html = getcache('customTheme'))) {
@@ -1932,7 +2080,7 @@ function render_list($path = '', $files = '')
                     $tmp = curl_request($tmp["returnhead"]["Location"]);
                 }
                 if (!!$tmp['body']) $html = $tmp['body'];
-                savecache('customTheme', $html, 9999);
+                savecache('customTheme', $html, '', 9999);
             }
             
         }
@@ -2253,7 +2401,7 @@ function render_list($path = '', $files = '')
                     if ($_SERVER['admin'] or !isHideFile($file['name'])) {
                         $filenum++;
                         $FolderListStr = str_replace('<!--FileEncodeReplaceUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path . '/' . encode_str_replace($file['name'])), $FolderList);
-                        $FolderListStr = str_replace('<!--FileEncodeReplaceName-->', str_replace('&','&amp;', $file['name']), $FolderListStr);
+                        $FolderListStr = str_replace('<!--FileEncodeReplaceName-->', str_replace('&','&amp;', $file['showname']?$file['showname']:$file['name']), $FolderListStr);
                         $FolderListStr = str_replace('<!--lastModifiedDateTime-->', time_format($file['lastModifiedDateTime']), $FolderListStr);
                         $FolderListStr = str_replace('<!--size-->', size_format($file['size']), $FolderListStr);
                         while (strpos($FolderListStr, '<!--filenum-->')) $FolderListStr = str_replace('<!--filenum-->', $filenum, $FolderListStr);
@@ -2433,16 +2581,25 @@ function render_list($path = '', $files = '')
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--BackgroundEnd-->');
         if (getConfig('background')) {
-            $background = str_replace('<!--BackgroundUrl-->', getConfig('background'), $tmp[0]);
+            $html .= str_replace('<!--BackgroundUrl-->', getConfig('background'), $tmp[0]);
         }
-        $html .= $background . $tmp[1];
+        $html .= $tmp[1];
+
+        $tmp = splitfirst($html, '<!--BackgroundMStart-->');
+        $html = $tmp[0];
+        $tmp = splitfirst($tmp[1], '<!--BackgroundMEnd-->');
+        if (getConfig('backgroundm')) {
+            $html .= str_replace('<!--BackgroundMUrl-->', getConfig('backgroundm'), $tmp[0]);
+        }
+        $html .=  $tmp[1];
 
         $tmp = splitfirst($html, '<!--PathArrayStart-->');
         $html = $tmp[0];
+        if ($tmp[1]!='') {
             $tmp = splitfirst($tmp[1], '<!--PathArrayEnd-->');
             $PathArrayStr = $tmp[0];
-        $tmp_path = str_replace('%23', '#', str_replace('&','&amp;', $path));
             $tmp_url = $_SERVER['base_disk_path'];
+            $tmp_path = str_replace('&','&amp;', substr(urldecode($_SERVER['PHP_SELF']), strlen($tmp_url)));
             while ($tmp_path!='') {
                 $tmp1 = splitfirst($tmp_path, '/');
                 $folder1 = $tmp1[0];
@@ -2455,6 +2612,28 @@ function render_list($path = '', $files = '')
                 $tmp_path = $tmp1[1];
             }
             $html .= $tmp[1];
+        }
+
+        $tmp = splitfirst($html, '<!--DiskPathArrayStart-->');
+        $html = $tmp[0];
+        if ($tmp[1]!='') {
+            $tmp = splitfirst($tmp[1], '<!--DiskPathArrayEnd-->');
+            $PathArrayStr = $tmp[0];
+            $tmp_url = $_SERVER['base_path'];
+            $tmp_path = str_replace('&','&amp;', substr(urldecode($_SERVER['PHP_SELF']), strlen($tmp_url)));
+            while ($tmp_path!='') {
+                $tmp1 = splitfirst($tmp_path, '/');
+                $folder1 = $tmp1[0];
+                if ($folder1!='') {
+                    $tmp_url .= $folder1 . '/';
+                    $PathArrayStr1 = str_replace('<!--PathArrayLink-->', ($folder1==$files['name']?'':$tmp_url), $PathArrayStr);
+                    $PathArrayStr1 = str_replace('<!--PathArrayName-->', ($folder1==$_SERVER['disktag']?(getConfig('diskname')==''?$_SERVER['disktag']:getConfig('diskname')):$folder1), $PathArrayStr1);
+                    $html .= $PathArrayStr1;
+                }
+                $tmp_path = $tmp1[1];
+            }
+            $html .= $tmp[1];
+        }
         
         $tmp = splitfirst($html, '<!--SelectLanguageStart-->');
         $html = $tmp[0];
@@ -2479,8 +2658,8 @@ function render_list($path = '', $files = '')
         $tmp = splitfirst($html, '<!--BackArrowStart-->');
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--BackArrowEnd-->');
-        if ($path !== '/') {
-            $current_url = $_SERVER['PHP_SELF'];
+        $current_url = path_format($_SERVER['PHP_SELF'] . '/');
+        if ($current_url !== $_SERVER['base_path']) {
             while (substr($current_url, -1) === '/') {
                 $current_url = substr($current_url, 0, -1);
             }
@@ -2541,7 +2720,7 @@ function render_list($path = '', $files = '')
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--HeadomfEnd-->');
         if (isset($files['children']['head.omf'])) {
-            $headomf = str_replace('<!--HeadomfContent-->', fetch_files(spurlencode(path_format(urldecode($path) . '/head.omf'),'/'))['content']['body'], $tmp[0]);
+            $headomf = str_replace('<!--HeadomfContent-->', fetch_files(spurlencode(path_format($path . '/head.omf'),'/'))['content']['body'], $tmp[0]);
         }
         $html .= $headomf . $tmp[1];
         
@@ -2549,7 +2728,7 @@ function render_list($path = '', $files = '')
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--HeadmdEnd-->');
         if (isset($files['children']['head.md'])) {
-            $headmd = str_replace('<!--HeadmdContent-->', fetch_files(spurlencode(path_format(urldecode($path) . '/head.md'),'/'))['content']['body'], $tmp[0]);
+            $headmd = str_replace('<!--HeadmdContent-->', fetch_files(spurlencode(path_format($path . '/head.md'),'/'))['content']['body'], $tmp[0]);
             $html .= $headmd . $tmp[1];
             while (strpos($html, '<!--HeadmdStart-->')) {
                 $html = str_replace('<!--HeadmdStart-->', '', $html);
@@ -2582,7 +2761,7 @@ function render_list($path = '', $files = '')
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--ReadmemdEnd-->');
         if (isset($files['children']['readme.md'])) {
-            $Readmemd = str_replace('<!--ReadmemdContent-->', fetch_files(spurlencode(path_format(urldecode($path) . '/readme.md'),'/'))['content']['body'], $tmp[0]);
+            $Readmemd = str_replace('<!--ReadmemdContent-->', fetch_files(spurlencode(path_format($path . '/readme.md'),'/'))['content']['body'], $tmp[0]);
             $html .= $Readmemd . $tmp[1];
             while (strpos($html, '<!--ReadmemdStart-->')) {
                 $html = str_replace('<!--ReadmemdStart-->', '', $html);
@@ -2604,7 +2783,7 @@ function render_list($path = '', $files = '')
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--FootomfEnd-->');
         if (isset($files['children']['foot.omf'])) {
-            $Footomf = str_replace('<!--FootomfContent-->', fetch_files(spurlencode(path_format(urldecode($path) . '/foot.omf'),'/'))['content']['body'], $tmp[0]);
+            $Footomf = str_replace('<!--FootomfContent-->', fetch_files(spurlencode(path_format($path . '/foot.omf'),'/'))['content']['body'], $tmp[0]);
         }
         $html .= $Footomf . $tmp[1];
 
@@ -2694,7 +2873,7 @@ function render_list($path = '', $files = '')
     }
 
     if ($_SERVER['admin']||!getConfig('disableChangeTheme')) {
-        $theme_arr = scandir(__DIR__.'/theme');
+        $theme_arr = scandir(__DIR__ . $slash . 'theme');
         $html .= '
 <div style="position: fixed;right: 10px;bottom: 10px;/*color: rgba(247,247,249,0);*/">
     <select name="theme" onchange="changetheme(this.options[this.options.selectedIndex].value)">

conststr.php

@@ -14,6 +14,7 @@ $constStr = [
     'languages' => [
         'en-us' => 'English',
         'zh-cn' => '简体中文',
+        'zh-tw' => '繁體中文',
         'ja' => '日本語',
         'ko-kr' => '한국어',
         'fa' => 'فارسی',
@@ -37,6 +38,15 @@ $constStr = [
             5 => '星期五',
             6 => '星期六',
         ],
+        'zh-tw' => [
+            0 => '星期日',
+            1 => '星期一',
+            2 => '星期二',
+            3 => '星期三',
+            4 => '星期四',
+            5 => '星期五',
+            6 => '星期六',
+        ],
         'ja' => [
             0 => '日曜日',
             1 => '月曜日',
@@ -69,6 +79,7 @@ $constStr = [
         'en-us' => [
             'admin' => 'The admin password, Login button will not show when empty',
             'adminloginpage' => 'if set, the Login button will not display, and the login page no longer \'?admin\', it is \'?{this value}\'.',
+            'autoJumpFirstDisk' => 'used in multy disks, if 1, auto jump to first disk',
             'customScript' => '<script> in all pages, e.g. http turn to https',
             'customCss' => '<style> in <head>',
             'customTheme' => 'an url of html',
@@ -79,6 +90,7 @@ $constStr = [
             'disableChangeTheme' => 'if 1, the Theme selection button will not display',
             'downloadencrypt' => '0 or 1. if 1, the files in encrypt folder can be downloaded without password',
             'background' => 'Set an url as background photo.',
+            'backgroundm' => 'Set an url as background in mobile phone.',
             'theme' => 'Select theme.',
             'timezone' => 'Set default timezone.',
             'guestup_path' => 'Set guest upload dir, before set this, the files in this dir will show as normal.',
@@ -92,6 +104,7 @@ $constStr = [
         'zh-cn' => [
             'admin' => '管理密码，不添加时不显示登录页面且无法登录。',
             'adminloginpage' => '如果设置，登录按钮及页面隐藏。管理登录的页面不再是\'?admin\'，而是\'?此设置的值\'。',
+            'autoJumpFirstDisk' => '用于多盘，如果设1，将会自动跳到第一个盘。',
             'customScript' => '<script>，在所有页都会存在,例如放一个http跳转https',
             'customCss' => '<style>，在<head>最后面',
             'customTheme' => 'html格式的主题的url',
@@ -102,6 +115,7 @@ $constStr = [
             'disableChangeTheme' => '如果填 1, 主题选择切换将被隐藏',
             'downloadencrypt' => '0 或 1。如果 1, 那加密目录内的文件可以不需要密码就能下载。',
             'background' => '设置一个url作为背景。',
+            'backgroundm' => '设置一个url作为手机用的背景。',
             'theme' => '选择一个主题。',
             'timezone' => '设置默认时区。',
             'guestup_path' => '设置游客上传路径（图床路径），不设置这个值时该目录内容会正常列文件出来，设置后只有上传界面，不显示其中文件（登录后显示）。',
@@ -112,6 +126,31 @@ $constStr = [
             'sitename' => '网站的名称',
             'Onedrive_ver' => 'Onedrive版本',
         ],
+        'zh-tw' => [
+            'admin' => '管理密碼，不添加時不顯示登入頁面且無法登入。',
+            'adminloginpage' => '如果設定，登入按鈕及頁面隱藏。管理登入的頁面不再是\'?admin\'，而是\'?此設置的值\'。',
+            'autoJumpFirstDisk' => '用於多盤，如果設1，將會自動跳到第一個盤。',
+            'customScript' => '<script>，在所有頁都會存在,例如放一個http跳轉https',
+            'customCss' => '<style>，在<head>最後面',
+            'customTheme' => 'html格式的主題的url',
+            'domain_path' => '使用多個自訂域名時，指定每個域名看到的目錄。格式為a1.com:/dirto/path1|b1.com:/path2，比private_path優先。',
+            'diskname' => '這個盤你想顯示什麼名稱。',
+            'disktag' => '一個標籤，用於儲存配置，多盤時會顯示在url中。',
+            'disableShowThumb' => '如果填 1, ‘顯示縮略’按鈕將被隱藏。',
+            'disableChangeTheme' => '如果填 1, 主題選擇切換將被隱藏',
+            'downloadencrypt' => '0 或 1。如果 1, 那加密目錄內的文件可以不需要密碼就能下載。',
+            'background' => '設定一個url作為背景。',
+            'backgroundm' => '設定一個url作為手機用的背景。',
+            'theme' => '選擇一個主題。',
+            'timezone' => '設定預設時區。',
+            'guestup_path' => '設定遊客上傳路徑（圖床路徑），不設定這個值時該目錄內容會正常列文件出來，設定後只有上傳介面，不顯示其中文件（登入後顯示）。',
+            'hideFunctionalityFile' => '0 或 1。如果 1, 某些文件不列表給遊客看，但它的功能正常，比如readme.md',
+            'passfile' => '自訂密碼文件的名字，可以是\'pppppp\'，也可以是\'aaaa.txt\'等等；列目錄時不會顯示，只有知道密碼才能查看或下載此文件。密碼是這個文件的內容，可以空格、可以中文；',
+            'domainforproxy' => '會將https://xxxxx-my.sharepoint.com取代成這個值，在目標需要自己設定反代。會加上&Origindomain=原域名',
+            'public_path' => '使用API長連結訪問時，顯示網路硬碟檔案的路徑，不設定時預設為根目錄；不能是private_path的上級（public看到的不能比private多，要麼看到的就不一樣）。',
+            'sitename' => '網站的名稱',
+            'Onedrive_ver' => 'Onedrive版本',
+        ],
         'ja' => [
             'admin' => 'パスワードを管理する、追加しない場合、ログインページは表示されず、ログインできません。',
             'adminloginpage' => '設定すると、ログインボタンとページが非表示になります。ログインを管理するためのページは\'?admin \'ではなく、\'?この設定の値\'。',
@@ -158,6 +197,7 @@ $constStr = [
     'SetSecretsFirst' => [
         'en-us' => 'Set API in Config first! or reinstall.',
         'zh-cn' => '先在环境变量设置API！或重装。',
+        'zh-tw' => '先在環境變數設定API！或重裝。',
         'ja' => '最初に環境変数にAPIを設定してください！',
         'ko-kr' => '먼저 환경 변수에서 API를 설정하십시오! 또는 다시 설치하십시오.',
         'fa' => 'ابتدا API را در پیکربندی تنظیم کنید! یا دوباره نصب کنید.',
@@ -165,6 +205,7 @@ $constStr = [
     'RefreshtoLogin' => [
         'en-us' => '<font color="red">Refresh</font> and login.',
         'zh-cn' => '请<font color="red">刷新</font>页面后重新登录',
+        'zh-tw' => '請<font color="red">重新整理</font>頁面後重新登入',
         'ja' => 'ページを<font color = "red">更新</font>して、再度ログインしてください',
         'ko-kr' => '페이지를 <font color = "red"> 새로 고침 </ font> 하시고 다시 로그인하십시오',
         'fa' => '<font color="red">رفرش</font> و لاگین.',
@@ -172,6 +213,7 @@ $constStr = [
     'AdminLogin' => [
         'en-us' => 'Admin Login',
         'zh-cn' => '管理登录',
+        'zh-tw' => '管理登入',
         'ja' => 'ログインを管理する',
         'ko-kr' => '로그인 관리',
         'fa' => 'ورود ادمین',
@@ -179,6 +221,7 @@ $constStr = [
     'LoginSuccess' => [
         'en-us' => 'Login Success!',
         'zh-cn' => '登录成功，正在跳转',
+        'zh-tw' => '登入成功，正在跳轉',
         'ja' => 'ログイン成功、ジャンプ',
         'ko-kr' => '로그인 성공, 점프',
         'fa' => 'ورود با موفقیت انجام شد!',
@@ -186,6 +229,7 @@ $constStr = [
     'InputPassword' => [
         'en-us' => 'Input Password',
         'zh-cn' => '输入密码',
+        'zh-tw' => '輸入密碼',
         'ja' => 'パスワードを入力してください',
         'ko-kr' => '비밀번호 입력',
         'fa' => 'رمز عبور را وارد کنید',
@@ -193,6 +237,7 @@ $constStr = [
     'Login' => [
         'en-us' => 'Login',
         'zh-cn' => '登录',
+        'zh-tw' => '登入',
         'ja' => 'サインイン',
         'ko-kr' => '로그인',
         'fa' => 'ورود',
@@ -200,6 +245,7 @@ $constStr = [
     'Encrypt' => [
         'en-us' => 'Encrypt',
         'zh-cn' => '加密',
+        'zh-tw' => '加密',
         'ja' => '暗号化',
         'ko-kr' => '암호화',
         'fa' => 'رمزگذاری',
@@ -207,6 +253,7 @@ $constStr = [
     'SetpassfileBfEncrypt' => [
         'en-us' => 'Set \'passfile\' in Environments before encrypt',
         'zh-cn' => '先在环境变量设置passfile才能加密',
+        'zh-tw' => '先在環境變數設定passfile才能加密',
         'ja' => '最初に暗号化する環境変数にパスファイルを設定します',
         'ko-kr' => '암호화하기 전에 환경 변수에 패스 파일을 설정하십시오',
         'fa' => 'قبل از رمزگذاری \"pass file \" را در محیط تنظیم کنید',
@@ -214,6 +261,7 @@ $constStr = [
     'updateProgram' => [
         'en-us' => 'Update Program',
         'zh-cn' => '一键更新',
+        'zh-tw' => '一鍵更新',
         'ja' => 'ワンクリック更新',
         'ko-kr' => '원 클릭 업데이트',
         'fa' => 'برنامه را به روز کنید',
@@ -221,6 +269,7 @@ $constStr = [
     'UpdateSuccess' => [
         'en-us' => 'Program update Success!',
         'zh-cn' => '程序升级成功！',
+        'zh-tw' => '程式升級成功！',
         'ja' => 'プログラムのアップグレードに成功しました！',
         'ko-kr' => '프로그램 업그레이드 성공!',
         'fa' => 'موفقیت به روز رسانی برنامه!',
@@ -228,6 +277,7 @@ $constStr = [
     'Setup' => [
         'en-us' => 'Setup',
         'zh-cn' => '设置',
+        'zh-tw' => '設定',
         'ja' => '設定する',
         'ko-kr' => '설정',
         'fa' => 'نصب',
@@ -235,6 +285,7 @@ $constStr = [
     'Back' => [
         'en-us' => 'Back',
         'zh-cn' => '返回',
+        'zh-tw' => '返回',
         'ja' => 'back',
         'ko-kr' => '돌아 가기',
         'fa' => 'بازگشت',
@@ -242,10 +293,12 @@ $constStr = [
     'Theme' => [
         'en-us' => 'Theme',
         'zh-cn' => '主题',
+        'zh-tw' => '主題',
     ],
     'NotNeedUpdate' => [
         'en-us' => 'Not Need Update',
         'zh-cn' => '不需要更新',
+        'zh-tw' => '不需要更新',
         'ja' => '更新不要',
         'ko-kr' => '업데이트가 필요하지 않습니다',
         'fa' => 'آپدیت لازم نیست',
@@ -253,6 +306,7 @@ $constStr = [
     'PlatformConfig' => [
         'en-us' => 'Platform Config',
         'zh-cn' => '平台变量',
+        'zh-tw' => '平台變數',
         'ja' => 'プラットフォーム変数',
         'ko-kr' => '플랫폼 변수',
         'fa' => 'پیکربندی پلتفرم',
@@ -260,6 +314,7 @@ $constStr = [
     'DelDisk' => [
         'en-us' => 'Del This Disk',
         'zh-cn' => '删除此盘',
+        'zh-tw' => '刪除此盤',
         'ja' => 'このディスクを削除',
         'ko-kr' => '이 디스크를 삭제',
         'fa' => 'پاک کردن این دیسک',
@@ -267,6 +322,7 @@ $constStr = [
     'AddDisk' => [
         'en-us' => 'Add Onedrive Disk',
         'zh-cn' => '添加Onedrive盘',
+        'zh-tw' => '添加Onedrive盤',
         'ja' => 'Onedriveを追加',
         'ko-kr' => 'Onedrive 추가',
         'fa' => 'اضافه کردن دیسک Onedrive',
@@ -274,6 +330,7 @@ $constStr = [
     'Home' => [
         'en-us' => 'Home',
         'zh-cn' => '首页',
+        'zh-tw' => '首頁',
         'ja' => 'ホーム',
         'ko-kr' => '홈',
         'fa' => 'خانه',
@@ -281,14 +338,17 @@ $constStr = [
     'Preview' => [
         'en-us' => 'Preview',
         'zh-cn' => '预览',
+        'zh-tw' => '預覽',
     ],
     'List' => [
         'en-us' => 'List',
         'zh-cn' => '列表',
+        'zh-tw' => '列表',
     ],
     'NeedUpdate' => [
         'en-us' => 'Program can update<br>Click setup in Operate at top.',
         'zh-cn' => '可以升级程序<br>在上方管理菜单中<br>进入设置页面升级',
+        'zh-tw' => '可以升級程式<br>在上方管理選單中<br>進入設定頁面升級',
         'ja' => 'プログラムをアップグレードできます<br>上記の管理メニューで<br>アップグレードする設定ページに入ります',
         'ko-kr' => '프로그램을 업그레이드 할 수 있습니다. <br> 위의 관리 메뉴에서 <br> 업그레이드 할 설정 페이지를 입력하십시오.',
         'fa' => 'برنامه می تواند آپدیت شود<br>روی گزینه نصب در بالای صفحه کلیک کنید.',
@@ -296,6 +356,7 @@ $constStr = [
     'Operate' => [
         'en-us' => 'Operate',
         'zh-cn' => '管理',
+        'zh-tw' => '管理',
         'ja' => '管理',
         'ko-kr' => '관리',
         'fa' => 'مدیریت',
@@ -303,6 +364,7 @@ $constStr = [
     'Logout' => [
         'en-us' => 'Logout',
         'zh-cn' => '登出',
+        'zh-tw' => '登出',
         'ja' => 'ログアウトする',
         'ko-kr' => '로그 아웃',
         'fa' => 'خروج',
@@ -310,6 +372,7 @@ $constStr = [
     'Create' => [
         'en-us' => 'Create',
         'zh-cn' => '新建',
+        'zh-tw' => '建立',
         'ja' => '新しい',
         'ko-kr' => '새로운',
         'fa' => 'ایجاد کردن',
@@ -317,6 +380,7 @@ $constStr = [
     'Download' => [
         'en-us' => 'download',
         'zh-cn' => '下载',
+        'zh-tw' => '下載',
         'ja' => 'ダウンロードする',
         'ko-kr' => '다운로드',
         'fa' => 'دانلود',
@@ -324,6 +388,7 @@ $constStr = [
     'ClicktoEdit' => [
         'en-us' => 'Click to edit',
         'zh-cn' => '点击后编辑',
+        'zh-tw' => '點擊後編輯',
         'ja' => 'クリック後に編集',
         'ko-kr' => '클릭 후 편집',
         'fa' => 'برای ویرایش کلیک کنید',
@@ -331,6 +396,7 @@ $constStr = [
     'Save' => [
         'en-us' => 'Save',
         'zh-cn' => '保存',
+        'zh-tw' => '儲存',
         'ja' => '保存する',
         'ko-kr' => '저장',
         'fa' => 'ذخیره',
@@ -338,6 +404,7 @@ $constStr = [
     'FileNotSupport' => [
         'en-us' => 'File not support preview.',
         'zh-cn' => '文件格式不支持预览',
+        'zh-tw' => '檔案格式不支援預覽',
         'ja' => 'ファイル形式はプレビューをサポートしていません',
         'ko-kr' => '파일 형식은 미리보기를 지원하지 않습니다',
         'fa' => 'پیش نمایش برای این فایل پشتیبانی نمی شود.',
@@ -345,6 +412,7 @@ $constStr = [
     'File' => [
         'en-us' => 'File',
         'zh-cn' => '文件',
+        'zh-tw' => '文件',
         'ja' => 'ファイル',
         'ko-kr' => '파일',
         'fa' => 'فایل',
@@ -352,6 +420,7 @@ $constStr = [
     'ShowThumbnails' => [
         'en-us' => 'Thumbnails',
         'zh-cn' => '图片缩略',
+        'zh-tw' => '圖片縮略',
         'ja' => '画像のサムネイル',
         'ko-kr' => '사진 섬네일',
         'fa' => 'تصویر بندانگشتی',
@@ -359,10 +428,12 @@ $constStr = [
     'OriginalPic' => [
         'en-us' => 'OriginalPic',
         'zh-cn' => '原图',
+        'zh-tw' => '原圖',
     ],
     'CopyAllDownloadUrl' => [
         'en-us' => 'CopyAllDownloadUrl',
         'zh-cn' => '复制所有下载链接',
+        'zh-tw' => '複製所有下載連結',
         'ja' => 'すべてのダウンロードリンクをコピー',
         'ko-kr' => '모든 다운로드 링크 복사',
         'fa' => 'کپی از تمام لینک ها',
@@ -370,10 +441,12 @@ $constStr = [
     'Search' => [
         'en-us' => 'Search',
         'zh-cn' => '搜索',
+        'zh-tw' => '搜尋',
     ],
     'EditTime' => [
         'en-us' => 'EditTime',
         'zh-cn' => '修改时间',
+        'zh-tw' => '修改時間',
         'ja' => '変更時間',
         'ko-kr' => '수정 시간',
         'fa' => 'زمان ویرایش',
@@ -381,6 +454,7 @@ $constStr = [
     'Size' => [
         'en-us' => 'Size',
         'zh-cn' => '大小',
+        'zh-tw' => '大小',
         'ja' => 'サイズ ',
         'ko-kr' => '사이즈',
         'fa' => 'سایز',
@@ -388,6 +462,7 @@ $constStr = [
     'Rename' => [
         'en-us' => 'Rename',
         'zh-cn' => '重命名',
+        'zh-tw' => '重新命名',
         'ja' => '名前を変更',
         'ko-kr' => '이름 바꾸기',
         'fa' => 'تغییر نام',
@@ -395,6 +470,7 @@ $constStr = [
     'Move' => [
         'en-us' => 'Move',
         'zh-cn' => '移动',
+        'zh-tw' => '移動',
         'ja' => '移動する',
         'ko-kr' => '이동',
         'fa' => 'انتقال',
@@ -402,6 +478,7 @@ $constStr = [
     'Copy' => [
         'en-us' => 'Copy',
         'zh-cn' => '复制',
+        'zh-tw' => '複製',
         'ja' => 'コピー',
         'ko-kr' => '복사',
         'fa' => 'کپی',
@@ -409,6 +486,7 @@ $constStr = [
     'CannotMove' => [
         'en-us' => 'Can not Move!',
         'zh-cn' => '不能移动！',
+        'zh-tw' => '不能移動！',
         'ja' => '動かない！',
         'ko-kr' => '움직일 수 없어!',
         'fa' => 'نمی‌تواند منتقل شود!',
@@ -416,6 +494,7 @@ $constStr = [
     'Delete' => [
         'en-us' => 'Delete',
         'zh-cn' => '删除',
+        'zh-tw' => '刪除',
         'ja' => '削除する',
         'ko-kr' => '삭제',
         'fa' => 'حذف کردن',
@@ -423,6 +502,7 @@ $constStr = [
     'PrePage' => [
         'en-us' => 'PrePage',
         'zh-cn' => '上一页',
+        'zh-tw' => '上一頁',
         'ja' => '前へ',
         'ko-kr' => '이전',
         'fa' => 'صفحه قبل',
@@ -430,6 +510,7 @@ $constStr = [
     'NextPage' => [
         'en-us' => 'NextPage',
         'zh-cn' => '下一页',
+        'zh-tw' => '下一頁',
         'ja' => '次のページ',
         'ko-kr' => '다음 페이지',
         'fa' => 'صفحه بعد',
@@ -437,6 +518,7 @@ $constStr = [
     'Upload' => [
         'en-us' => 'Upload',
         'zh-cn' => '上传',
+        'zh-tw' => '上傳',
         'ja' => 'アップロードする',
         'ko-kr' => '업로드',
         'fa' => 'آپلود',
@@ -444,14 +526,17 @@ $constStr = [
     'UploadFile' => [
         'en-us' => 'Upload File(s)',
         'zh-cn' => '上传文件',
+        'zh-tw' => '上傳文件',
     ],
     'UploadFolder' => [
         'en-us' => 'Upload Folder',
         'zh-cn' => '上传文件夹',
+        'zh-tw' => '上傳資料夾',
     ],
     'FileSelected' => [
         'en-us' => 'Select File',
         'zh-cn' => '选择文件',
+        'zh-tw' => '選擇文件',
         'ja' => 'ファイルを選択',
         'ko-kr' => '파일 선택',
         'fa' => 'انتخاب فایل',
@@ -459,6 +544,7 @@ $constStr = [
     'NoFileSelected' => [
         'en-us' => 'Not Select File',
         'zh-cn' => '没有选择文件',
+        'zh-tw' => '沒有選擇文件',
         'ja' => 'ファイルが選択されていません',
         'ko-kr' => '선택된 파일이 없습니다',
         'fa' => 'فایل را انتخاب نکنید',
@@ -466,6 +552,7 @@ $constStr = [
     'Submit' => [
         'en-us' => 'Submit',
         'zh-cn' => '确认',
+        'zh-tw' => '確認',
         'ja' => '確認する',
         'ko-kr' => '확인',
         'fa' => 'ارسال',
@@ -473,6 +560,7 @@ $constStr = [
     'Close' => [
         'en-us' => 'Close',
         'zh-cn' => '关闭',
+        'zh-tw' => '關閉',
         'ja' => '閉じる',
         'ko-kr' => '닫기',
         'fa' => 'بستن',
@@ -480,6 +568,7 @@ $constStr = [
     'InputPasswordUWant' => [
         'en-us' => 'Input Password you Want',
         'zh-cn' => '输入想要设置的密码',
+        'zh-tw' => '輸入想要設置的密碼',
         'ja' => '設定するパスワードを入力してください',
         'ko-kr' => '설정하려는 비밀번호를 입력하십시오',
         'fa' => 'پسورد خود را وارد کنید',
@@ -487,6 +576,7 @@ $constStr = [
     'ParentDir' => [
         'en-us' => 'Parent Dir',
         'zh-cn' => '上一级目录',
+        'zh-tw' => '上一級目錄',
         'ja' => '親ディレクトリ',
         'ko-kr' => '부모 디렉토리',
         'fa' => 'مسیر',
@@ -494,6 +584,7 @@ $constStr = [
     'Folder' => [
         'en-us' => 'Folder',
         'zh-cn' => '文件夹',
+        'zh-tw' => '資料夾',
         'ja' => 'フォルダー',
         'ko-kr' => '폴더',
         'fa' => 'پوشه',
@@ -501,6 +592,7 @@ $constStr = [
     'Name' => [
         'en-us' => 'Name',
         'zh-cn' => '名称',
+        'zh-tw' => '名稱',
         'ja' => '名前',
         'ko-kr' => '이름',
         'fa' => 'نام',
@@ -508,6 +600,7 @@ $constStr = [
     'Content' => [
         'en-us' => 'Content',
         'zh-cn' => '内容',
+        'zh-tw' => '內容',
         'ja' => '内容',
         'ko-kr' => '내용',
         'fa' => 'محتوا',
@@ -515,6 +608,7 @@ $constStr = [
     'CancelEdit' => [
         'en-us' => 'Cancel Edit',
         'zh-cn' => '取消编辑',
+        'zh-tw' => '取消編輯',
         'ja' => '編集をキャンセル',
         'ko-kr' => '편집 취소',
         'fa' => 'لغو ویرایش',
@@ -522,6 +616,7 @@ $constStr = [
     'GetFileNameFail' => [
         'en-us' => 'Fail to Get File Name!',
         'zh-cn' => '获取文件名失败！',
+        'zh-tw' => '獲取檔案名失敗！',
         'ja' => 'ファイル名を取得できませんでした！',
         'ko-kr' => '파일 이름을 가져 오지 못했습니다!',
         'fa' => 'نام فایل به دست نیامد!',
@@ -529,6 +624,7 @@ $constStr = [
     'GetUploadLink' => [
         'en-us' => 'Get Upload Link',
         'zh-cn' => '获取上传链接',
+        'zh-tw' => '獲取上傳連結',
         'ja' => 'アップロードリンクを取得',
         'ko-kr' => '업로드 링크 받기',
         'fa' => 'دریافت لینک آپلود',
@@ -536,10 +632,12 @@ $constStr = [
     'Calculate' => [
         'en-us' => 'Calculate',
         'zh-cn' => '计算',
+        'zh-tw' => '計算',
     ],
     'UpFileTooLarge' => [
         'en-us' => 'The File is too Large!',
         'zh-cn' => '文件过大，终止上传。',
+        'zh-tw' => '文件過大，終止上傳。',
         'ja' => '超えると、アップロードは終了します。',
         'ko-kr' => '파일이 너무 커서 업로드가 종료되었습니다.',
         'fa' => 'فایل خیلی بزرگ است!',
@@ -547,6 +645,7 @@ $constStr = [
     'UploadStart' => [
         'en-us' => 'Upload Start',
         'zh-cn' => '开始上传',
+        'zh-tw' => '開始上傳',
         'ja' => 'アップロードを開始',
         'ko-kr' => '업로드 시작',
         'fa' => 'شروع آپلود',
@@ -554,6 +653,7 @@ $constStr = [
     'UploadStartAt' => [
         'en-us' => 'Start At',
         'zh-cn' => '开始于',
+        'zh-tw' => '開始於',
         'ja' => 'で開始',
         'ko-kr' => '에서 시작',
         'fa' => 'شروع از',
@@ -561,6 +661,7 @@ $constStr = [
     'ThisTime' => [
         'en-us' => 'This Time',
         'zh-cn' => '本次',
+        'zh-tw' => '本次',
         'ja' => '今回は',
         'ko-kr' => '이번에는',
         'fa' => 'این زمان',
@@ -568,6 +669,7 @@ $constStr = [
     'LastUpload' => [
         'en-us' => 'Last time Upload',
         'zh-cn' => '上次上传',
+        'zh-tw' => '上次上傳',
         'ja' => '上回は',
         'ko-kr' => '마지막 업로드',
         'fa' => 'آخرین زمان آپلود',
@@ -575,6 +677,7 @@ $constStr = [
     'AverageSpeed' => [
         'en-us' => 'AverageSpeed',
         'zh-cn' => '平均速度',
+        'zh-tw' => '平均速度',
         'ja' => '平均速度',
         'ko-kr' => '평균 속도',
         'fa' => 'میانگین سرعت',
@@ -582,6 +685,7 @@ $constStr = [
     'CurrentSpeed' => [
         'en-us' => 'CurrentSpeed',
         'zh-cn' => '即时速度',
+        'zh-tw' => '即時速度',
         'ja' => 'インスタントスピード',
         'ko-kr' => '즉각적인 속도',
         'fa' => 'سرعت فعلی',
@@ -589,6 +693,7 @@ $constStr = [
     'Expect' => [
         'en-us' => 'Expect',
         'zh-cn' => '预计还要',
+        'zh-tw' => '預計還要',
         'ja' => '期待される',
         'ko-kr' => '예상',
         'fa' => 'انتظار',
@@ -596,6 +701,7 @@ $constStr = [
     'EndAt' => [
         'en-us' => 'End At',
         'zh-cn' => '结束于',
+        'zh-tw' => '結束於',
         'ja' => 'で終了',
         'ko-kr' => '에 끝남',
         'fa' => 'پایان از',
@@ -603,6 +709,7 @@ $constStr = [
     'UploadErrorUpAgain' => [
         'en-us' => 'Maybe error, do upload again.',
         'zh-cn' => '可能出错，重新上传。',
+        'zh-tw' => '可能出錯，重新上傳。',
         'ja' => '間違っている可能性があります。もう一度アップロードしてください。',
         'ko-kr' => '잘못되었을 수 있습니다. 다시 업로드하십시오.',
         'fa' => 'خطا، دوباره آپلود کنید',
@@ -610,6 +717,7 @@ $constStr = [
     'UploadComplete' => [
         'en-us' => 'Upload Complete',
         'zh-cn' => '上传完成',
+        'zh-tw' => '上傳完成',
         'ja' => 'アップロード完了',
         'ko-kr' => '업로드 완료',
         'fa' => 'آپلود با موفقیت انجام شد',
@@ -617,6 +725,7 @@ $constStr = [
     'UploadFail23' => [
         'en-us' => 'Upload Fail, contain #.',
         'zh-cn' => '目录或文件名含有#，上传失败。',
+        'zh-tw' => '目錄或檔案名含有#，上傳失敗。',
         'ja' => 'ディレクトリまたはファイル名に＃が含まれています。アップロードに失敗しました。',
         'ko-kr' => '디렉토리 또는 파일 이름에 #이 포함되어 있습니다. 업로드하지 못했습니다.',
         'fa' => 'بارگذاری ناموفق، حاوی #.',
@@ -627,6 +736,7 @@ $constStr = [
     'SavingToken' => [
         'en-us' => 'Saving refresh_token!',
         'zh-cn' => '正在保存 refresh_token！',
+        'zh-tw' => '正在儲存 refresh_token！',
         'ja' => 'refresh_tokenを保存しています！',
         'ko-kr' => 'refresh_token 저장 중!',
         'fa' => 'در حال ذخیره refresh_token!',
@@ -634,6 +744,7 @@ $constStr = [
     'MayinEnv' => [
         'en-us' => 'The \'Drive_ver\' may in Config',
         'zh-cn' => 'Drive_ver应该已经写入',
+        'zh-tw' => 'Drive_ver應該已經寫入',
         'ja' => 'Drive_verは環境変数に書き込まれている必要があります',
         'ko-kr' => 'Drive_verが書き込まれている必要があります',
         'fa' => 'The \'Drive_ver\' may in Config',
@@ -641,6 +752,7 @@ $constStr = [
     'Wait' => [
         'en-us' => 'Wait',
         'zh-cn' => '稍等',
+        'zh-tw' => '稍等',
         'ja' => 'ちょっと待って',
         'ko-kr' => '잠깐만',
         'fa' => 'منتظر بمانید',
@@ -648,6 +760,7 @@ $constStr = [
     'WaitJumpIndex' => [
         'en-us' => 'Wait 5s jump to Home page',
         'zh-cn' => '等5s跳到首页',
+        'zh-tw' => '等5秒跳到首頁',
         'ja' => '5秒待ってホームページにジャンプします',
         'ko-kr' => '5 초 동안 홈페이지로 이동',
         'fa' => '۵ دقیقه صبر کنید تا به صفحه نخست برگردید',
@@ -655,6 +768,7 @@ $constStr = [
     'JumptoOffice' => [
         'en-us' => 'Login Office and Get a refresh_token',
         'zh-cn' => '跳转到Office，登录获取refresh_token',
+        'zh-tw' => '跳轉到Office，登入獲取refresh_token',
         'ja' => 'Officeにジャンプしてログインし、refresh_tokenを取得します',
         'ko-kr' => '사무실로 이동하여 로그인하여 refresh_token을 받으십시오.',
         'fa' => 'وارد Office شوید و یک refresh_token دریافت کنید',
@@ -662,6 +776,7 @@ $constStr = [
     'OnedriveDiskTag' => [
         'en-us' => 'Onedrive Disk Tag',
         'zh-cn' => 'Onedrive 标签',
+        'zh-tw' => 'Onedrive 標籤',
         'ja' => 'Onedriveタグ',
         'ko-kr' => 'Onedrive 태그',
         'fa' => 'برچسب دیسک Onedrive',
@@ -669,6 +784,7 @@ $constStr = [
     'OnedriveDiskName' => [
         'en-us' => 'Onedrive Showed Name',
         'zh-cn' => 'Onedrive 显示名称',
+        'zh-tw' => 'Onedrive 顯示名稱',
         'ja' => 'Onedrive表示名',
         'ko-kr' => 'Onedrive 표시 이름',
         'fa' => 'نام نشان داده شده Onedrive',
@@ -676,10 +792,12 @@ $constStr = [
     'DriveVerMS' => [
         'en-us' => 'Onedrive, Onedrive for business',
         'zh-cn' => '国际版（商业版与个人版）',
+        'zh-tw' => '國際版（商業版與個人版）',
     ],
     'DriveVerCN' => [
         'en-us' => 'Onedrive in China',
         'zh-cn' => '世纪互联版',
+        'zh-tw' => '世紀互聯版（中國版Onedrive）',
         'ja' => '中国のOnedrive',
         'ko-kr' => '중국 Onedrive',
         'fa' => 'Onedrive در چین',
@@ -687,14 +805,17 @@ $constStr = [
     'DriveVerShareurl' => [
         'en-us' => 'A share link of a folder',
         'zh-cn' => '共享链接',
+        'zh-tw' => '共享連結',
     ],
     'UseShareLink' => [
         'en-us' => 'Share a folder in Onedrive (enable EDIT for everyone), input the link url below.',
         'zh-cn' => '对一个Onedrive文件夹共享，允许所有人编辑，然后将共享链接填在下方',
+        'zh-tw' => '對一個Onedrive資料夾共享，允許所有人編輯，然後將共享連結填在下方',
     ],
     'CustomIdSecret' => [
         'en-us' => 'Use custom client id & secret instead of OneManager default',
         'zh-cn' => '自己申请应用ID与机密，不用OneManager默认的',
+        'zh-tw' => '自己申請應用ID與機密，不用OneManager預設的',
         'ja' => 'アプリケーションIDとシークレットを自分で申請する',
         'ko-kr' => '응용 프로그램 ID 및 비밀 신청',
         'fa' => 'به طور پیش فرض اما از شناسه برنامه و سکرت استفاده کنید',
@@ -702,16 +823,19 @@ $constStr = [
     'GetSecretIDandKEY' => [
         'en-us' => 'Get custom client id & secret',
         'zh-cn' => '申请应用ID与机密',
+        'zh-tw' => '申請應用ID與機密',
         'ja' => 'アプリケーションIDとシークレット',
         'fa' => 'دریافت شناسه برنامه و سکرت',
     ],
     'UseSharepointInstead' => [
         'en-us' => 'Use space in Sharepoint website instead of Onedrive',
         'zh-cn' => '使用Sharepoint网站的空间，不使用Onedrive',
+        'zh-tw' => '使用Sharepoint網站的空間，不使用Onedrive',
     ],
     'GetSharepointSiteAddress' => [
         'en-us' => 'Login office.com and click the SharePoint, create a website or find an exist website, input the Site address below',
         'zh-cn' => '登录office.com，点击Sharepoint，创建一个网站（或使用原有网站），然后将它的站点地址填在下方',
+        'zh-tw' => '登入office.com，點擊Sharepoint，建立一個網站（或使用原有網站），然後將它的站點地址填在下方',
     ],
     'InputSharepointSiteAddress' => [
         'en-us' => 'https://xxxxx.sharepoint.com/sites(teams)/{name}',
@@ -719,6 +843,7 @@ $constStr = [
     'TagFormatAlert' => [
         'en-us' => 'Tag must start with a letter, end with a letter or digit and can only contain lowercase letters, digits, and dashes， at least 2 letters!',
         'zh-cn' => '标签只能以字母开头，以字母或数字结尾，至少2位',
+        'zh-tw' => '標籤只能以字母開頭，以字母或數字結尾，至少2位',
         'ja' => 'タグは、文字で始まり、文字または数字で終わる必要があります。少なくとも2つ',
         'ko-kr' => '태그는 문자로 시작하고 문자 또는 숫자로 끝나야합니다 (2 이상).',
         'fa' => 'برچسب باید با یک حرف شروع شود، با یک حرف یا رقم پایان یابد و تنها می‌تواند حاوی حروف کوچک، ارقام و خط فاصله، حداقل ۲ حرف باشد!',
@@ -726,6 +851,7 @@ $constStr = [
     'ClickInstall' => [
         'en-us' => 'Click to install the project',
         'zh-cn' => '点击开始安装程序',
+        'zh-tw' => '點擊開始安裝程式',
         'ja' => 'クリックしてインストールプロセスを開始します',
         'ko-kr' => '설치 과정을 시작하려면 클릭',
         'fa' => 'برای نصب پروژه کلیک کنید',
@@ -733,6 +859,7 @@ $constStr = [
     'LogintoBind' => [
         'en-us' => 'then login and bind your onedrive in setup',
         'zh-cn' => '然后登录后在设置中绑定你的onedrive。',
+        'zh-tw' => '然後登入後在設定中綁定你的onedrive。',
         'ja' => '次に、ログインして、設定でonedriveをバインドします。',
         'ko-kr' => '그런 다음 로그인하여 onedrive를 설정에 바인딩하십시오.',
         'fa' => 'پس از آن وارد سیستم شوید و تنظیمات خود را در onedrive متصل کنید',
@@ -740,6 +867,7 @@ $constStr = [
     'MakesuerWriteable' => [
         'en-us' => 'Plase make sure the config.php is writeable. run writeable.sh.',
         'zh-cn' => '确认config.php可写。',
+        'zh-tw' => '確認config.php可寫。',
         'ja' => 'config.phpが書き込み可能であることを確認してください。',
         'ko-kr' => 'config.php가 쓰기 가능한지 확인하십시오.',
         'fa' => 'اطمینان حاصل کنید که config.php قابل نوشتن است. writeable.sh را اجرا کنید.',
@@ -747,6 +875,7 @@ $constStr = [
     'MakesuerRewriteOn' => [
         'en-us' => 'Plase make sure the RewriteEngine is On.',
         'zh-cn' => '确认重写（伪静态）功能启用。',
+        'zh-tw' => '確認重寫（偽靜態）功能啟用。',
         'ja' => '書き換え（擬似静的）機能が有効になっていることを確認します。',
         'ko-kr' => '다시 쓰기 (의사 정적) 기능이 활성화되어 있는지 확인하십시오.',
         'fa' => 'لطفاً مطمئن شوید که RewriteEngine روشن است.',
@@ -754,18 +883,22 @@ $constStr = [
     'CopyUrl' => [
         'en-us' => 'Copy URL',
         'zh-cn' => '复制链接',
+        'zh-tw' => '複製連結',
     ],
     'Success' => [
         'en-us' => 'Success',
         'zh-cn' => '成功',
+        'zh-tw' => '成功',
     ],
     'SetAdminPassword' => [
         'en-us' => 'Set Admin Password',
         'zh-cn' => '设置管理密码',
+        'zh-tw' => '設定管理密碼',
     ],
     'Refresh' => [
         'en-us' => 'Refresh',
         'zh-cn' => '刷新',
+        'zh-tw' => '重新整理',
         'ja' => 'リフレッシュ',
         'ko-kr' => '새로 고침',
         'fa' => 'رفرش',
@@ -773,6 +906,7 @@ $constStr = [
     'SelectLanguage' => [
         'en-us' => 'Select Language',
         'zh-cn' => '选择语言',
+        'zh-tw' => '選擇語言',
         'ja' => '言語を選択してください',
         'ko-kr' => '언어를 선택하십시오',
         'fa' => 'زبان را انتخاب کنید',
@@ -780,6 +914,7 @@ $constStr = [
     'RefreshCache' => [
         'en-us' => 'RefreshCache',
         'zh-cn' => '刷新缓存',
+        'zh-tw' => '重新整理快取',
         'ja' => 'キャッシュを再構築',
         'ko-kr' => '캐시 플러시',
         'fa' => 'رفرش cache',
@@ -787,9 +922,21 @@ $constStr = [
     'CannotOneKeyUpate' => [
         'en-us' => 'Can not update by a click! run update.sh',
         'zh-cn' => '不能一键更新，可以运行update.sh',
+        'zh-tw' => '不能一鍵更新，可以執行update.sh',
     ],
     'QueryBranchs' => [
         'en-us' => 'Query Branchs',
         'zh-cn' => '查询分支',
+        'zh-tw' => '查詢分支',
+    ],
+    'ONEMANAGER_CONFIG_SAVE_ENV' => [
+        'en-us' => 'Config save in Environments',
+        'zh-cn' => '配置保存在环境变量',
+        'zh-tw' => '配置儲存在環境變數',
+    ],
+    'ONEMANAGER_CONFIG_SAVE_FILE' => [
+        'en-us' => 'Config save in code file, may cause fee',
+        'zh-cn' => '配置保存在代码文件中，可能产生费用',
+        'zh-tw' => '配置儲存在程式碼文件中，可能產生費用',
     ],
 ];

glitch.json

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

index.php

@@ -6,11 +6,18 @@ include 'common.php';
 
 //echo '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
 if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
-    include 'platform/TencentSCF.php';
+    if (getenv('ONEMANAGER_CONFIG_SAVE')=='file') include 'platform/TencentSCF_file.php';
+    else include 'platform/TencentSCF_env.php';
 } elseif (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') {
     include 'platform/AliyunFC.php';
 } elseif ($_SERVER['_APP_SHARE_DIR']=='/var/share/CFF/processrouter') {
-    include 'platform/HuaweiFG.php';
+    //if (getenv('ONEMANAGER_CONFIG_SAVE')=='file') include 'platform/HuaweiFG_file.php';
+    //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';
     $path = getpath();
@@ -57,7 +64,7 @@ function main_handler($event, $context)
     return main($path);
 }
 
-// Aliyun FC & Huawei FG
+// Aliyun FC & Huawei FG & Baidu CFC
 function handler($event, $context)
 {
     if (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') {
@@ -66,7 +73,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(),
@@ -90,6 +97,9 @@ function handler($event, $context)
         // Huawei FG
         global $contextUserData;
         $contextUserData = $context;
+        if ($context->getUserData('ONEMANAGER_CONFIG_SAVE')=='file') include_once 'platform/HuaweiFG_file.php';
+        else include_once 'platform/HuaweiFG_env.php';
+
         $event = json_decode(json_encode($event), true);
         if ($event['isBase64Encoded']) $event['body'] = base64_decode($event['body']);
 
@@ -103,6 +113,27 @@ function handler($event, $context)
         $path = GetPathSetting($event, $context);
 
         return main($path);
+
+    } elseif ($_SERVER['BCE_CFC_RUNTIME_NAME']=='php7') {
+        // Baidu CFC
+        //$html = '<pre>'. json_encode($event, JSON_PRETTY_PRINT).'</pre>';
+        //$html .= '<pre>'. json_encode($context, JSON_PRETTY_PRINT).'</pre>';
+        //$html .= '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
+        //$html .= $event['path'];
+        //$html .= $context['functionBrn'];
+        //return json_encode(output($html), JSON_FORCE_OBJECT);
+
+        printInput($event, $context);
+        unset($_POST);
+        unset($_GET);
+        unset($_COOKIE);
+        unset($_SERVER);
+        GetGlobalVariable($event);
+        //echo '<pre>'. json_encode($_COOKIE, JSON_PRETTY_PRINT).'</pre>';
+        $path = GetPathSetting($event, $context);
+
+        return json_encode(main($path), JSON_FORCE_OBJECT);
+
     }
 }
 

platform/AliyunFC.php

@@ -2,8 +2,6 @@
     // https://help.aliyun.com/document_detail/53252.html
     // https://github.com/aliyun/fc-php-sdk/blob/master/src/AliyunFC/Client.php
 
-use AliyunFC\Client;
-
 function printInput($event, $context)
 {
     if (strlen(json_encode($event['body']))>500) $event['body']=substr($event['body'],0,strpos($event['body'],'base64')+30) . '...Too Long!...' . substr($event['body'],-50);
@@ -40,10 +38,14 @@ 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, '/');
+    $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($path)+1);
+    }
 
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
     $_SERVER['is_guestup_path'] = is_guestup_path($path);
@@ -61,11 +63,11 @@ function getConfig($str, $disktag = '')
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return equal_replace($env[$str],1);
+            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1);
+        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -83,7 +85,7 @@ function setConfig($arr, $disktag = '')
     $oparetdisk = 0;
     foreach ($arr as $k => $v) {
         if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -94,7 +96,7 @@ function setConfig($arr, $disktag = '')
             $tmp[$v] = '';
             $oparetdisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
             else $tmp[$k] = $v;
         }
     }
@@ -121,7 +123,12 @@ function install()
     global $constStr;
     if ($_GET['install2']) {
         $tmp['admin'] = $_POST['admin'];
-        setConfig($tmp);
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
         if (needUpdate()) {
             OnekeyUpate();
             return message('update to github version, reinstall.
@@ -155,7 +162,7 @@ function install()
                 $AccessKeySecret = $_POST['AccessKeySecret'];
                 $tmp['AccessKeySecret'] = $AccessKeySecret;
             }
-            $response = SetbaseConfig($tmp, $_SERVER['accountId'], $_SERVER['region'], $_SERVER['service_name'], $_SERVER['function_name'], $AccessKeyID, $AccessKeySecret);
+            $response = setConfigResponse( SetbaseConfig($tmp, $_SERVER['accountId'], $_SERVER['region'], $_SERVER['service_name'], $_SERVER['function_name'], $AccessKeyID, $AccessKeySecret) );
             if (api_error($response)) {
                 $html = api_error_msg($response);
                 $title = 'Error';
@@ -234,26 +241,71 @@ language:<br>';
     return message($html, $title, 201);
 }
 
-function getfunctioninfo($accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)
+function FCAPI2016($config, $Method, $data = '')
 {
-    $fcClient = new Client([
-        "endpoint" => 'https://'.$accountId.'.'.$region.'.fc.aliyuncs.com',
-        "accessKeyID" => $AccessKeyID,
-        "accessKeySecret" => $AccessKeySecret
-    ]);
-    return $fcClient->getFunction($service_name, $function_name);
+    $accountId = $config['accountId'];
+    $region = $config['region'];
+    $service_name = $config['service_name'];
+    $function_name = $config['function_name'];
+    $AccessKeyID = $config['AccessKeyID'];
+    $AccessKeySecret = $config['AccessKeySecret'];
+
+    $host = $accountId . '.' . $region . '-internal.fc.aliyuncs.com';
+    $path = '/2016-08-15/services/' . $service_name . '/functions/' . $function_name;
+    $url = 'https://' . $host . $path;
+
+    $ContentMd5 = '';
+    $ContentType = 'application/json';
+    date_default_timezone_set('UTC'); // unset last timezone setting
+    $Date = substr(gmdate("r", time()), 0, -5) . 'GMT';
+    $CanonicalizedFCHeaders = '';
+    $CanonicalizedResource = $path;
+
+    $signaturestr = $Method . "\n" . $ContentMd5 . "\n" . $ContentType . "\n" . $Date . "\n" . $CanonicalizedFCHeaders . $CanonicalizedResource;
+    $signature = base64_encode(hash_hmac('sha256', $signaturestr, $AccessKeySecret, true));
+
+    $header['Host'] = $host;
+    $header['Date'] = $Date;
+    $header['Content-Type'] = $ContentType;
+    $header['Authorization'] = 'FC ' . $AccessKeyID . ':' . $signature;
+    $header['Content-Length'] = strlen($data);
+
+    //return curl($Method, $url, $data, $header)['body'];
+    $p = 0;
+    while ($response['stat']==0 && $p<3) {
+        $response = curl($Method, $url, $data, $header);
+        $p++;
+    }
+
+    if ($response['stat']==0) {
+        $tmp['ErrorCode'] = 'Network Error';
+        $tmp['ErrorMessage'] = 'Can not connect ' . $host;
+        return json_encode($tmp);
+    }
+    if ($response['stat']!=200) {
+        $tmp = json_decode($response['body'], true);
+        $tmp['ErrorMessage'] .= '<br>' . $response['stat'] . '<br>' . $signaturestr . '<br>' . json_encode($header) . PHP_EOL;
+        return json_encode($tmp);
+    }
+    return $response['body'];
+}
+
+function getfunctioninfo($config)
+{
+    return FCAPI2016($config, 'GET');
 }
 
 function updateEnvironment($Envs, $accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)
 {
     //print_r($Envs);
-    $fcClient = new Client([
-        "endpoint" => 'https://'.$accountId.'.'.$region.'.fc.aliyuncs.com',
-        "accessKeyID" => $AccessKeyID,
-        "accessKeySecret" => $AccessKeySecret
-    ]);
-    $tmp = $fcClient->getFunction($service_name, $function_name)['data'];
-    //$tmp = getfunctioninfo($accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)['data'];
+    $config['accountId'] = $accountId;
+    $config['region'] = $region;
+    $config['service_name'] = $service_name;
+    $config['function_name'] = $function_name;
+    $config['AccessKeyID'] = $AccessKeyID;
+    $config['AccessKeySecret'] = $AccessKeySecret;
+
+    $tmp = json_decode(getfunctioninfo($config), true);
     foreach ($tmp['environmentVariables'] as $key => $value ) {
         $tmp_env[$key] = $value;
     }
@@ -263,27 +315,20 @@ function updateEnvironment($Envs, $accountId, $region, $service_name, $function_
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
     ksort($tmp_env);
 
-    $tmpdata['functionName'] = $tmp['functionName'];
-    $tmpdata['description'] = $tmp['description'];
-    $tmpdata['memorySize'] = $tmp['memorySize'];
-    $tmpdata['timeout'] = $tmp['timeout'];
-    $tmpdata['runtime'] = $tmp['runtime'];
-    $tmpdata['handler'] = $tmp['handler'];
     $tmpdata['environmentVariables'] = $tmp_env;
-    $tmpdata['code']['zipFile'] = base64_encode( file_get_contents($fcClient->getFunctionCode($service_name, $function_name)['data']['url']) );
-    return $fcClient->updateFunction($service_name, $function_name, $tmpdata);
+    return FCAPI2016($config, 'PUT', json_encode($tmpdata));
 }
 
 function SetbaseConfig($Envs, $accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)
 {
-    //echo json_encode($Envs,JSON_PRETTY_PRINT);
-    $fcClient = new Client([
-        "endpoint" => 'https://'.$accountId.'.'.$region.'.fc.aliyuncs.com',
-        "accessKeyID" => $AccessKeyID,
-        "accessKeySecret" => $AccessKeySecret
-    ]);
-    $tmp = $fcClient->getFunction($service_name, $function_name)['data'];
-    // $tmp = getfunctioninfo($accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)['data'];
+    $config['accountId'] = $accountId;
+    $config['region'] = $region;
+    $config['service_name'] = $service_name;
+    $config['function_name'] = $function_name;
+    $config['AccessKeyID'] = $AccessKeyID;
+    $config['AccessKeySecret'] = $AccessKeySecret;
+
+    $tmp = json_decode(getfunctioninfo($config), true);
     foreach ($tmp['environmentVariables'] as $key => $value ) {
         $tmp_env[$key] = $value;
     }
@@ -293,59 +338,51 @@ function SetbaseConfig($Envs, $accountId, $region, $service_name, $function_name
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
     ksort($tmp_env);
 
-    $tmpdata['functionName'] = $function_name;
-    $tmpdata['description'] = 'Onedrive index and manager in Ali FC.';
+    $tmpdata['description'] = 'Onedrive index and manager in Aliyun FC.';
     $tmpdata['memorySize'] = 128;
     $tmpdata['timeout'] = 30;
-    $tmpdata['runtime'] = 'php7.2';
-    $tmpdata['handler'] = 'index.handler';
     $tmpdata['environmentVariables'] = $tmp_env;
-    $tmpdata['code']['zipFile'] = base64_encode( file_get_contents($fcClient->getFunctionCode($service_name, $function_name)['data']['url']) );
-    return $fcClient->updateFunction($service_name, $function_name, $tmpdata);
+
+    return FCAPI2016($config, 'PUT', json_encode($tmpdata));
 }
 
 function updateProgram($accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret, $source)
 {
-    //WaitSCFStat();
-    $fcClient = new Client([
-        "endpoint" => 'https://'.$accountId.'.'.$region.'.fc.aliyuncs.com',
-        "accessKeyID" => $AccessKeyID,
-        "accessKeySecret" => $AccessKeySecret
-    ]);
-    $tmp = $fcClient->getFunction($service_name, $function_name)['data'];
-    //$tmp = getfunctioninfo($accountId, $region, $service_name, $function_name, $AccessKeyID, $AccessKeySecret)['data'];
+    $config['accountId'] = $accountId;
+    $config['region'] = $region;
+    $config['service_name'] = $service_name;
+    $config['function_name'] = $function_name;
+    $config['AccessKeyID'] = $AccessKeyID;
+    $config['AccessKeySecret'] = $AccessKeySecret;
+
+    $tmp = json_decode(getfunctioninfo($config), true);
 
-    $tmpdata['functionName'] = $tmp['functionName'];
-    $tmpdata['description'] = $tmp['description'];
-    $tmpdata['memorySize'] = $tmp['memorySize'];
-    $tmpdata['timeout'] = $tmp['timeout'];
-    $tmpdata['runtime'] = $tmp['runtime'];
-    $tmpdata['handler'] = $tmp['handler'];
-    $tmpdata['environmentVariables'] = $tmp['environmentVariables'];
     $tmpdata['code']['zipFile'] = base64_encode( file_get_contents($source) );
 
-    return $fcClient->updateFunction($service_name, $function_name, $tmpdata);
+    return FCAPI2016($config, 'PUT', json_encode($tmpdata));
 }
 
 function api_error($response)
 {
-    return !isset($response['data']);
+    return isset($response['ErrorMessage']);
 }
 
 function api_error_msg($response)
 {
-    return $response;
-    return $response['Error']['Code'] . '<br>
-' . $response['Error']['Message'] . '<br><br>
+    return $response['ErrorCode'] . '<br>
+' . $response['ErrorMessage'] . '<br><br>
+
+accountId:' . $_SERVER['accountId'] . '<br>
+region:' . $_SERVER['region'] . '<br>
+service_name:' . $_SERVER['service_name'] . '<br>
 function_name:' . $_SERVER['function_name'] . '<br>
-Region:' . $_SERVER['Region'] . '<br>
-namespace:' . $_SERVER['namespace'] . '<br>
+
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
 }
 
 function setConfigResponse($response)
 {
-    return $response;
+    return json_decode($response, true);
 }
 
 function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')

platform/BaiduCFC.php

@@ -0,0 +1,407 @@
+<?php
+
+function printInput($event, $context)
+{
+    if (strlen(json_encode($event['body']))>500) $event['body']=substr($event['body'],0,strpos($event['body'],'base64')+30) . '...Too Long!...' . substr($event['body'],-50);
+    echo urldecode(json_encode($event, JSON_PRETTY_PRINT)) . '
+ 
+' . urldecode(json_encode($context, JSON_PRETTY_PRINT)) . '
+ 
+';
+}
+
+function GetGlobalVariable($event)
+{
+    $_GET = $event['queryStringParameters'];
+    foreach ($_GET as $k => $v) {
+        if ($v == '') $_GET[$k] = true;
+    }
+    $postbody = explode("&",$event['body']);
+    foreach ($postbody as $postvalues) {
+        $pos = strpos($postvalues,"=");
+        $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1));
+    }
+    $cookiebody = explode("; ",$event['headers']['Cookie']);
+    foreach ($cookiebody as $cookievalues) {
+        $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)
+{
+    $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['Accept-Language'],';')[0],',')[0]);
+    $_SERVER['functionBrn'] = $context['functionBrn'];
+    $_SERVER['base_path'] = '/';
+    $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['REMOTE_ADDR'] = $event['requestContext']['sourceIp'];
+    $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['X-Requested-With'];
+    return $path;
+}
+
+function getConfig($str, $disktag = '')
+{
+    global $InnerEnv;
+    global $Base64Env;
+    if (in_array($str, $InnerEnv)) {
+        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]);
+            else return $env[$str];
+        }
+    } else {
+        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
+        else return getenv($str);
+    }
+    return '';
+}
+
+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;
+    foreach ($arr as $k => $v) {
+        if (in_array($k, $InnerEnv)) {
+            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+            else $diskconfig[$k] = $v;
+            $indisk = 1;
+        } elseif ($k=='disktag_add') {
+            array_push($disktags, $v);
+            $oparetdisk = 1;
+        } elseif ($k=='disktag_del') {
+            $disktags = array_diff($disktags, [ $v ]);
+            $tmp[$v] = '';
+            $oparetdisk = 1;
+        } else {
+            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        }
+    }
+    if ($indisk) {
+        $diskconfig = array_filter($diskconfig, 'array_value_isnot_null');
+        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'] = '';
+    }
+//    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
+//';
+    $response = updateEnvironment($tmp, getConfig('SecretId'), getConfig('SecretKey'));
+    return $response;
+}
+
+function install()
+{
+    global $constStr;
+    if ($_GET['install2']) {
+        $tmp['admin'] = $_POST['admin'];
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
+        if (needUpdate()) {
+            OnekeyUpate();
+            return message('update to github version, reinstall.
+        <script>
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=; path=/; \'+expires;
+        </script>
+        <meta http-equiv="refresh" content="3;URL=' . $url . '">', 'Program updating', 201);
+        }
+        return output('Jump
+    <script>
+        var expd = new Date();
+        expd.setTime(expd.getTime()+(2*60*60*1000));
+        var expires = "expires="+expd.toGMTString();
+        document.cookie=\'language=; path=/; \'+expires;
+    </script>
+    <meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+    }
+    if ($_GET['install1']) {
+        $tmp['timezone'] = $_COOKIE['timezone'];
+        $SecretId = getConfig('SecretId');
+        if ($SecretId=='') {
+            $SecretId = $_POST['SecretId'];
+            $tmp['SecretId'] = $SecretId;
+        }
+        $SecretKey = getConfig('SecretKey');
+        if ($SecretKey=='') {
+            $SecretKey = $_POST['SecretKey'];
+            $tmp['SecretKey'] = $SecretKey;
+        }
+        $response = setConfigResponse(SetbaseConfig($tmp, $SecretId, $SecretKey));
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        } else {
+            $html .= '
+    <form action="?install2" method="post" onsubmit="return notnull(this);">
+        <label>'.getconstStr('SetAdminPassword').':<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
+        <input type="submit" value="'.getconstStr('Submit').'">
+    </form>
+    <script>
+        function notnull(t)
+        {
+            if (t.admin.value==\'\') {
+                alert(\''.getconstStr('SetAdminPassword').'\');
+                return false;
+            }
+            return true;
+        }
+    </script>';
+            $title = getconstStr('SetAdminPassword');
+            return message($html, $title, 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('SecretId')==''||getConfig('SecretKey')=='') $html .= '
+        <a href="https://console.bce.baidu.com/iam/#/iam/accesslist" target="_blank">'.getconstStr('Create').' Access Key & Secret Key</a><br>
+        <label>Access Key:<input name="SecretId" type="text" placeholder="" size=""></label><br>
+        <label>Secret Key:<input name="SecretKey" type="text" placeholder="" size=""></label><br>';
+        $html .= '
+        <input type="submit" value="'.getconstStr('Submit').'">
+    </form>
+    <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;
+        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 (getConfig('SecretId')==''||getConfig('SecretKey')=='') $html .= '
+            if (t.SecretId.value==\'\') {
+                alert(\'input Access Key\');
+                return false;
+            }
+            if (t.SecretKey.value==\'\') {
+                alert(\'input Secret Key\');
+                return false;
+            }';
+        $html .= '
+            return true;
+        }
+    </script>';
+        $title = getconstStr('SelectLanguage');
+        return message($html, $title, 201);
+    }
+    $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
+    $title = 'Error';
+    return message($html, $title, 201);
+}
+
+function CFCAPIv1($Brn, $AccessKey, $SecretKey, $Method, $End, $data = '')
+{
+    // brn:bce:cfc:bj:c094b1ca1XXXXXXXXb8dea6ab482:function:fdsa:$LATEST
+    $BRN = explode(':', $Brn);
+    if ( !($BRN[0]=='brn' && $BRN[1]=='bce' && $BRN[2]=='cfc') ) {
+        $tmp['code'] = 'BRN Error';
+        $tmp['message'] = 'The BRN expect start with "brn:bce:cfc:", given: ' . $Brn . ' .';
+        return json_encode($tmp);
+    }
+    $Region = $BRN[3];
+    //$project_id = $BRN[4];
+    $FunctionName = $BRN[6];
+    $host = 'cfc.' . $Region . '.baidubce.com';
+    date_default_timezone_set('UTC'); // unset last timezone setting
+    $timestamp = date('Y-m-d\TH:i:s\Z');
+    //date_default_timezone_set(get_timezone($_SERVER['timezone']));
+    $authStringPrefix = 'bce-auth-v1/' . $AccessKey . '/' . $timestamp . '/1800' ;
+    $path = '/v1/functions/' . $FunctionName . '/' . $End;
+    $CanonicalURI = spurlencode($path, '/');
+    $CanonicalQueryString = '';
+    $CanonicalHeaders = 'host:' . $host;
+    $CanonicalRequest = $Method . "\n" . $CanonicalURI . "\n" . $CanonicalQueryString . "\n" . $CanonicalHeaders;
+    $SigningKey = hash_hmac('sha256', $authStringPrefix, $SecretKey);
+    $Signature = hash_hmac('sha256', $CanonicalRequest, $SigningKey);
+    $authorization = $authStringPrefix . '/host/' . $Signature;
+
+    $p = 0;
+    while ($response['stat']==0 && $p<3) {
+        $response = curl(
+            $Method,
+            'https://' . $host . $path,
+            $data,
+            [
+                'Authorization' => $authorization,
+                'Content-type' => 'application/json'
+            ]
+        );
+        $p++;
+    }
+
+    if ($response['stat']==0) {
+        $tmp['code'] = 'Network Error';
+        $tmp['message'] = 'Can not connect ' . $host;
+        return json_encode($tmp);
+    }
+    if ($response['stat']!=200) {
+        $tmp = json_decode($response['body'], true);
+        $tmp['message'] .= '<br>' . $response['stat'] . '<br>' . $timestamp . PHP_EOL;
+        return json_encode($tmp);
+    }
+    return $response['body'];
+}
+
+function getfunctioninfo($SecretId, $SecretKey)
+{
+    return CFCAPIv1($_SERVER['functionBrn'], $SecretId, $SecretKey, 'GET', 'configuration');
+}
+
+function updateEnvironment($Envs, $SecretId, $SecretKey)
+{
+    $FunctionConfig = json_decode(getfunctioninfo($SecretId, $SecretKey), true);
+    $tmp_env = $FunctionConfig['Environment']['Variables'];
+    foreach ($Envs as $key1 => $value1) {
+        $tmp_env[$key1] = $value1;
+    }
+    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
+    ksort($tmp_env);
+
+    $tmp['Environment']['Variables'] = $tmp_env;
+    $data = json_encode($tmp);
+
+    return CFCAPIv1($_SERVER['functionBrn'], $SecretId, $SecretKey, 'PUT', 'configuration', $data);
+}
+
+function SetbaseConfig($Envs, $SecretId, $SecretKey)
+{
+    $FunctionConfig = json_decode(getfunctioninfo($SecretId, $SecretKey), true);
+    $tmp_env = $FunctionConfig['Environment']['Variables'];
+    foreach ($Envs as $key1 => $value1) {
+        $tmp_env[$key1] = $value1;
+    }
+    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
+    ksort($tmp_env);
+
+    $tmp['Timeout'] = 30;
+    $tmp['Description'] = 'Onedrive index and manager in Baidu CFC.';
+    $tmp['Environment']['Variables'] = $tmp_env;
+    $data = json_encode($tmp);
+
+    return CFCAPIv1($_SERVER['functionBrn'], $SecretId, $SecretKey, 'PUT', 'configuration', $data);
+}
+
+function updateProgram($SecretId, $SecretKey, $source)
+{
+    $tmp['ZipFile'] = base64_encode( file_get_contents($source) );
+    $data = json_encode($tmp);
+    return CFCAPIv1($_SERVER['functionBrn'], $SecretId, $SecretKey, 'PUT', 'code', $data);
+}
+
+function api_error($response)
+{
+    //return isset($response['code']);
+    return !(isset($response['FunctionBrn']) && $response['FunctionBrn'] == $_SERVER['functionBrn']);
+}
+
+function api_error_msg($response)
+{
+    if (isset($response['code'])) $html = $response['code'] . '<br>
+' . $response['message'];
+    else $html = var_dump($response);
+    return $html . '<br><br>
+BRN: ' . $_SERVER['functionBrn'] . '<br>
+<button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
+}
+
+function setConfigResponse($response)
+{
+    //return $response;
+    return json_decode( $response, true );
+}
+
+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 . '/config.php', file_get_contents(__DIR__.'/../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(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/Heroku.php

@@ -46,11 +46,11 @@ function getConfig($str, $disktag = '')
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return equal_replace($env[$str],1);
+            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
             else return $env[$str];
 	}
     } else {
-	if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1);
+	if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -68,7 +68,7 @@ function setConfig($arr, $disktag = '')
     $oparetdisk = 0;
     foreach ($arr as $k => $v) {
         if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -79,7 +79,7 @@ function setConfig($arr, $disktag = '')
             $tmp[$v] = '';
             $oparetdisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
             else $tmp[$k] = $v;
         }
     }

platform/HuaweiFG_env.php

@@ -0,0 +1,464 @@
+<?php
+global $contextUserData;
+
+function printInput($event, $context)
+{
+    $tmp['eventID'] = $context->geteventID();
+    $tmp['RemainingTimeInMilliSeconds'] = $context->getRemainingTimeInMilliSeconds();
+    $tmp['AccessKey'] = $context->getAccessKey();
+    $tmp['SecretKey'] = $context->getSecretKey();
+    $tmp['UserData']['HW_urn'] = $context->getUserData('HW_urn');
+    $tmp['FunctionName'] = $context->getFunctionName();
+    $tmp['RunningTimeInSeconds'] = $context->getRunningTimeInSeconds();
+    $tmp['Version'] = $context->getVersion();
+    $tmp['MemorySize'] = $context->getMemorySize();
+    $tmp['CPUNumber'] = $context->getCPUNumber();
+    $tmp['ProjectID'] = $context->getProjectID();
+    $tmp['Package'] = $context->Package();
+    $tmp['Token'] = $context->getToken();
+    $tmp['Logger'] = $context->getLogger();
+
+    if (strlen(json_encode($event['body']))>500) $event['body']=substr($event['body'],0,strpos($event['body'],'base64')+30) . '...Too Long!...' . substr($event['body'],-50);
+    echo urldecode(json_encode($event, JSON_PRETTY_PRINT)) . '
+ 
+' . urldecode(json_encode($tmp, JSON_PRETTY_PRINT)) . '
+ 
+';
+}
+
+function GetGlobalVariable($event)
+{
+    $_GET = $event['queryStringParameters'];
+    $postbody = explode("&",$event['body']);
+    foreach ($postbody as $postvalues) {
+        $pos = strpos($postvalues,"=");
+        $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1));
+    }
+    $cookiebody = explode("; ",$event['headers']['cookie']);
+    foreach ($cookiebody as $cookievalues) {
+        $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)
+{
+    $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['accept-language'],';')[0],',')[0]);
+    $_SERVER['function_name'] = $context->getFunctionName();
+    $_SERVER['ProjectID'] = $context->getProjectID();
+    $host_name = $event['headers']['host'];
+    $_SERVER['HTTP_HOST'] = $host_name;
+    $path = path_format($event['pathParameters'][''].'/');
+    $_SERVER['base_path'] = path_format($event['path'].'/');
+    if (  $_SERVER['base_path'] == $path ) {
+        $_SERVER['base_path'] = '/';
+    } else {
+        $_SERVER['base_path'] = substr($_SERVER['base_path'], 0, -strlen($path));
+        if ($_SERVER['base_path']=='') $_SERVER['base_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['REMOTE_ADDR'] = $event['headers']['x-real-ip'];
+    $_SERVER['HTTP_X_REQUESTED_WITH'] = $event['headers']['x-requested-with'];
+    return $path;
+}
+
+function getConfig($str, $disktag = '')
+{
+    global $InnerEnv;
+    global $Base64Env;
+    global $contextUserData;
+    if (in_array($str, $InnerEnv)) {
+        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]);
+            else return $env[$str];
+        }
+    } else {
+        if (in_array($str, $Base64Env)) return base64y_decode($contextUserData->getUserData($str));
+        else return $contextUserData->getUserData($str);
+    }
+    return '';
+}
+
+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;
+    foreach ($arr as $k => $v) {
+        if (in_array($k, $InnerEnv)) {
+            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
+            else $diskconfig[$k] = $v;
+            $indisk = 1;
+        } elseif ($k=='disktag_add') {
+            array_push($disktags, $v);
+            $oparetdisk = 1;
+        } elseif ($k=='disktag_del') {
+            $disktags = array_diff($disktags, [ $v ]);
+            $tmp[$v] = '';
+            $oparetdisk = 1;
+        } else {
+            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
+            else $tmp[$k] = $v;
+        }
+    }
+    if ($indisk) {
+        $diskconfig = array_filter($diskconfig, 'array_value_isnot_null');
+        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'] = '';
+    }
+//    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
+//';
+    $response = updateEnvironment($tmp, getConfig('HW_urn'), getConfig('HW_key'), getConfig('HW_secret'));
+    return $response;
+}
+
+function install()
+{
+    global $constStr;
+    global $contextUserData;
+    if ($_GET['install2']) {
+        $tmp['admin'] = $_POST['admin'];
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
+        if (needUpdate()) {
+            OnekeyUpate();
+            return message('update to github version, reinstall.
+        <script>
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=; path=/; \'+expires;
+        </script>
+        <meta http-equiv="refresh" content="3;URL=' . $url . '">', 'Program updating', 201);
+        }
+        return output('Jump
+        <script>
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=; path=/; \'+expires;
+        </script>
+        <meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+    }
+    if ($_GET['install1']) {
+        //if ($_POST['admin']!='') {
+            $tmp['timezone'] = $_COOKIE['timezone'];
+            $tmp['HW_urn'] = getConfig('HW_urn');
+            if ($tmp['HW_urn']=='') {
+                $tmp['HW_urn'] = $_POST['HW_urn'];
+            }
+            $tmp['HW_key'] = getConfig('HW_key');
+            if ($tmp['HW_key']=='') {
+                $tmp['HW_key'] = $_POST['HW_key'];
+            }
+            $tmp['HW_secret'] = getConfig('HW_secret');
+            if ($tmp['HW_secret']=='') {
+                $tmp['HW_secret'] = $_POST['HW_secret'];
+            }
+            $tmp['ONEMANAGER_CONFIG_SAVE'] = $_POST['ONEMANAGER_CONFIG_SAVE'];
+            //$response = json_decode(SetbaseConfig($tmp, $HW_urn, $HW_name, $HW_pwd), true)['Response'];
+            $response = setConfigResponse( SetbaseConfig($tmp, $tmp['HW_urn'], $tmp['HW_key'], $tmp['HW_secret']) );
+            if (api_error($response)) {
+                $html = api_error_msg($response);
+                $title = 'Error';
+                return message($html, $title, 201);
+            } else {
+                if ($tmp['ONEMANAGER_CONFIG_SAVE'] == 'file') {
+                    $html = getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '<br><a href="' . $_SERVER['base_path'] . '">' . getconstStr('Home') . '</a>';
+                    $title = 'Reinstall';
+                    return message($html, $title, 201);
+                }
+                $html .= '
+    <form action="?install2" method="post" onsubmit="return notnull(this);">
+        <label>'.getconstStr('SetAdminPassword').':<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
+        <input type="submit" value="'.getconstStr('Submit').'">
+    </form>
+    <script>
+        function notnull(t)
+        {
+            if (t.admin.value==\'\') {
+                alert(\''.getconstStr('SetAdminPassword').'\');
+                return false;
+            }
+            return true;
+        }
+    </script>';
+                $title = getconstStr('SetAdminPassword');
+                return message($html, $title, 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('HW_urn')==''||getConfig('HW_key')==''||getConfig('HW_secret')=='') $html .= '
+        在函数代码操作页上方找到URN，鼠标放上去后显示URN，复制填入：<br>
+        <label>URN:<input name="HW_urn" type="text" placeholder="" size=""></label><br>
+        <a href="https://console.huaweicloud.com/iam/#/mine/accessKey" target="_blank">点击链接</a>，新增访问密钥，
+        在下载的credentials.csv文件中找到对应信息，填入：<br>
+        <label>Access Key Id:<input name="HW_key" type="text" placeholder="" size=""></label><br>
+        <label>Secret Access Key:<input name="HW_secret" type="text" placeholder="" size=""></label><br>';
+        $html .= '
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="" ' . ('file'==$contextUserData->getUserData('ONEMANAGER_CONFIG_SAVE')?'':'checked') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '</label><br>
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="file" ' . ('file'==$contextUserData->getUserData('ONEMANAGER_CONFIG_SAVE')?'checked':'') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '</label><br>';
+        $html .= '
+        <input type="submit" value="'.getconstStr('Submit').'">
+    </form>
+    <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;
+        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 (getConfig('HW_urn')==''||getConfig('HW_key')==''||getConfig('HW_secret')=='') $html .= '
+            if (t.HW_urn.value==\'\') {
+                alert(\'input URN\');
+                return false;
+            }
+            if (t.HW_key.value==\'\') {
+                alert(\'input name\');
+                return false;
+            }
+            if (t.HW_secret.value==\'\') {
+                alert(\'input pwd\');
+                return false;
+            }';
+        $html .= '
+            return true;
+        }
+    </script>';
+        $title = getconstStr('SelectLanguage');
+        return message($html, $title, 201);
+    }
+    $html .= '<a href="?install0">'.getconstStr('ClickInstall').'</a>, '.getconstStr('LogintoBind');
+    $title = 'Error';
+    return message($html, $title, 201);
+}
+
+function FGAPIV2($HW_urn, $HW_key, $HW_secret, $Method, $End, $data = '')
+{
+    if ($HW_urn==''||$HW_key==''||$HW_secret=='') {
+        $tmp['error_code'] = 'Config Error';
+        $tmp['error_msg'] = 'HW urn or access key id or secret is empty.';
+        return json_encode($tmp);
+    }
+
+    $URN = explode(':', $HW_urn);
+    $Region = $URN[2];
+    $project_id = $URN[3];
+
+    $host = 'functiongraph.' . $Region . '.myhuaweicloud.com';
+    $path = '/v2/' . $project_id . '/fgs/functions/' . $HW_urn . '/' . $End;
+    $url = 'https://' . $host . $path;
+    $CanonicalURI = spurlencode($path, '/') . '/';
+    $CanonicalQueryString = '';
+
+    date_default_timezone_set('UTC'); // unset last timezone setting
+    $timestamp = date('Ymd\THis\Z');
+    $header['X-Sdk-Date'] = $timestamp;
+    $header['Host'] = $host;
+    $header['Content-Type'] = 'application/json;charset=utf8';
+    ksort($header);
+    $CanonicalHeaders = '';
+    $SignedHeaders = '';
+    foreach ($header as $key => $value) {
+        $CanonicalHeaders .= strtolower($key) . ':' . $value . "\n";
+        $SignedHeaders .= strtolower($key) . ';';
+    }
+    $SignedHeaders = substr($SignedHeaders, 0, -1);
+    $Hashedbody = hash("sha256", $data);
+    $CanonicalRequest = $Method . "\n" . $CanonicalURI . "\n" . $CanonicalQueryString . "\n" . $CanonicalHeaders . "\n" . $SignedHeaders . "\n" . $Hashedbody;
+    $HashedCanonicalRequest = hash("sha256", $CanonicalRequest);
+    $Algorithm = 'SDK-HMAC-SHA256';
+    $StringToSign = $Algorithm . "\n" . $timestamp . "\n" . $HashedCanonicalRequest;
+    $signature = hash_hmac("sha256", $StringToSign, $HW_secret);
+    $Authorization = "$Algorithm Access=$HW_key, SignedHeaders=$SignedHeaders, Signature=$signature";
+    $header['Authorization'] = $Authorization;
+
+    //return curl($Method, $url, $data, $header)['body']; // . $CanonicalRequest;
+    $p = 0;
+    while ($response['stat']==0 && $p<3) {
+        $response = curl($Method, $url, $data, $header);
+        $p++;
+    }
+
+    if ($response['stat']==0) {
+        $tmp['error_code'] = 'Network Error';
+        $tmp['error_msg'] = 'Can not connect ' . $host;
+        return json_encode($tmp);
+    }
+    if ($response['stat']!=200) {
+        $tmp = json_decode($response['body'], true);
+        $tmp['error_code'] .= '.';
+        $tmp['error_msg'] .= '<br>' . $response['stat'] . '<br>' . $CanonicalRequest . '<br>' . json_encode($header) . PHP_EOL;
+        return json_encode($tmp);
+    }
+    return $response['body'];
+}
+
+function getfunctioninfo($HW_urn, $HW_key, $HW_secret)
+{
+    return FGAPIV2($HW_urn, $HW_key, $HW_secret, 'GET', 'config');
+}
+
+function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
+{
+    //echo json_encode($Envs,JSON_PRETTY_PRINT);
+    global $contextUserData;
+    $tmp_env = json_decode(json_decode(getfunctioninfo($HW_urn, $HW_key, $HW_secret),true)['user_data'],true);
+    foreach ($Envs as $key1 => $value1) {
+        $tmp_env[$key1] = $value1;
+    }
+    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
+    ksort($tmp_env);
+
+    $tmpdata['handler'] = 'index.handler';
+    $tmpdata['memory_size'] = $contextUserData->getMemorySize()+1-1;
+    $tmpdata['runtime'] = 'PHP7.3';
+    $tmpdata['timeout'] = $contextUserData->getRunningTimeInSeconds()+1-1;
+    $tmpdata['user_data'] = json_encode($tmp_env);
+
+    return FGAPIV2($HW_urn, $HW_key, $HW_secret, 'PUT', 'config', json_encode($tmpdata));
+}
+
+function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
+{
+    //echo json_encode($Envs,JSON_PRETTY_PRINT);
+    if ($Envs['ONEMANAGER_CONFIG_SAVE'] == 'file') $Envs = Array( 'ONEMANAGER_CONFIG_SAVE' => 'file' );
+    $tmp_env = json_decode(json_decode(getfunctioninfo($HW_urn, $HW_key, $HW_secret),true)['user_data'],true);
+    foreach ($Envs as $key1 => $value1) {
+        $tmp_env[$key1] = $value1;
+    }
+    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
+    ksort($tmp_env);
+
+    $tmpdata['handler'] = 'index.handler';
+    $tmpdata['memory_size'] = 128;
+    $tmpdata['runtime'] = 'PHP7.3';
+    $tmpdata['timeout'] = 30;
+    $tmpdata['description'] = 'Onedrive index and manager in Huawei FG.';
+    $tmpdata['user_data'] = json_encode($tmp_env);
+
+    return FGAPIV2($HW_urn, $HW_key, $HW_secret, 'PUT', 'config', json_encode($tmpdata));
+}
+
+function updateProgram($HW_urn, $HW_key, $HW_secret, $source)
+{
+    $tmpdata['code_type'] = 'zip';
+    $tmpdata['func_code']['file'] = base64_encode( file_get_contents($source) );
+
+    return FGAPIV2($HW_urn, $HW_key, $HW_secret, 'PUT', 'code', json_encode($tmpdata));
+}
+
+function api_error($response)
+{
+    return isset($response['error_msg']);
+}
+
+function api_error_msg($response)
+{
+    return $response['error_code'] . '<br>
+' . $response['error_msg'] . '<br>
+request_id: ' . $response['request_id'] . '<br><br>
+function_name: ' . $_SERVER['function_name'] . '<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')
+{
+    $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($outPath);
+    $name = $auth.'-'.$project;
+    foreach ($tmp as $f) {
+        if ( substr($f, 0, strlen($name)) == $name) {
+            $outPath .= $f;
+            break;
+        }
+    }
+
+    // 将目录中文件打包成zip
+    //$zip=new ZipArchive();
+    $zip=new PharData($source);
+    //if($zip->open($source, ZipArchive::CREATE)){
+        addFileToZip($zip, $outPath); //调用方法，对要打包的根目录进行操作，并将ZipArchive的对象传递给方法
+    //    $zip->close(); //关闭处理的zip文件
+    //}
+
+    return updateProgram(getConfig('HW_urn'), getConfig('HW_key'), getConfig('HW_secret'), $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/HuaweiFG_file.php

@@ -71,17 +71,24 @@ function getConfig($str, $disktag = '')
 {
     global $InnerEnv;
     global $Base64Env;
-    global $contextUserData;
+    //include 'config.php';
+    $s = file_get_contents(__DIR__ . '/../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 ($disktag=='') $disktag = $_SERVER['disktag'];
-        $env = json_decode($contextUserData->getUserData($disktag), true);
-        if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return equal_replace($env[$str],1);
-            else return $env[$str];
+            if (isset($envs[$disktag][$str])) {
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
+                else return $envs[$disktag][$str];
             }
         } else {
-        if (in_array($str, $Base64Env)) return equal_replace($contextUserData->getUserData($str),1);
-        else return $contextUserData->getUserData($str);
+            if (isset($envs[$str])) {
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
+                else return $envs[$str];
+            }
+        }
     }
     return '';
 }
@@ -90,61 +97,62 @@ function setConfig($arr, $disktag = '')
 {
     global $InnerEnv;
     global $Base64Env;
-    global $contextUserData;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
+    //include 'config.php';
+    $s = file_get_contents(__DIR__ . '/../config.php');
+    //$configs = substr($s, 18, -2);
+    $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
+    if ($configs!='') $envs = json_decode($configs, true);
     $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] = equal_replace($v);
-            else $diskconfig[$k] = $v;
+            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
+            else $envs[$disktag][$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;
+            $envs[$v] = '';
+            $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v);
-            else $tmp[$k] = $v;
+            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
+            else $envs[$k] = $v;
         }
     }
     if ($indisk) {
+        $diskconfig = $envs[$disktag];
         $diskconfig = array_filter($diskconfig, 'array_value_isnot_null');
         ksort($diskconfig);
-        $tmp[$disktag] = json_encode($diskconfig);
+        $envs[$disktag] = $diskconfig;
     }
-    if ($oparetdisk) {
+    if ($operatedisk) {
         $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 ($disktag_s!='') $envs['disktag'] = substr($disktag_s, 0, -1);
+        else $envs['disktag'] = '';
     }
-//    echo '正式设置：'.json_encode($tmp,JSON_PRETTY_PRINT).'
-//';
-    $response = updateEnvironment($tmp, getConfig('HW_urn'), getConfig('HW_key'), getConfig('HW_secret'));
-    // WaitSCFStat();
+    $envs = array_filter($envs, 'array_value_isnot_null');
+    ksort($envs);
+    $response = updateEnvironment($envs, getConfig('HW_urn'), getConfig('HW_key'), getConfig('HW_secret'));
     return $response;
 }
 
-function WaitSCFStat()
-{
-    $trynum = 0;
-    while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')),true)['Response']['Status']!='Active' ) echo '
-'.++$trynum;
-}
-
 function install()
 {
     global $constStr;
+    global $contextUserData;
     if ($_GET['install2']) {
         $tmp['admin'] = $_POST['admin'];
-        setConfig($tmp);
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
         if (needUpdate()) {
             OnekeyUpate();
             return message('update to github version, reinstall.
@@ -180,13 +188,19 @@ function install()
             if ($tmp['HW_secret']=='') {
                 $tmp['HW_secret'] = $_POST['HW_secret'];
             }
-            //$response = json_decode(SetbaseConfig($tmp, $HW_urn, $HW_name, $HW_pwd), true)['Response'];
+            $tmp['ONEMANAGER_CONFIG_SAVE'] = $_POST['ONEMANAGER_CONFIG_SAVE'];
+            //return message($html, $title, 201);
             $response = setConfigResponse( SetbaseConfig($tmp, $tmp['HW_urn'], $tmp['HW_key'], $tmp['HW_secret']) );
             if (api_error($response)) {
                 $html = api_error_msg($response);
                 $title = 'Error';
                 return message($html, $title, 201);
             } else {
+                if ($tmp['ONEMANAGER_CONFIG_SAVE'] != 'file') {
+                    $html = getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '<br><a href="' . $_SERVER['base_path'] . '">' . getconstStr('Home') . '</a>';
+                    $title = 'Reinstall';
+                    return message($html, $title, 201);
+                }
                 $html .= '
     <form action="?install2" method="post" onsubmit="return notnull(this);">
         <label>'.getconstStr('SetAdminPassword').':<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
@@ -217,11 +231,14 @@ language:<br>';
         }
         if (getConfig('HW_urn')==''||getConfig('HW_key')==''||getConfig('HW_secret')=='') $html .= '
         在函数代码操作页上方找到URN，鼠标放上去后显示URN，复制填入：<br>
-        <label>URN:<input name="HW_urn" type="text" placeholder="" size=""></label><br>
+        <label>URN:<input name="HW_urn" type="text" placeholder="urn:fss:ap-XXXXXXXX:XXXXXXXXXXXXXXXXXXXXc01a1e9caXXX:function:default:XXXXX:latest" size=""></label><br>
         <a href="https://console.huaweicloud.com/iam/#/mine/accessKey" target="_blank">点击链接</a>，新增访问密钥，
         在下载的credentials.csv文件中找到对应信息，填入：<br>
         <label>Access Key Id:<input name="HW_key" type="text" placeholder="" size=""></label><br>
-        <label>Secret Access Key:<input name="HW_secret" type="password" placeholder="" size=""></label><br>';
+        <label>Secret Access Key:<input name="HW_secret" type="text" placeholder="" size=""></label><br>';
+        $html .= '
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="" ' . ('file'==$contextUserData->getUserData('ONEMANAGER_CONFIG_SAVE')?'':'checked') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '</label><br>
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="file" ' . ('file'==$contextUserData->getUserData('ONEMANAGER_CONFIG_SAVE')?'checked':'') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '</label><br>';
         $html .= '
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
@@ -288,51 +305,113 @@ function getfunctioninfo($HW_urn, $HW_key, $HW_secret)
     return $response;
 }
 
-
-function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
+function getfunctioncode($HW_urn, $HW_key, $HW_secret)
 {
-    //echo json_encode($Envs,JSON_PRETTY_PRINT);
-    global $contextUserData;
-    $tmp_env = json_decode(json_decode(getfunctioninfo($HW_urn, $HW_key, $HW_secret),true)['user_data'],true);
-    foreach ($Envs as $key1 => $value1) {
-        $tmp_env[$key1] = $value1;
-    }
-    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    ksort($tmp_env);
-
     $URN = explode(':', $HW_urn);
     $Region = $URN[2];
     $project_id = $URN[3];
-    $url = 'https://functiongraph.' . $Region . '.myhuaweicloud.com/v2/' . $project_id . '/fgs/functions/' . $HW_urn . '/config';
+    $url = 'https://functiongraph.' . $Region . '.myhuaweicloud.com/v2/' . $project_id . '/fgs/functions/' . $HW_urn . '/code';
     $signer = new Signer();
     $signer->Key = $HW_key;
     $signer->Secret = $HW_secret;
-    $req = new Request('PUT', $url);
+    $req = new Request('GET', $url);
     $req->headers = array(
         'content-type' => 'application/json;charset=utf8',
     );
-    $tmpdata['handler'] = 'index.handler';
-    $tmpdata['memory_size'] = $contextUserData->getMemorySize()+1-1;
-    $tmpdata['runtime'] = 'PHP7.3';
-    $tmpdata['timeout'] = $contextUserData->getRunningTimeInSeconds()+1-1;
-    $tmpdata['user_data'] = json_encode($tmp_env);
-    $req->body = json_encode($tmpdata);
+    $req->body = '';
     $curl = $signer->Sign($req);
     $response = curl_exec($curl);
     $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
     curl_close($curl);
-    return $response;
+    //return $response;
+    $url = json_decode($response, true)['func_code']['link'];
+    // return $url;
+
+
+    $bucket = splitfirst( splitfirst($url, '//')[1], '.')[0];
+    $path = splitfirst( splitfirst($url, '//')[1], '/')[1];
+    $date = gmdate('D, d M Y H:i:s') . ' GMT';
+    //$date = 'Wed, 05 Aug 2020 06:34:50 GMT';
+    $StringToSign = 'GET
+' . '
+' . '
+' . '
+' . 'x-obs-date:' . $date . '
+' . '/' . $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' => '' ]);
+    //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'];
+}
+
+function copyFolder($from, $to)
+{
+    if (substr($from, -1)=='/') $from = substr($from, 0, -1);
+    if (substr($to, -1)=='/') $to = substr($to, 0, -1);
+    if (!file_exists($to)) mkdir($to, 0777);
+    $handler=opendir($from);
+    while($filename=readdir($handler)) {
+        if($filename != '.' && $filename != '..'){
+            $fromfile = $from.'/'.$filename;
+            $tofile = $to.'/'.$filename;
+            if(is_dir($fromfile)){// 如果读取的某个对象是文件夹，则递归
+                copyFolder($fromfile, $tofile);
+            }else{
+                copy($fromfile, $tofile);
+            }
+        }
+    }
+    closedir($handler);
+    return 1;
+}
+
+function updateEnvironment($Envs, $HW_urn, $HW_key, $HW_secret)
+{
+
+    //echo json_encode($Envs,JSON_PRETTY_PRINT);
+    global $contextUserData;
+    $source = '/tmp/code.zip';
+    $outPath = '/tmp/code/';
+    $oldcode = '/tmp/oldcode.zip';
+
+    // 获取当前代码，并解压
+    $coderoot = __DIR__ . '/../';
+
+    copyFolder($coderoot, $outPath);
+
+    // 将配置写入
+    $prestr = '<?php $configs = \'' . PHP_EOL;
+    $aftstr = PHP_EOL . '\';';
+    file_put_contents($outPath . 'config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
+
+    // 将目录中文件打包成zip
+    //$zip=new ZipArchive();
+    $zip=new PharData($source);
+    //if($zip->open($source, ZipArchive::CREATE)){
+        addFileToZip($zip, $outPath); //调用方法，对要打包的根目录进行操作，并将ZipArchive的对象传递给方法
+    //    $zip->close(); //关闭处理的zip文件
+    //}
+
+    return updateProgram($HW_urn, $HW_key, $HW_secret, $source);
 }
 
 function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
 {
     //echo json_encode($Envs,JSON_PRETTY_PRINT);
+    if ($Envs['ONEMANAGER_CONFIG_SAVE'] == 'file') $envs = Array( 'ONEMANAGER_CONFIG_SAVE' => 'file' );
+    else {
+        $Envs['ONEMANAGER_CONFIG_SAVE'] == '';
+        $envs = $Envs;
         $tmp_env = json_decode(json_decode(getfunctioninfo($HW_urn, $HW_key, $HW_secret),true)['user_data'],true);
-    foreach ($Envs as $key1 => $value1) {
+        foreach ($envs as $key1 => $value1) {
             $tmp_env[$key1] = $value1;
         }
         $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
         ksort($tmp_env);
+        $envs = $tmp_env;
+    }
 
     // https://functiongraph.cn-north-4.myhuaweicloud.com/v2/{project_id}/fgs/functions/{function_urn}/config
     $URN = explode(':', $HW_urn);
@@ -350,12 +429,27 @@ function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
     $tmpdata['memory_size'] = 128;
     $tmpdata['runtime'] = 'PHP7.3';
     $tmpdata['timeout'] = 30;
-    $tmpdata['user_data'] = json_encode($tmp_env);
+    $tmpdata['description'] = 'Onedrive index and manager in Huawei FG.';
+    $tmpdata['user_data'] = json_encode($envs);
     $req->body = json_encode($tmpdata);
     $curl = $signer->Sign($req);
     $response = curl_exec($curl);
     $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
     curl_close($curl);
+    //return $response;
+    if (api_error(setConfigResponse($response))) {
+        return $response;
+    }
+    $s = file_get_contents(__DIR__ . '/../config.php');
+    //$configs = substr($s, 18, -2);
+    $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);
+    $response = updateEnvironment($tmp_env, $HW_urn, $HW_key, $HW_secret);
     return $response;
 }
 
@@ -435,6 +529,9 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
         }
     }
 
+    // 放入配置文件
+    file_put_contents($outPath . '/config.php', file_get_contents(__DIR__.'/../config.php'));
+
     // 将目录中文件打包成zip
     //$zip=new ZipArchive();
     $zip=new PharData($source);

platform/Normal.php

@@ -4,17 +4,21 @@ 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['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);
     else $path = $_SERVER['REQUEST_URI'];
     $path = path_format( substr($path, strlen($_SERVER['base_path'])) );
-    return substr($path, 1);
+    return $path;
+    //return substr($path, 1);
     //return spurlencode($path, '/');
 }
 
 function getGET()
 {
+    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);
@@ -43,19 +47,20 @@ function getConfig($str, $disktag = '')
     global $InnerEnv;
     global $Base64Env;
     //include 'config.php';
-    $s = file_get_contents('config.php');
-    $configs = substr($s, 18, -2);
+    $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 ($disktag=='') $disktag = $_SERVER['disktag'];
             if (isset($envs[$disktag][$str])) {
-                if (in_array($str, $Base64Env)) return equal_replace($envs[$disktag][$str],1);
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
                 else return $envs[$disktag][$str];
             }
         } else {
             if (isset($envs[$str])) {
-                if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1);
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
                 else return $envs[$str];
             }
         }
@@ -69,15 +74,16 @@ function setConfig($arr, $disktag = '')
     global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     //include 'config.php';
-    $s = file_get_contents('config.php');
-    $configs = substr($s, 18, -2);
+    $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);
     $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] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
             else $envs[$disktag][$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -88,7 +94,7 @@ function setConfig($arr, $disktag = '')
             $envs[$v] = '';
             $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $envs[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
             else $envs[$k] = $v;
         }
     }
@@ -107,11 +113,11 @@ function setConfig($arr, $disktag = '')
     $envs = array_filter($envs, 'array_value_isnot_null');
     ksort($envs);
     //echo '<pre>'. json_encode($envs, JSON_PRETTY_PRINT).'</pre>';
-    $prestr = '<?php $configs = \'
-';
-    $aftstr = '
-\';';
-    return file_put_contents('config.php', $prestr . json_encode($envs, JSON_PRETTY_PRINT) . $aftstr);
+    $prestr = '<?php $configs = \'' . PHP_EOL;
+    $aftstr = PHP_EOL . '\';';
+    $response = file_put_contents('.data/config.php', $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' ] );
 }
 
 function install()
@@ -122,7 +128,7 @@ function install()
             $tmp['admin'] = $_POST['admin'];
             //$tmp['language'] = $_COOKIE['language'];
             $tmp['timezone'] = $_COOKIE['timezone'];
-            $response = setConfig($tmp);
+            $response = setConfigResponse( setConfig($tmp) );
             if (api_error($response)) {
                 $html = api_error_msg($response);
                 $title = 'Error';
@@ -178,7 +184,7 @@ function install()
             //if (location.port!="") url += ":" + location.port;
             url += location.pathname;
             if (url.substr(-1)!="/") url += "/";
-            url += "config.php";
+            url += "app.json";
             //alert(url);
             var xhr4 = new XMLHttpRequest();
             xhr4.open("GET", url);
@@ -191,7 +197,7 @@ function install()
                     document.getElementById("submitbtn").disabled = false;
                     document.getElementById("formdiv").style.display = "";
                 } else {
-                    alert(url+"\n"+xhr4.status);
+                    alert("Url: " + url + "\nExpect http code 201, but received " + xhr4.status);
                 }
             }
         }
@@ -243,7 +249,7 @@ 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');
+    $tmpurl .= path_format($_SERVER['base_path'] . '/.data/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;
@@ -252,29 +258,31 @@ function RewriteEngineOn()
 
 function api_error($response)
 {
-    return !$response;
+    return isset($response['message']);
 }
 
 function api_error_msg($response)
 {
-    return $response . '<br>
-Can not write config to file.<br>
+    return $response['code'] . '<br>
+' . $response['message'] . '<br>
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
 }
 
 function setConfigResponse($response)
 {
-    return $response;
+    return json_decode($response, true);
 }
 
 function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
 {
+    $slash = '/';
+    if (strpos(__DIR__, ':')) $slash = '\\';
     // __DIR__ is xxx/platform
-    $projectPath = splitlast(__DIR__, '/')[0];
+    $projectPath = splitlast(__DIR__, $slash)[0];
 
     // 从github下载对应tar.gz，并解压
     $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
-    $tarfile = $projectPath.'/github.tar.gz';
+    $tarfile = $projectPath . $slash .'github.tar.gz';
     $githubfile = file_get_contents($url);
     if (!$githubfile) return 0;
     file_put_contents($tarfile, $githubfile);
@@ -283,17 +291,17 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
         $phar->extractTo($projectPath, null, true);//路径 要解压的文件 是否覆盖
     } else {
         ob_start();
-        passthru('tar -xzvf '.$tarfile,$stat);
+        passthru('tar -xzvf ' . $tarfile, $stat);
         ob_get_clean();
     }
     unlink($tarfile);
 
     $outPath = '';
     $tmp = scandir($projectPath);
-    $name = $auth.'-'.$project;
+    $name = $auth . '-' . $project;
     foreach ($tmp as $f) {
         if ( substr($f, 0, strlen($name)) == $name) {
-            $outPath = $projectPath . '/' . $f;
+            $outPath = $projectPath . $slash . $f;
             break;
         }
     }
@@ -301,31 +309,41 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
     if ($outPath=='') return 0;
 
     //unlink($outPath.'/config.php');
-    rename($projectPath.'/config.php', $outPath.'/config.php');
-
-    return moveFolder($outPath, $projectPath);
+    $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 . '.data' . $slash . 'config.php' . " to " . $outPath . $slash . '.data' . $slash . 'config.php';
+        return json_encode($tmp1);
+    }
+    return moveFolder($outPath, $projectPath, $slash);
 }
 
-function moveFolder($from, $to)
+function moveFolder($from, $to, $slash)
 {
-    if (substr($from, -1)=='/') $from = substr($from, 0, -1);
-    if (substr($to, -1)=='/') $to = substr($to, 0, -1);
+    if (substr($from, -1)==$slash) $from = substr($from, 0, -1);
+    if (substr($to, -1)==$slash) $to = substr($to, 0, -1);
     if (!file_exists($to)) mkdir($to, 0777);
     $handler=opendir($from);
     while($filename=readdir($handler)) {
         if($filename != '.' && $filename != '..'){
-            $fromfile = $from.'/'.$filename;
-            $tofile = $to.'/'.$filename;
+            $fromfile = $from . $slash . $filename;
+            $tofile = $to . $slash . $filename;
             if(is_dir($fromfile)){// 如果读取的某个对象是文件夹，则递归
-                moveFolder($fromfile, $tofile);
+                $response = moveFolder($fromfile, $tofile, $slash);
+                if (api_error(setConfigResponse($response))) return $response;
             }else{
                 //if (file_exists($tofile)) unlink($tofile);
-                rename($fromfile, $tofile);
+                $response = rename($fromfile, $tofile);
+                if (!$response) {
+                    $tmp['code'] = "Move Failed";
+                    $tmp['message'] = "Can not move " . $fromfile . " to " . $tofile;
+                    return json_encode($tmp);
+                }
                 if (file_exists($fromfile)) unlink($fromfile);
             }
         }
     }
     closedir($handler);
     rmdir($from);
-    return 1;
+    return json_encode( [ 'response' => 'success' ] );
 }

platform/TencentSCF_env.php

@@ -60,11 +60,11 @@ function getConfig($str, $disktag = '')
         if ($disktag=='') $disktag = $_SERVER['disktag'];
         $env = json_decode(getenv($disktag), true);
         if (isset($env[$str])) {
-            if (in_array($str, $Base64Env)) return equal_replace($env[$str],1);
+            if (in_array($str, $Base64Env)) return base64y_decode($env[$str]);
             else return $env[$str];
         }
     } else {
-        if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1);
+        if (in_array($str, $Base64Env)) return base64y_decode(getenv($str));
         else return getenv($str);
     }
     return '';
@@ -82,7 +82,7 @@ function setConfig($arr, $disktag = '')
     $oparetdisk = 0;
     foreach ($arr as $k => $v) {
         if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $diskconfig[$k] = base64y_encode($v);
             else $diskconfig[$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -93,7 +93,7 @@ function setConfig($arr, $disktag = '')
             $tmp[$v] = '';
             $oparetdisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $tmp[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $tmp[$k] = base64y_encode($v);
             else $tmp[$k] = $v;
         }
     }
@@ -127,7 +127,12 @@ function install()
     global $constStr;
     if ($_GET['install2']) {
         $tmp['admin'] = $_POST['admin'];
-        setConfig($tmp);
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
         if (needUpdate()) {
             OnekeyUpate();
             return message('update to github version, reinstall.
@@ -160,12 +165,18 @@ function install()
             $SecretKey = $_POST['SecretKey'];
             $tmp['SecretKey'] = $SecretKey;
         }
+        $tmp['ONEMANAGER_CONFIG_SAVE'] = $_POST['ONEMANAGER_CONFIG_SAVE'];
         $response = json_decode(SetbaseConfig($tmp, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey), true)['Response'];
         if (api_error($response)) {
             $html = api_error_msg($response);
             $title = 'Error';
             return message($html, $title, 201);
         } else {
+            if ($tmp['ONEMANAGER_CONFIG_SAVE'] == 'file') {
+                $html = getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '<br><a href="' . $_SERVER['base_path'] . '">' . getconstStr('Home') . '</a>';
+                $title = 'Reinstall';
+                return message($html, $title, 201);
+            }
             $html .= '
     <form action="?install2" method="post" onsubmit="return notnull(this);">
         <label>'.getconstStr('SetAdminPassword').':<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
@@ -194,10 +205,13 @@ language:<br>';
         <label><input type="radio" name="language" value="'.$key1.'" '.($key1==$constStr['language']?'checked':'').' onclick="changelanguage(\''.$key1.'\')">'.$value1.'</label><br>';
         }
         if (getConfig('SecretId')==''||getConfig('SecretKey')=='') $html .= '
-        <a href="https://console.cloud.tencent.com/cam/capi" target="_blank">'.getconstStr('Create').' SecretId & SecretKey</a><br>
+        <a href="https://console.cloud.tencent.com/cam/capi" target="_blank">' . getconstStr('Create') . ' SecretId & SecretKey</a><br>
         <label>SecretId:<input name="SecretId" type="text" placeholder="" size=""></label><br>
         <label>SecretKey:<input name="SecretKey" type="text" placeholder="" size=""></label><br>';
         $html .= '
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="" ' . ('file'==getenv('ONEMANAGER_CONFIG_SAVE')?'':'checked') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '</label><br>
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="file" ' . ('file'==getenv('ONEMANAGER_CONFIG_SAVE')?'checked':'') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '</label><br>';
+        $html .= '
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
     <script>
@@ -329,7 +343,8 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
 
 function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
-    echo json_encode($Envs,JSON_PRETTY_PRINT);
+    //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;*/
@@ -362,7 +377,7 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     $tmpdata['Timestamp'] = time();
     $tmpdata['Token'] = '';
     $tmpdata['Version'] = '2018-04-16';
-    $tmpdata['Description'] = 'Onedrive index and manager in SCF.';
+    $tmpdata['Description'] = 'Onedrive index and manager in Tencent SCF.';
     $tmpdata['MemorySize'] = 64;
     $tmpdata['Timeout'] = 30;
     $data = ReorganizeDate($tmpdata);
@@ -415,7 +430,7 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
 {
     $source['url'] = 'https://github.com/' . $auth . '/' . $project;
     $source['branch'] = $branch;
-    return json_decode(updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source), true)['Response'];
+    return updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source);
 }
 
 function setConfigResponse($response)

platform/TencentSCF_file.php

@@ -58,18 +58,19 @@ function getConfig($str, $disktag = '')
     global $Base64Env;
     //include 'config.php';
     $s = file_get_contents('config.php');
-    $configs = substr($s, 18, -2);
+    //$configs = substr($s, 18, -2);
+    $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
     if ($configs!='') {
         $envs = json_decode($configs, true);
         if (in_array($str, $InnerEnv)) {
             if ($disktag=='') $disktag = $_SERVER['disktag'];
             if (isset($envs[$disktag][$str])) {
-                if (in_array($str, $Base64Env)) return equal_replace($envs[$disktag][$str],1);
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$disktag][$str]);
                 else return $envs[$disktag][$str];
             }
         } else {
             if (isset($envs[$str])) {
-                if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1);
+                if (in_array($str, $Base64Env)) return base64y_decode($envs[$str]);
                 else return $envs[$str];
             }
         }
@@ -84,14 +85,15 @@ function setConfig($arr, $disktag = '')
     if ($disktag=='') $disktag = $_SERVER['disktag'];
     //include 'config.php';
     $s = file_get_contents('config.php');
-    $configs = substr($s, 18, -2);
+    //$configs = substr($s, 18, -2);
+    $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] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = base64y_encode($v);
             else $envs[$disktag][$k] = $v;
             $indisk = 1;
         } elseif ($k=='disktag_add') {
@@ -102,7 +104,7 @@ function setConfig($arr, $disktag = '')
             $envs[$v] = '';
             $operatedisk = 1;
         } else {
-            if (in_array($k, $Base64Env)) $envs[$k] = equal_replace($v);
+            if (in_array($k, $Base64Env)) $envs[$k] = base64y_encode($v);
             else $envs[$k] = $v;
         }
     }
@@ -137,7 +139,12 @@ function install()
     global $constStr;
     if ($_GET['install2']) {
         $tmp['admin'] = $_POST['admin'];
-        setConfig($tmp);
+        $response = setConfigResponse( setConfig($tmp) );
+        if (api_error($response)) {
+            $html = api_error_msg($response);
+            $title = 'Error';
+            return message($html, $title, 201);
+        }
         if (needUpdate()) {
             OnekeyUpate();
             return message('update to github version, reinstall.
@@ -170,12 +177,18 @@ function install()
             $SecretKey = $_POST['SecretKey'];
             $tmp['SecretKey'] = $SecretKey;
         }
+        $tmp['ONEMANAGER_CONFIG_SAVE'] = $_POST['ONEMANAGER_CONFIG_SAVE'];
         $response = json_decode(SetbaseConfig($tmp, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey), true)['Response'];
         if (api_error($response)) {
             $html = api_error_msg($response);
             $title = 'Error';
             return message($html, $title, 201);
         } else {
+            if ($tmp['ONEMANAGER_CONFIG_SAVE'] != 'file') {
+                $html = getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '<br><a href="' . $_SERVER['base_path'] . '">' . getconstStr('Home') . '</a>';
+                $title = 'Reinstall';
+                return message($html, $title, 201);
+            }
             $html .= '
     <form action="?install2" method="post" onsubmit="return notnull(this);">
         <label>'.getconstStr('SetAdminPassword').':<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>
@@ -208,6 +221,9 @@ language:<br>';
         <label>SecretId:<input name="SecretId" type="text" placeholder="" size=""></label><br>
         <label>SecretKey:<input name="SecretKey" type="text" placeholder="" size=""></label><br>';
         $html .= '
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="" ' . ('file'==getenv('ONEMANAGER_CONFIG_SAVE')?'':'checked') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_ENV') . '</label><br>
+        <label><input type="radio" name="ONEMANAGER_CONFIG_SAVE" value="file" ' . ('file'==getenv('ONEMANAGER_CONFIG_SAVE')?'checked':'') . '>' . getconstStr('ONEMANAGER_CONFIG_SAVE_FILE') . '</label><br>';
+        $html .= '
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
     <script>
@@ -319,36 +335,46 @@ function getfunctioncodeurl($function_name, $Region, $Namespace, $SecretId, $Sec
     return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
 }
 
+function copyFolder($from, $to)
+{
+    if (substr($from, -1)=='/') $from = substr($from, 0, -1);
+    if (substr($to, -1)=='/') $to = substr($to, 0, -1);
+    if (!file_exists($to)) mkdir($to, 0777);
+    $handler=opendir($from);
+    while($filename=readdir($handler)) {
+        if($filename != '.' && $filename != '..'){
+            $fromfile = $from.'/'.$filename;
+            $tofile = $to.'/'.$filename;
+            if(is_dir($fromfile)){// 如果读取的某个对象是文件夹，则递归
+                copyFolder($fromfile, $tofile);
+            }else{
+                copy($fromfile, $tofile);
+            }
+        }
+    }
+    closedir($handler);
+    return 1;
+}
+
 function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
     // 获取当前代码并解压
-    $codeurl = json_decode(getfunctioncodeurl($function_name, $Region, $Namespace, $SecretId, $SecretKey), true)['Response']['Url'];
-    $codezip = '/tmp/oldcode.zip';
+    //$codeurl = json_decode(getfunctioncodeurl($function_name, $Region, $Namespace, $SecretId, $SecretKey), true)['Response']['Url'];
+    //$codezip = '/tmp/oldcode.zip';
     $outPath = '/tmp/code/';
-    file_put_contents($codezip, file_get_contents($codeurl));
-    //$phar = new PharData($codezip);
-    //$phar = new Phar($codezip);
-    $zip=new ZipArchive();
-    $zip->open($codezip);
-    $html = $zip->extractTo($outPath);
     
-    // 获取当前配置并加入新配置
-    $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
-    foreach ($tmp as $tmp1) {
-        $tmp_env[$tmp1['Key']] = $tmp1['Value'];
-    }
-    foreach ($Envs as $key1 => $value1) {
-        $tmp_env[$key1] = $value1;
-    }
-    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    //$tmp_env['Region'] = $Region;
-    ksort($tmp_env);
+    //file_put_contents($codezip, file_get_contents($codeurl));
+    //$zip=new ZipArchive();
+    //$zip->open($codezip);
+    //$html = $zip->extractTo($outPath);
 
-    $prestr = '<?php $configs = \'
-';
-    $aftstr = '
-\';';
-    file_put_contents($outPath . 'config.php', $prestr . json_encode($tmp_env, JSON_PRETTY_PRINT) . $aftstr);
+    $coderoot = __DIR__ . '/../';
+    copyFolder($coderoot, $outPath);
+    
+    // 将配置写入
+    $prestr = '<?php $configs = \'' . PHP_EOL;
+    $aftstr = PHP_EOL . '\';';
+    file_put_contents($outPath . 'config.php', $prestr . json_encode($Envs, JSON_PRETTY_PRINT) . $aftstr);
 
     // 将目录中文件打包成zip
     $source = '/tmp/code.zip';
@@ -359,7 +385,7 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
     //    $zip->close(); //关闭处理的zip文件
     //}
 
-    return updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey, $source);
+    return updateProgram($function_name, $Region, $namespace, $SecretId, $SecretKey, $source);
     $tmp1['Response']['Error']['Message'] = $codeurl;
     error_log($tmp1['Response']['Error']['Message']);
     return json_encode($tmp1);
@@ -367,6 +393,27 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
 
 function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
+    if ($Envs['ONEMANAGER_CONFIG_SAVE'] == 'file') $tmp_env = Array( 'ONEMANAGER_CONFIG_SAVE' => 'file' );
+    else {
+        $Envs['ONEMANAGER_CONFIG_SAVE'] == '';
+        $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
+        foreach ($tmp as $tmp1) {
+            $tmp_env[$tmp1['Key']] = $tmp1['Value'];
+        }
+        foreach ($Envs as $key1 => $value1) {
+            $tmp_env[$key1] = $value1;
+        }
+        $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
+        ksort($tmp_env);
+    }
+
+    $i = 0;
+    foreach ($tmp_env as $key1 => $value1) {
+        $tmpdata['Environment.Variables.'.$i.'.Key'] = $key1;
+        $tmpdata['Environment.Variables.'.$i.'.Value'] = $value1;
+        $i++;
+    }
+
     $meth = 'POST';
     $host = 'scf.tencentcloudapi.com';
     $tmpdata['Action'] = 'UpdateFunctionConfiguration';
@@ -378,7 +425,7 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     $tmpdata['Timestamp'] = time();
     $tmpdata['Token'] = '';
     $tmpdata['Version'] = '2018-04-16';
-    $tmpdata['Description'] = 'Onedrive index and manager in SCF.';
+    $tmpdata['Description'] = 'Onedrive index and manager in Tencent SCF.';
     $tmpdata['MemorySize'] = 64;
     $tmpdata['Timeout'] = 30;
     $data = ReorganizeDate($tmpdata);
@@ -396,17 +443,16 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     }
     WaitSCFStat($function_name, $Region, $Namespace, $SecretId, $SecretKey);
 
-    $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
-    foreach ($tmp as $tmp1) {
-        $tmp_env[$tmp1['Key']] = $tmp1['Value'];
+    $s = file_get_contents('config.php');
+    //$configs = substr($s, 18, -2);
+    $configs = '{' . splitlast(splitfirst($s, '{')[1], '}')[0] . '}';
+    if ($configs!='') $envs = json_decode($configs, true);
+    foreach ($Envs as $k => $v) {
+        $envs[$k] = $v;
     }
-    foreach ($Envs as $key1 => $value1) {
-        $tmp_env[$key1] = $value1;
-    }
-    $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    ksort($tmp_env);
-    $response = updateEnvironment($tmp_env, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey);
-    //WaitSCFStat();
+    $envs = array_filter($envs, 'array_value_isnot_null');
+    ksort($envs);
+    $response = updateEnvironment($envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey);
     return $response;
 }
 

readme.md

@@ -8,14 +8,27 @@ 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.  
 
 
+# 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 Tencent Serverless Cloud Function (SCF 腾讯无服务器云函数)  
 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反应不过来，会添加失败，请不要删除，再添加一次相同的就可以了。  
+（重点：勾选集成响应）  
+  
+添加网盘时，SCF可能会反应不过来，不跳转到微软，导致添加失败，请不要删除这个盘，再添加一次相同标签的盘就可以了。  
 
 
 # Deploy to Virtual Private Server (VPS 或空间)  
@@ -59,6 +72,20 @@ How to Install:
 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服务器下载文件，服务器只消耗与微软通信的少量流量。  

theme/Onedrive-dev.html

@@ -227,7 +227,6 @@
         main .main-item-list .main-items-fileName a:hover {
             text-decoration: underline;
         }
-        .main-title-path a{vertical-align: middle;}
         .more-disk{
             vertical-align: middle;
             overflow: hidden;
@@ -292,22 +291,11 @@
             <div class="container">
                 <div class="main-title">
                     <h1 class="main-title-path">
-<!--MultiDiskAreaStart-->
-                        <div class="more-disk">
-                            <span><!--DiskNameNow--></span>
-                            <div>
-<!--MultiDisksStart-->
-                                <li><a href="<!--MultiDisksUrl-->" <!--MultiDisksNow-->><!--MultiDisksName--></a></li>
-<!--MultiDisksEnd-->
-                            </div>
-                        </div>
-                        >
-<!--MultiDiskAreaEnd-->
-                        <a href="<!--base_disk_path-->/"><!--constStr@Home--></a>
-<!--PathArrayStart-->
+                        <a href="<!--base_path-->"><!--constStr@Home--></a>
+<!--DiskPathArrayStart-->
                         >
                         <a href="<!--PathArrayLink-->"><!--PathArrayName--></a>
-<!--PathArrayEnd-->
+<!--DiskPathArrayEnd-->
                     </h1>
                 </div>
 <!--IsFileStart-->

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

@@ -35,7 +35,7 @@
         .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 60px;text-align:left;font-weight:400;color:#000;background-color:rgba(245,245,245,0.5);word-break: break-all;word-wrap: break-word;}
+        .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;}
         .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); }
@@ -63,6 +63,9 @@
         .readme{padding:8px;background-color:rgba(245,245,245,0.5);}
         .markdown-body, .customfile{padding:20px;text-align:left}
         @media only screen and (max-width:480px){
+<!--BackgroundMStart-->
+            body{background-repeat:no-repeat;background-size:cover;background-attachment:fixed;background-image:url("<!--BackgroundMUrl-->");}
+<!--BackgroundMEnd-->
             .title{margin-bottom:24px}
             .list-wrapper{width:95%; margin-bottom:24px;}
             .list-table {padding:8px}
@@ -146,28 +149,27 @@
     <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_div" style="margin:0 0 16px 0">
                 <div id="upload_btns" align="center">
-                    <input id="upload_file" type="file" name="upload_filename">
+                    <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>
@@ -315,10 +317,10 @@
                 </div>
 <!--AdminEnd-->
 <!--IsFolderEnd-->
+            </div>
+        </div>
+    </div>
 <!--ListEnd-->
-            </div>
-        </div>
-    </div>
 <!--ReadmemdStart-->
     <div class="list-wrapper" id="readme-div">
         <div class="list-container">
@@ -586,7 +588,7 @@
             });
         }
     }
-    addVideos(['<!--FileDownUrl-->']);
+    addVideos(['<!--FileEncodeUrl-->']);
 <!--IsvideoFileEnd-->
 <!--IspdfFileStart-->
     pdfjsLib.GlobalWorkerOptions.workerSrc = '//cdn.bootcss.com/pdf.js/2.3.200/pdf.worker.min.js';
@@ -651,15 +653,13 @@
             strarry=str.split('.');
             ext=strarry[strarry.length-1].toLowerCase();
             if (images.indexOf(ext)>-1) {
-                if (document.getElementById('originalpic').checked==true) {
                 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 {
-                    var nurl=window.location.href;
-                    if (nurl.substr(-1)!="/") nurl+="/";
-                    var url=nurl+str+'?thumbnails';
+                    url+='?thumbnails';
                     get_thumbnails_url(url, str, files[$i]);
                 }
             }
@@ -852,6 +852,7 @@
 <!--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,"");
@@ -891,7 +892,7 @@
                 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';
@@ -1003,6 +1004,7 @@
                             var response=JSON.parse(xhr.responseText);
                             if (response['size']>0) {
                                 // contain size, upload finish. 有size说明是最终返回，上传结束
+                                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');
@@ -1010,6 +1012,7 @@
                                     xhr3.onload = function(e){
                                         console.log(xhr3.responseText+','+xhr3.status);
                                     }
+                                }
                                 EndTime=new Date();
                                 MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
                                 if (newstartsize==0) {
@@ -1017,8 +1020,10 @@
                                 } 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>';
+                                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;
@@ -1070,16 +1075,11 @@
         if (num=='') {
             var str='';
         } 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);
         }
         document.getElementById(action + '_div').style.display='';
         document.getElementById(action + '_label').innerText=str;//.replace(/&/,'&amp;');
@@ -1240,6 +1240,9 @@
         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>
 <!--customScript-->

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/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

@@ -24,9 +24,9 @@
     <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-->
 	<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>
@@ -148,7 +148,7 @@
                         <audio src="<!--FileDownUrl-->" controls="controls" style="width: 100%"></audio>
 <!--IsmusicFileEnd-->
 <!--IspdfFileStart-->
-                        <div id="pdf-d"></div>
+                        <div id="pdf-d">Loading PDF</div>
 <!--IspdfFileEnd-->
 <!--IsofficeFileStart-->
                         <iframe id="office-a" src="https://view.officeapps.live.com/op/view.aspx?src=<!--FileEncodeDownUrl-->" style="width: 100%;height: 800px" frameborder="0"></iframe>
@@ -548,10 +548,16 @@
 <!--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;
@@ -775,19 +781,26 @@
         var timea=new Date().getTime();
         var i=0;
         getuplink(i);
-        function 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);
-            var td1=document.createElement('td');
+                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);
-            var td2=document.createElement('td');
+                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();
@@ -832,35 +845,46 @@
             var xhr1 = new XMLHttpRequest();
             xhr1.open("GET", '?action=upbigfile&upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
             xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
-            xhr1.send(null);
+            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) {
-                    console.log(xhr1.responseText);
+                    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>';
-                        uploadbuttonshow();
                     } else {
                         td2.innerHTML='<!--constStr@UploadStart--> ...';
                         binupfile(file,html['uploadUrl'],timea+'_'+i, upbigfilename);
                     }
                 }
-                if (xhr1.status==409) {
-                    td2.innerHTML='md5: '+filemd5;
-                    tdnum = timea+'_'+i;
-                    document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<!--base_disk_path--><!--Path-->'+upbigfilename+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).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>';
-                }
                 if (i<files.length-1) {
                     i++;
                     getuplink(i);
                 }
             }
+            xhr1.send(null);
 <!--GuestStart-->
             }
         }
 <!--GuestEnd-->
         }
+        uploadbuttonshow();
     }
     function size_format(num) {
         if (num>1024) {
@@ -953,7 +977,7 @@
                                 }
                                 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>';
                                 label.innerHTML=StartStr+MiddleStr;
-                                uploadbuttonshow();
+                                // uploadbuttonshow();
 <!--AdminStart-->
                                 response.name=file.webkitRelativePath||response.name;
                                 addelement(response);
@@ -976,7 +1000,7 @@
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';
                     }
-                    uploadbuttonshow();
+                    // uploadbuttonshow();
                 }
             }
         }

theme/purenice.php

@@ -1044,7 +1044,7 @@
                                 } else {
                                     MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
                                 }
-                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="<?php echo $_SERVER['base_disk_path']; ?>'+response.name+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="<?php echo $_SERVER['base_disk_path']; ?>'+response.name+'" id="upfile_a1_'+tdnum+'"></a><?php echo getconstStr('UploadComplete'); ?><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <?php if (!$_SERVER['admin']) echo 'style="display:none"'; ?> ><?php echo getconstStr('CopyUrl'); ?></button></div>';
+                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="./'+response.name+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="./'+response.name+'" id="upfile_a1_'+tdnum+'"></a><?php echo getconstStr('UploadComplete'); ?><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <?php if (!$_SERVER['admin']) echo 'style="display:none"'; ?> ><?php echo getconstStr('CopyUrl'); ?></button></div>';
                                 label.innerHTML=StartStr+MiddleStr;
                                 uploadbuttonshow();
 <?php if ($_SERVER['admin']) { ?>

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

vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php

@@ -1,118 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * APC cache provider.
- *
- * @link       www.doctrine-project.org
- * @deprecated since version 1.6, use ApcuCache instead
- * @since      2.0
- * @author     Benjamin Eberlei <kontakt@beberlei.de>
- * @author     Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author     Jonathan Wage <jonwage@gmail.com>
- * @author     Roman Borschel <roman@code-factory.org>
- * @author     David Abdemoulaie <dave@hobodave.com>
- */
-class ApcCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return apc_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return apc_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return apc_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // apc_delete returns false if the id does not exist
-        return apc_delete($id) || ! apc_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return apc_clear_cache() && apc_clear_cache('user');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return apc_fetch($keys) ?: [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = apc_store($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = apc_cache_info('', true);
-        $sma  = apc_sma_info();
-
-        // @TODO - Temporary fix @see https://github.com/krakjoe/apcu/pull/42
-        if (PHP_VERSION_ID >= 50500) {
-            $info['num_hits']   = isset($info['num_hits'])   ? $info['num_hits']   : $info['nhits'];
-            $info['num_misses'] = isset($info['num_misses']) ? $info['num_misses'] : $info['nmisses'];
-            $info['start_time'] = isset($info['start_time']) ? $info['start_time'] : $info['stime'];
-        }
-
-        return array(
-            Cache::STATS_HITS             => $info['num_hits'],
-            Cache::STATS_MISSES           => $info['num_misses'],
-            Cache::STATS_UPTIME           => $info['start_time'],
-            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
-            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php

@@ -1,106 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * APCu cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  1.6
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ApcuCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return apcu_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return apcu_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return apcu_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // apcu_delete returns false if the id does not exist
-        return apcu_delete($id) || ! apcu_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return apcu_clear_cache();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return apcu_fetch($keys) ?: [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = apcu_store($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = apcu_cache_info(true);
-        $sma  = apcu_sma_info();
-
-        return array(
-            Cache::STATS_HITS             => $info['num_hits'],
-            Cache::STATS_MISSES           => $info['num_misses'],
-            Cache::STATS_UPTIME           => $info['start_time'],
-            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
-            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php

@@ -1,142 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Array cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class ArrayCache extends CacheProvider
-{
-    /**
-     * @var array[] $data each element being a tuple of [$data, $expiration], where the expiration is int|bool
-     */
-    private $data = [];
-
-    /**
-     * @var int
-     */
-    private $hitsCount = 0;
-
-    /**
-     * @var int
-     */
-    private $missesCount = 0;
-
-    /**
-     * @var int
-     */
-    private $upTime;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct()
-    {
-        $this->upTime = time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        if (! $this->doContains($id)) {
-            $this->missesCount += 1;
-
-            return false;
-        }
-
-        $this->hitsCount += 1;
-
-        return $this->data[$id][0];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        if (! isset($this->data[$id])) {
-            return false;
-        }
-
-        $expiration = $this->data[$id][1];
-
-        if ($expiration && $expiration < time()) {
-            $this->doDelete($id);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        unset($this->data[$id]);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->data = [];
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return [
-            Cache::STATS_HITS             => $this->hitsCount,
-            Cache::STATS_MISSES           => $this->missesCount,
-            Cache::STATS_UPTIME           => $this->upTime,
-            Cache::STATS_MEMORY_USAGE     => null,
-            Cache::STATS_MEMORY_AVAILABLE => null,
-        ];
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php

@@ -1,147 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Cache provider that allows to easily chain multiple cache providers
- *
- * @author Michaël Gallego <mic.gallego@gmail.com>
- */
-class ChainCache extends CacheProvider
-{
-    /**
-     * @var CacheProvider[]
-     */
-    private $cacheProviders = array();
-
-    /**
-     * Constructor
-     *
-     * @param CacheProvider[] $cacheProviders
-     */
-    public function __construct($cacheProviders = array())
-    {
-        $this->cacheProviders = $cacheProviders;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setNamespace($namespace)
-    {
-        parent::setNamespace($namespace);
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $cacheProvider->setNamespace($namespace);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        foreach ($this->cacheProviders as $key => $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                $value = $cacheProvider->doFetch($id);
-
-                // We populate all the previous cache layers (that are assumed to be faster)
-                for ($subKey = $key - 1 ; $subKey >= 0 ; $subKey--) {
-                    $this->cacheProviders[$subKey]->doSave($id, $value);
-                }
-
-                return $value;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        foreach ($this->cacheProviders as $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $stored = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stored = $cacheProvider->doSave($id, $data, $lifeTime) && $stored;
-        }
-
-        return $stored;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        $deleted = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $deleted = $cacheProvider->doDelete($id) && $deleted;
-        }
-
-        return $deleted;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        $flushed = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $flushed = $cacheProvider->doFlush() && $flushed;
-        }
-
-        return $flushed;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        // We return all the stats from all adapters
-        $stats = array();
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stats[] = $cacheProvider->doGetStats();
-        }
-
-        return $stats;
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php

@@ -1,121 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Couchbase;
-
-/**
- * Couchbase cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Michael Nitschinger <michael@nitschinger.at>
- */
-class CouchbaseCache extends CacheProvider
-{
-    /**
-     * @var Couchbase|null
-     */
-    private $couchbase;
-
-    /**
-     * Sets the Couchbase instance to use.
-     *
-     * @param Couchbase $couchbase
-     *
-     * @return void
-     */
-    public function setCouchbase(Couchbase $couchbase)
-    {
-        $this->couchbase = $couchbase;
-    }
-
-    /**
-     * Gets the Couchbase instance used by the cache.
-     *
-     * @return Couchbase|null
-     */
-    public function getCouchbase()
-    {
-        return $this->couchbase;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->couchbase->get($id) ?: false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (null !== $this->couchbase->get($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->couchbase->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->couchbase->delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->couchbase->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->couchbase->getStats();
-        $servers = $this->couchbase->getServers();
-        $server  = explode(":", $servers[0]);
-        $key     = $server[0] . ":" . "11210";
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php

@@ -1,126 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Memcache;
-
-/**
- * Memcache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcacheCache extends CacheProvider
-{
-    /**
-     * @var Memcache|null
-     */
-    private $memcache;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcache $memcache
-     *
-     * @return void
-     */
-    public function setMemcache(Memcache $memcache)
-    {
-        $this->memcache = $memcache;
-    }
-
-    /**
-     * Gets the memcache instance used by the cache.
-     *
-     * @return Memcache|null
-     */
-    public function getMemcache()
-    {
-        return $this->memcache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcache->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $flags = null;
-        $this->memcache->get($id, $flags);
-        
-        //if memcache has changed the value of "flags", it means the value exists
-        return ($flags !== null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcache->set($id, $data, 0, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // Memcache::delete() returns false if entry does not exist
-        return $this->memcache->delete($id) || ! $this->doContains($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcache->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats = $this->memcache->getStats();
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php

@@ -1,147 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Memcached;
-
-/**
- * Memcached cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcachedCache extends CacheProvider
-{
-    /**
-     * @var Memcached|null
-     */
-    private $memcached;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcached $memcached
-     *
-     * @return void
-     */
-    public function setMemcached(Memcached $memcached)
-    {
-        $this->memcached = $memcached;
-    }
-
-    /**
-     * Gets the memcached instance used by the cache.
-     *
-     * @return Memcached|null
-     */
-    public function getMemcached()
-    {
-        return $this->memcached;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcached->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return $this->memcached->getMulti($keys) ?: [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime > 30 * 24 * 3600) {
-            $lifetime = time() + $lifetime;
-        }
-
-        return $this->memcached->setMulti($keysAndValues, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $this->memcached->get($id);
-
-        return $this->memcached->getResultCode() === Memcached::RES_SUCCESS;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcached->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->memcached->delete($id)
-            || $this->memcached->getResultCode() === Memcached::RES_NOTFOUND;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcached->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->memcached->getStats();
-        $servers = $this->memcached->getServerList();
-        $key     = $servers[0]['host'] . ':' . $servers[0]['port'];
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php

@@ -1,197 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use MongoBinData;
-use MongoCollection;
-use MongoCursorException;
-use MongoDate;
-
-/**
- * MongoDB cache provider.
- *
- * @since  1.1
- * @author Jeremy Mikola <jmikola@gmail.com>
- */
-class MongoDBCache extends CacheProvider
-{
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a MongoDate value indicating when the
-     * cache entry should expire.
-     *
-     * With MongoDB 2.2+, entries can be automatically deleted by MongoDB by
-     * indexing this field with the "expireAfterSeconds" option equal to zero.
-     * This will direct MongoDB to regularly query for and delete any entries
-     * whose date is older than the current time. Entries without a date value
-     * in this field will be ignored.
-     *
-     * The cache provider will also check dates on its own, in case expired
-     * entries are fetched before MongoDB's TTLMonitor pass can expire them.
-     *
-     * @see http://docs.mongodb.org/manual/tutorial/expire-data/
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var MongoCollection
-     */
-    private $collection;
-
-    /**
-     * Constructor.
-     *
-     * This provider will default to the write concern and read preference
-     * options set on the MongoCollection instance (or inherited from MongoDB or
-     * MongoClient). Using an unacknowledged write concern (< 1) may make the
-     * return values of delete() and save() unreliable. Reading from secondaries
-     * may make contain() and fetch() unreliable.
-     *
-     * @see http://www.php.net/manual/en/mongo.readpreferences.php
-     * @see http://www.php.net/manual/en/mongo.writeconcerns.php
-     * @param MongoCollection $collection
-     */
-    public function __construct(MongoCollection $collection)
-    {
-        $this->collection = $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::DATA_FIELD, self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return unserialize($document[self::DATA_FIELD]->bin);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        try {
-            $result = $this->collection->update(
-                array('_id' => $id),
-                array('$set' => array(
-                    self::EXPIRATION_FIELD => ($lifeTime > 0 ? new MongoDate(time() + $lifeTime) : null),
-                    self::DATA_FIELD => new MongoBinData(serialize($data), MongoBinData::BYTE_ARRAY),
-                )),
-                array('upsert' => true, 'multiple' => false)
-            );
-        } catch (MongoCursorException $e) {
-            return false;
-        }
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        $result = $this->collection->remove(array('_id' => $id));
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        // Use remove() in lieu of drop() to maintain any collection indexes
-        $result = $this->collection->remove();
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $serverStatus = $this->collection->db->command(array(
-            'serverStatus' => 1,
-            'locks' => 0,
-            'metrics' => 0,
-            'recordStats' => 0,
-            'repl' => 0,
-        ));
-
-        $collStats = $this->collection->db->command(array('collStats' => 1));
-
-        return array(
-            Cache::STATS_HITS => null,
-            Cache::STATS_MISSES => null,
-            Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (int) $serverStatus['uptime'] : null),
-            Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (int) $collStats['size'] : null),
-            Cache::STATS_MEMORY_AVAILABLE  => null,
-        );
-    }
-
-    /**
-     * Check if the document is expired.
-     *
-     * @param array $document
-     *
-     * @return bool
-     */
-    private function isExpired(array $document)
-    {
-        return isset($document[self::EXPIRATION_FIELD]) &&
-            $document[self::EXPIRATION_FIELD] instanceof MongoDate &&
-            $document[self::EXPIRATION_FIELD]->sec < time();
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php

@@ -1,120 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Php file cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class PhpFileCache extends FileCache
-{
-    const EXTENSION = '.doctrinecache.php';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        parent::__construct($directory, $extension, $umask);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        if ($value['lifetime'] !== 0 && $value['lifetime'] < time()) {
-            return false;
-        }
-
-        return $value['data'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        return $value['lifetime'] === 0 || $value['lifetime'] > time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            $lifeTime = time() + $lifeTime;
-        }
-
-        if (is_object($data) && ! method_exists($data, '__set_state')) {
-            throw new \InvalidArgumentException(
-                "Invalid argument given, PhpFileCache only allows objects that implement __set_state() " .
-                "and fully support var_export(). You can use the FilesystemCache to save arbitrary object " .
-                "graphs using serialize()/deserialize()."
-            );
-        }
-
-        $filename  = $this->getFilename($id);
-
-        $value = array(
-            'lifetime'  => $lifeTime,
-            'data'      => $data
-        );
-
-        $value  = var_export($value, true);
-        $code   = sprintf('<?php return %s;', $value);
-
-        return $this->writeFile($filename, $code);
-    }
-
-    /**
-     * @param string $id
-     *
-     * @return array|false
-     */
-    private function includeFileForId($id)
-    {
-        $fileName = $this->getFilename($id);
-
-        // note: error suppression is still faster than `file_exists`, `is_file` and `is_readable`
-        $value = @include $fileName;
-
-        if (! isset($value['lifetime'])) {
-            return false;
-        }
-
-        return $value;
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace Doctrine\Common\Cache;
-
-use Predis\ClientInterface;
-
-/**
- * Predis cache provider.
- *
- * @author othillo <othillo@othillo.nl>
- */
-class PredisCache extends CacheProvider
-{
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @param ClientInterface $client
-     *
-     * @return void
-     */
-    public function __construct(ClientInterface $client)
-    {
-        $this->client = $client;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $result = $this->client->get($id);
-        if (null === $result) {
-            return false;
-        }
-
-        return unserialize($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $fetchedItems = call_user_func_array(array($this->client, 'mget'), $keys);
-
-        return array_map('unserialize', array_filter(array_combine($keys, $fetchedItems)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime) {
-            $success = true;
-
-            // Keys have lifetime, use SETEX for each of them
-            foreach ($keysAndValues as $key => $value) {
-                $response = $this->client->setex($key, $lifetime, serialize($value));
-
-                if ((string) $response != 'OK') {
-                    $success = false;
-                }
-            }
-
-            return $success;
-        }
-
-        // No lifetime, use MSET
-        $response = $this->client->mset(array_map(function ($value) {
-            return serialize($value);
-        }, $keysAndValues));
-
-        return (string) $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (bool) $this->client->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $data = serialize($data);
-        if ($lifeTime > 0) {
-            $response = $this->client->setex($id, $lifeTime, $data);
-        } else {
-            $response = $this->client->set($id, $data);
-        }
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->client->del($id) >= 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $response = $this->client->flushdb();
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->client->info();
-
-        return array(
-            Cache::STATS_HITS              => $info['Stats']['keyspace_hits'],
-            Cache::STATS_MISSES            => $info['Stats']['keyspace_misses'],
-            Cache::STATS_UPTIME            => $info['Server']['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['Memory']['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php

@@ -1,180 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use Redis;
-
-/**
- * Redis cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Osman Ungur <osmanungur@gmail.com>
- */
-class RedisCache extends CacheProvider
-{
-    /**
-     * @var Redis|null
-     */
-    private $redis;
-
-    /**
-     * Sets the redis instance to use.
-     *
-     * @param Redis $redis
-     *
-     * @return void
-     */
-    public function setRedis(Redis $redis)
-    {
-        $redis->setOption(Redis::OPT_SERIALIZER, $this->getSerializerValue());
-        $this->redis = $redis;
-    }
-
-    /**
-     * Gets the redis instance used by the cache.
-     *
-     * @return Redis|null
-     */
-    public function getRedis()
-    {
-        return $this->redis;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->redis->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $fetchedItems = array_combine($keys, $this->redis->mget($keys));
-
-        // Redis mget returns false for keys that do not exist. So we need to filter those out unless it's the real data.
-        $foundItems   = array();
-
-        foreach ($fetchedItems as $key => $value) {
-            if (false !== $value || $this->redis->exists($key)) {
-                $foundItems[$key] = $value;
-            }
-        }
-
-        return $foundItems;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime) {
-            $success = true;
-
-            // Keys have lifetime, use SETEX for each of them
-            foreach ($keysAndValues as $key => $value) {
-                if (!$this->redis->setex($key, $lifetime, $value)) {
-                    $success = false;
-                }
-            }
-
-            return $success;
-        }
-
-        // No lifetime, use MSET
-        return (bool) $this->redis->mset($keysAndValues);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return $this->redis->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            return $this->redis->setex($id, $lifeTime, $data);
-        }
-
-        return $this->redis->set($id, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->redis->delete($id) >= 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->redis->flushDB();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->redis->info();
-        return array(
-            Cache::STATS_HITS   => $info['keyspace_hits'],
-            Cache::STATS_MISSES => $info['keyspace_misses'],
-            Cache::STATS_UPTIME => $info['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-
-    /**
-     * Returns the serializer constant to use. If Redis is compiled with
-     * igbinary support, that is used. Otherwise the default PHP serializer is
-     * used.
-     *
-     * @return integer One of the Redis::SERIALIZER_* constants
-     */
-    protected function getSerializerValue()
-    {
-        if (defined('HHVM_VERSION')) {
-            return Redis::SERIALIZER_PHP;
-        }
-
-        if (defined('Redis::SERIALIZER_IGBINARY') && extension_loaded('igbinary')) {
-            return Redis::SERIALIZER_IGBINARY;
-        }
-
-        return Redis::SERIALIZER_PHP;
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php

@@ -1,250 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use Riak\Bucket;
-use Riak\Connection;
-use Riak\Input;
-use Riak\Exception;
-use Riak\Object;
-
-/**
- * Riak cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  1.1
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class RiakCache extends CacheProvider
-{
-    const EXPIRES_HEADER = 'X-Riak-Meta-Expires';
-
-    /**
-     * @var \Riak\Bucket
-     */
-    private $bucket;
-
-    /**
-     * Sets the riak bucket instance to use.
-     *
-     * @param \Riak\Bucket $bucket
-     */
-    public function __construct(Bucket $bucket)
-    {
-        $this->bucket = $bucket;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        try {
-            $response = $this->bucket->get($id);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            // Check for attempted siblings
-            $object = ($response->hasSiblings())
-                ? $this->resolveConflict($id, $response->getVClock(), $response->getObjectList())
-                : $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return unserialize($object->getContent());
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\ConnectionException
-            // - Riak\CommunicationException
-            // - Riak\UnexpectedResponseException
-            // - Riak\NotFoundException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        try {
-            // We only need the HEAD, not the entire object
-            $input = new Input\GetInput();
-
-            $input->setReturnHead(true);
-
-            $response = $this->bucket->get($id, $input);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            $object = $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        try {
-            $object = new Object($id);
-
-            $object->setContent(serialize($data));
-
-            if ($lifeTime > 0) {
-                $object->addMetadata(self::EXPIRES_HEADER, (string) (time() + $lifeTime));
-            }
-
-            $this->bucket->put($object);
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        try {
-            $this->bucket->delete($id);
-
-            return true;
-        } catch (Exception\BadArgumentsException $e) {
-            // Key did not exist on cluster already
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\Exception\ConnectionException
-            // - Riak\Exception\CommunicationException
-            // - Riak\Exception\UnexpectedResponseException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        try {
-            $keyList = $this->bucket->getKeyList();
-
-            foreach ($keyList as $key) {
-                $this->bucket->delete($key);
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // Only exposed through HTTP stats API, not Protocol Buffers API
-        return null;
-    }
-
-    /**
-     * Check if a given Riak Object have expired.
-     *
-     * @param \Riak\Object $object
-     *
-     * @return bool
-     */
-    private function isExpired(Object $object)
-    {
-        $metadataMap = $object->getMetadataMap();
-
-        return isset($metadataMap[self::EXPIRES_HEADER])
-            && $metadataMap[self::EXPIRES_HEADER] < time();
-    }
-
-    /**
-     * On-read conflict resolution. Applied approach here is last write wins.
-     * Specific needs may override this method to apply alternate conflict resolutions.
-     *
-     * {@internal Riak does not attempt to resolve a write conflict, and store
-     * it as sibling of conflicted one. By following this approach, it is up to
-     * the next read to resolve the conflict. When this happens, your fetched
-     * object will have a list of siblings (read as a list of objects).
-     * In our specific case, we do not care about the intermediate ones since
-     * they are all the same read from storage, and we do apply a last sibling
-     * (last write) wins logic.
-     * If by any means our resolution generates another conflict, it'll up to
-     * next read to properly solve it.}
-     *
-     * @param string $id
-     * @param string $vClock
-     * @param array  $objectList
-     *
-     * @return \Riak\Object
-     */
-    protected function resolveConflict($id, $vClock, array $objectList)
-    {
-        // Our approach here is last-write wins
-        $winner = $objectList[count($objectList)];
-
-        $putInput = new Input\PutInput();
-        $putInput->setVClock($vClock);
-
-        $mergedObject = new Object($id);
-        $mergedObject->setContent($winner->getContent());
-
-        $this->bucket->put($mergedObject, $putInput);
-
-        return $mergedObject;
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php

@@ -1,220 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use SQLite3;
-use SQLite3Result;
-
-/**
- * SQLite3 cache provider.
- *
- * @since  1.4
- * @author Jake Bell <jake@theunraveler.com>
- */
-class SQLite3Cache extends CacheProvider
-{
-    /**
-     * The ID field will store the cache key.
-     */
-    const ID_FIELD = 'k';
-
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a date value indicating when the
-     * cache entry should expire.
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var SQLite3
-     */
-    private $sqlite;
-
-    /**
-     * @var string
-     */
-    private $table;
-
-    /**
-     * Constructor.
-     *
-     * Calling the constructor will ensure that the database file and table 
-     * exist and will create both if they don't.
-     *
-     * @param SQLite3 $sqlite
-     * @param string $table
-     */
-    public function __construct(SQLite3 $sqlite, $table)
-    {
-        $this->sqlite = $sqlite;
-        $this->table  = (string) $table;
-
-        list($id, $data, $exp) = $this->getFields();
-
-        return $this->sqlite->exec(sprintf(
-            'CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY NOT NULL, %s BLOB, %s INTEGER)',
-            $table,
-            $id,
-            $data,
-            $exp
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        if ($item = $this->findById($id)) {
-            return unserialize($item[self::DATA_FIELD]);
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return null !== $this->findById($id, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $statement = $this->sqlite->prepare(sprintf(
-            'INSERT OR REPLACE INTO %s (%s) VALUES (:id, :data, :expire)',
-            $this->table,
-            implode(',', $this->getFields())
-        ));
-
-        $statement->bindValue(':id', $id);
-        $statement->bindValue(':data', serialize($data), SQLITE3_BLOB);
-        $statement->bindValue(':expire', $lifeTime > 0 ? time() + $lifeTime : null);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        list($idField) = $this->getFields();
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'DELETE FROM %s WHERE %s = :id',
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->sqlite->exec(sprintf('DELETE FROM %s', $this->table));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // no-op.
-    }
-
-    /**
-     * Find a single row by ID.
-     *
-     * @param mixed $id
-     * @param bool $includeData
-     *
-     * @return array|null
-     */
-    private function findById($id, $includeData = true)
-    {
-        list($idField) = $fields = $this->getFields();
-
-        if (!$includeData) {
-            $key = array_search(static::DATA_FIELD, $fields);
-            unset($fields[$key]);
-        }
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'SELECT %s FROM %s WHERE %s = :id LIMIT 1',
-            implode(',', $fields),
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id, SQLITE3_TEXT);
-
-        $item = $statement->execute()->fetchArray(SQLITE3_ASSOC);
-
-        if ($item === false) {
-            return null;
-        }
-
-        if ($this->isExpired($item)) {
-            $this->doDelete($id);
-
-            return null;
-        }
-
-        return $item;
-    }
-
-    /**
-     * Gets an array of the fields in our table.
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        return array(static::ID_FIELD, static::DATA_FIELD, static::EXPIRATION_FIELD);
-    }
-
-    /**
-     * Check if the item is expired.
-     *
-     * @param array $item
-     *
-     * @return bool
-     */
-    private function isExpired(array $item)
-    {
-        return isset($item[static::EXPIRATION_FIELD]) &&
-            $item[self::EXPIRATION_FIELD] !== null &&
-            $item[self::EXPIRATION_FIELD] < time();
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php

@@ -1,25 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-class Version
-{
-    const VERSION = '1.6.1-DEV';
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php

@@ -1,78 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Void cache driver. The cache could be of use in tests where you don`t need to cache anything.
- *
- * @link   www.doctrine-project.org
- * @since  1.5
- * @author Kotlyar Maksim <kotlyar.maksim@gmail.com>
- */
-class VoidCache extends CacheProvider
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        return;
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php

@@ -1,109 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * WinCache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class WinCacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return wincache_ucache_get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return wincache_ucache_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return wincache_ucache_set($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return wincache_ucache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return wincache_ucache_clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return wincache_ucache_get($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = wincache_ucache_set($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info    = wincache_ucache_info();
-        $meminfo = wincache_ucache_meminfo();
-
-        return array(
-            Cache::STATS_HITS             => $info['total_hit_count'],
-            Cache::STATS_MISSES           => $info['total_miss_count'],
-            Cache::STATS_UPTIME           => $info['total_cache_uptime'],
-            Cache::STATS_MEMORY_USAGE     => $meminfo['memory_total'],
-            Cache::STATS_MEMORY_AVAILABLE => $meminfo['memory_free'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php

@@ -1,112 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Xcache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class XcacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->doContains($id) ? unserialize(xcache_get($id)) : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return xcache_isset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return xcache_set($id, serialize($data), (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return xcache_unset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->checkAuthorization();
-
-        xcache_clear_cache(XC_TYPE_VAR);
-
-        return true;
-    }
-
-    /**
-     * Checks that xcache.admin.enable_auth is Off.
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException When xcache.admin.enable_auth is On.
-     */
-    protected function checkAuthorization()
-    {
-        if (ini_get('xcache.admin.enable_auth')) {
-            throw new \BadMethodCallException(
-                'To use all features of \Doctrine\Common\Cache\XcacheCache, '
-                . 'you must set "xcache.admin.enable_auth" to "Off" in your php.ini.'
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $this->checkAuthorization();
-
-        $info = xcache_info(XC_TYPE_VAR, 0);
-        return array(
-            Cache::STATS_HITS   => $info['hits'],
-            Cache::STATS_MISSES => $info['misses'],
-            Cache::STATS_UPTIME => null,
-            Cache::STATS_MEMORY_USAGE      => $info['size'],
-            Cache::STATS_MEMORY_AVAILABLE  => $info['avail'],
-        );
-    }
-}

vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php

@@ -1,83 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Zend Data Cache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Ralph Schindler <ralph.schindler@zend.com>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class ZendDataCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return zend_shm_cache_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (false !== zend_shm_cache_fetch($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return zend_shm_cache_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return zend_shm_cache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $namespace = $this->getNamespace();
-        if (empty($namespace)) {
-            return zend_shm_cache_clear();
-        }
-        return zend_shm_cache_clear($namespace);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return null;
-    }
-}

version

@@ -1,7 +1,25 @@
+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，这样可以跟以前一样自动跳到第一个盘。
+20200816-1145.24
+add platform: Baidu CFC. add setting: mobile background.
+新增百度CFC平台。可以分别设置PC与手机的背景。
+20200808-1130.23
+FG: select save in env or file.
+在FG中安装时，选择配置保存在环境变量还是文件中。
+20200806-1130.23
+SCF: select save in env or file.
+在SCF中安装时，选择配置保存在环境变量还是文件中。
 20200804-1453.22
 fix: once error will stop the after files in uploading multy files. SCF can get region now, change install. SCF config save in code file now not in env, <font color=red>if use SCF, you must reinstall after update</font>.
 修复，当上传多个文件时，一个文件出错将导致后续文件不再上传。SCF可以获取到region了，安装过程修改。在SCF中，现在将配置保存到代码文件中，不受环境变量4K大小限制，<font color=red>升级后，用SCF的要重装</font>。
-
 20200723-1430.21
 fix content-type in "?json". can not custom microsoft API id & secret by a link now, so show the return uri.
 当使用"?json"时，现在content-type是json了。现在微软不能一键创建API应用了，提供回调URI。

web.config

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <rewrite>
+            <rules>
+                <rule name="OneManagerIISRewrite" patternSyntax="Wildcard" stopProcessing="true">
+                    <match url="*" />
+                    <action type="Rewrite" url="index.php" appendQueryString="false" logRewrittenUrl="false" />
+                </rule>
+            </rules>
+        </rewrite>
+    </system.webServer>
+</configuration>

writeable.sh

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