in multy disk, only json can visit root, other will jump to first disk

Fix Bug for renexmoe

.htaccess

@@ -1,15 +1,15 @@
-# apache
-# LoadModule rewrite_module modules/mod_rewrite.so
-# AllowOverride All
+# # Apache
+# # LoadModule rewrite_module modules/mod_rewrite.so
+# # AllowOverride All
 RewriteEngine On
 RewriteRule ^(.*) index.php?/$1 [L]
 
-#-----------------------------------
-# nginx
+###-----------------------------------
+# # nginx
 # rewrite ^(.*) /index.php?/$1 last;
 #
-# caddy
+# # caddy
 # rewrite {
 #     to index.php?/$1
 # }
-#-----------------------------------
+###-----------------------------------

common.php

@@ -1,17 +1,27 @@
 <?php
 
+global $Base64Env;
+global $CommonEnv;
+global $ShowedCommonEnv;
+global $InnerEnv;
+global $ShowedInnerEnv;
+global $Base64Env;
+
 $Base64Env = [
     //'APIKey', // used in heroku.
-    //'Region', // used in SCF.
     //'SecretId', // used in SCF.
     //'SecretKey', // used in SCF.
     //'AccessKeyID', // used in FC.
     //'AccessKeySecret', // used in FC.
+    //'HW_urn', // used in FG.
+    //'HW_key', // used in FG.
+    //'HW_secret', // used in FG.
     //'admin',
     //'adminloginpage',
     'background',
     'diskname',
     //'disableShowThumb',
+    //'disableChangeTheme',
     //'disktag',
     //'downloadencrypt',
     //'function_name', // used in heroku.
@@ -43,16 +53,19 @@ $Base64Env = [
 
 $CommonEnv = [
     'APIKey', // used in heroku.
-    'Region', // used in SCF.
     'SecretId', // used in SCF.
     'SecretKey', // used in SCF.
     'AccessKeyID', // used in FC.
     'AccessKeySecret', // used in FC.
+    'HW_urn', // used in FG.
+    'HW_key', // used in FG.
+    'HW_secret', // used in FG.
     'admin',
     'adminloginpage',
     'background',
     'disktag',
     'disableShowThumb',
+    'disableChangeTheme',
     'function_name', // used in heroku.
     'hideFunctionalityFile',
     'timezone',
@@ -66,16 +79,19 @@ $CommonEnv = [
 
 $ShowedCommonEnv = [
     //'APIKey', // used in heroku.
-    //'Region', // used in SCF.
     //'SecretId', // used in SCF.
     //'SecretKey', // used in SCF.
     //'AccessKeyID', // used in FC.
     //'AccessKeySecret', // used in FC.
+    //'HW_urn', // used in FG.
+    //'HW_key', // used in FG.
+    //'HW_secret', // used in FG.
     //'admin',
     'adminloginpage',
     'background',
     //'disktag',
     'disableShowThumb',
+    'disableChangeTheme',
     //'function_name', // used in heroku.
     'hideFunctionalityFile',
     'timezone',
@@ -228,11 +244,24 @@ function main($path)
             return output('<script>alert(\''.getconstStr('SetSecretsFirst').'\');</script>', 302, [ 'Location' => $url ]);
         }
 
+    $_SERVER['sitename'] = getConfig('sitename');
+    if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
     $_SERVER['base_disk_path'] = $_SERVER['base_path'];
     $disktags = explode("|",getConfig('disktag'));
 //    echo 'count$disk:'.count($disktags);
     if (count($disktags)>1) {
-        if ($path=='/'||$path=='') return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
+        if ($path=='/'||$path=='') {
+            if ($_GET['json']) {
+                // return a json
+                $files['folder']['childCount'] = count($disktags);
+                foreach ($disktags as $disktag) {
+                    $files['children'][$disktag]['folder'] = 1;
+                    $files['children'][$disktag]['name'] = $disktag;
+                }
+                return files_json($files);
+            } // else return render_list($path, $files);
+            return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
+        }
         $_SERVER['disktag'] = splitfirst( substr(path_format($path), 1), '/' )[0];
         //$pos = strpos($path, '/');
         //if ($pos>1) $_SERVER['disktag'] = substr($path, 0, $pos);
@@ -420,7 +449,7 @@ function files_json($files)
             array_push($tmp['list'], $tmp1);
         }
     } else return output('', 404);
-    return output(json_encode($tmp));
+    return output(json_encode($tmp), 200, ['Content-Type' => 'application/json']);
 }
 
 function get_access_token($refresh_token)
@@ -445,20 +474,29 @@ function get_access_token($refresh_token)
             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']);
         }
-        error_log('['.$_SERVER['disktag'].'] Get access token:'.json_encode($ret, JSON_PRETTY_PRINT));
+        $tmp = $ret;
+        $tmp['access_token'] = '******';
+        error_log('['.$_SERVER['disktag'].'] Get access token:'.json_encode($tmp, JSON_PRETTY_PRINT));
         savecache('access_token', $_SERVER['access_token']);
-        $tmp = [];
-        $tmp['shareapiurl'] = $_SERVER['api_url'];
-        if (getConfig('shareapiurl')=='') setConfig($tmp);
+        $tmp1 = [];
+        $tmp1['shareapiurl'] = $_SERVER['api_url'];
+        if (getConfig('shareapiurl')=='') setConfig($tmp1);
     } else {
-        $response = curl_request( $_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=' . $refresh_token );
+        $p=0;
+        while ($response['stat']==0&&$p<3) {
+            $response = curl_request( $_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=' . $refresh_token );
+            $p++;
+        }
         if ($response['stat']==200) $ret = json_decode($response['body'], true);
         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=' . $refresh_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']);
         }
-        error_log('['.$_SERVER['disktag'].'] Get access token:'.json_encode($ret, JSON_PRETTY_PRINT));
+        $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);
         if (time()>getConfig('token_expires')) setConfig([ 'refresh_token' => $ret['refresh_token'], 'token_expires' => time()+7*24*60*60 ]);
@@ -517,8 +555,6 @@ function getconstStr($str)
 
 function config_oauth()
 {
-    $_SERVER['sitename'] = getConfig('sitename');
-    if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
     $_SERVER['redirect_uri'] = 'https://scfonedrive.github.io';
     if (getConfig('Drive_ver')=='shareurl') {
         $_SERVER['api_url'] = getConfig('shareapiurl');
@@ -1500,12 +1536,12 @@ function get_refresh_token()
         }
     }
 
-    if ($constStr['language']!='zh-cn') {
-        $linklang='en-us';
-    } else $linklang='zh-cn';
-    $ru = "https://developer.microsoft.com/".$linklang."/graph/quick-start?appID=_appId_&appName=_appName_&redirectUrl=".$_SERVER['redirect_uri']."&platform=option-php";
-    $deepLink = "/quickstart/graphIO?publicClientSupport=false&appName=OneManager&redirectUrl=".$_SERVER['redirect_uri']."&allowImplicitFlow=false&ru=".urlencode($ru);
-    $app_url = "https://apps.dev.microsoft.com/?deepLink=".urlencode($deepLink);
+    //if ($constStr['language']!='zh-cn') {
+    //    $linklang='en-us';
+    //} else $linklang='zh-cn';
+    //$ru = "https://developer.microsoft.com/".$linklang."/graph/quick-start?appID=_appId_&appName=_appName_&redirectUrl=".$_SERVER['redirect_uri']."&platform=option-php";
+    //$deepLink = "/quickstart/graphIO?publicClientSupport=false&appName=OneManager&redirectUrl=".$_SERVER['redirect_uri']."&allowImplicitFlow=false&ru=".urlencode($ru);
+    //$app_url = "https://apps.dev.microsoft.com/?deepLink=".urlencode($deepLink);
     $html = '
 <div>
     <form action="?AddDisk&install0" method="post" onsubmit="return notnull(this);">
@@ -1513,7 +1549,7 @@ function get_refresh_token()
         '.getconstStr('OnedriveDiskName').':<input type="text" name="diskname" placeholder="' . getconstStr('EnvironmentsDescription')['diskname'] . '" style="width:100%"><br>
         <br>
         <div>
-            <label><input type="radio" name="Drive_ver" value="MS" checked onclick="document.getElementById(\'morecustom\').style.display=\'\';document.getElementById(\'inputshareurl\').style.display=\'none\';">MS: '.getconstStr('DriveVerMS').'</label><br>
+            <label><input type="radio" name="Drive_ver" value="MS" onclick="document.getElementById(\'morecustom\').style.display=\'\';document.getElementById(\'inputshareurl\').style.display=\'none\';">MS: '.getconstStr('DriveVerMS').'</label><br>
             <label><input type="radio" name="Drive_ver" value="CN" onclick="document.getElementById(\'morecustom\').style.display=\'\';document.getElementById(\'inputshareurl\').style.display=\'none\';">CN: '.getconstStr('DriveVerCN').'</label><br>
             <label><input type="radio" name="Drive_ver" value="shareurl" onclick="document.getElementById(\'inputshareurl\').style.display=\'\';document.getElementById(\'morecustom\').style.display=\'none\';">ShareUrl: '.getconstStr('DriveVerShareurl').'</label><br>
         </div>
@@ -1522,12 +1558,12 @@ function get_refresh_token()
             '.getconstStr('UseShareLink').'
             <input type="text" name="shareurl" style="width:100%" placeholder="https://xxxx.sharepoint.com/:f:/g/personal/xxxxxxxx/mmmmmmmmm?e=XXXX"><br>
         </div>
-        <div id="morecustom">
+        <div id="morecustom" style="display:none;">
             <label><input type="checkbox" name="Drive_custom" onclick="document.getElementById(\'secret\').style.display=(this.checked?\'\':\'none\');">'.getconstStr('CustomIdSecret').'</label><br>
             <div id="secret" style="display:none;margin:10px 35px">
-                <a href="'.$app_url.'" target="_blank">'.getconstStr('GetSecretIDandKEY').'</a><br>
+                return uri: https://scfonedrive.github.io/<br>
+                client_id:<input type="text" name="client_id" placeholder="a1b2c345-90ab-cdef-ghij-klmnopqrstuv"><br>
                 client_secret:<input type="text" name="client_secret"><br>
-                client_id:<input type="text" name="client_id" placeholder="12345678-90ab-cdef-ghij-klmnopqrstuv"><br>
             </div>
             <label><input type="checkbox" name="usesharepoint" onclick="document.getElementById(\'sharepoint\').style.display=(this.checked?\'\':\'none\');">'.getconstStr('UseSharepointInstead').'</label><br>
             <div id="sharepoint" style="display:none;margin:10px 35px">
@@ -1575,7 +1611,10 @@ function get_refresh_token()
                     }
                 }
             }
-            document.cookie=\'disktag=\'+t.disktag_add.value+\'; path=/\';
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'disktag=\'+t.disktag_add.value+\'; path=/; \'+expires;
             return true;
         }
     </script>';
@@ -1593,7 +1632,7 @@ function EnvOpt($needUpdate = 0)
     asort($ShowedInnerEnv);
     $html = '<title>OneManager '.getconstStr('Setup').'</title>';
     if (isset($_POST['updateProgram'])&&$_POST['updateProgram']==getconstStr('updateProgram')) {
-        $response = OnekeyUpate($_POST['auth'], $_POST['project'], $_POST['branch']);
+        $response = setConfigResponse(OnekeyUpate($_POST['auth'], $_POST['project'], $_POST['branch']));
         if (api_error($response)) {
             $html = api_error_msg($response);
             $title = 'Error';
@@ -1666,7 +1705,7 @@ function EnvOpt($needUpdate = 0)
             </td>
         </tr>';
         } elseif ($key=='theme') {
-            $theme_arr = scandir('theme');
+            $theme_arr = scandir(__DIR__.'/theme');
             $html .= '
         <tr>
             <td><label>' . $key . '</label></td>
@@ -1711,8 +1750,8 @@ function EnvOpt($needUpdate = 0)
     <form action="" method="post">
         <tr>
             <td colspan="2">'.$disktag.'：
-            <input type="hidden" name="disktag_del" value="'.$disktag.'">
-            <input type="submit" name="submit1" value="'.getconstStr('DelDisk').'">
+                <input type="hidden" name="disktag_del" value="'.$disktag.'">
+                <input type="submit" name="submit1" value="'.getconstStr('DelDisk').'">
             </td>
         </tr>
     </form>';
@@ -1730,6 +1769,11 @@ function EnvOpt($needUpdate = 0)
                 $html .= '
         <tr><td><input type="submit" name="submit1" value="'.getconstStr('Setup').'"></td></tr>
     </form>';
+            } else {
+                $html .= '
+    <tr>
+        <td colspan="2">Please add this disk again.</td>
+    </tr>';
             }
             $html .= '
 </table><br>';
@@ -1745,6 +1789,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['_APP_SHARE_DIR']==='/var/share/CFF/processrouter') {
+        $canOneKeyUpate = 1;
     } else {
         $tmp = time();
         if ( mkdir(''.$tmp, 0777) ) {
@@ -1859,23 +1905,23 @@ 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 ( $theme=='' ) {
         $tmp = getConfig('customTheme');
         if ( $tmp!='' ) $theme = $tmp;
     }
     if ( $theme=='' ) {
         $theme = getConfig('theme');
-        if ( $theme=='' || !file_exists('theme/'.$theme) ) $theme = 'classic.html';
+        if ( $theme=='' || !file_exists(__DIR__.'/theme/'.$theme) ) $theme = 'classic.html';
     }
     if (substr($theme,-4)=='.php') {
         @ob_start();
         include 'theme/'.$theme;
         $html = ob_get_clean();
     } else {
-        if (file_exists('theme/'.$theme)) {
-            $file_path = 'theme/'.$theme;
+        if (file_exists(__DIR__.'/theme/'.$theme)) {
+            $file_path = __DIR__.'/theme/'.$theme;
             $html = file_get_contents($file_path);
         } else {
             if (!($html = getcache('customTheme'))) {
@@ -1890,9 +1936,6 @@ function render_list($path = '', $files = '')
             }
             
         }
-        //$fp = fopen($file_path,"r");
-        //$html = fread($fp,filesize($file_path));
-        //fclose($fp);
 
         $tmp = splitfirst($html, '<!--IconValuesStart-->');
         $html = $tmp[0];
@@ -2108,7 +2151,70 @@ function render_list($path = '', $files = '')
             }
         }
 
-        if (isset($files['children'])) {
+        if (isset($files['file'])) {
+            while (strpos($html, '<!--GuestUploadStart-->')) {
+                $tmp = splitfirst($html, '<!--GuestUploadStart-->');
+                $html = $tmp[0];
+                $tmp = splitfirst($tmp[1], '<!--GuestUploadEnd-->');
+                $html .= $tmp[1];
+            }
+            $tmp = splitfirst($html, '<!--EncryptedStart-->');
+            $html = $tmp[0];
+            $tmp = splitfirst($tmp[1], '<!--EncryptedEnd-->');
+            $html .= $tmp[1];
+
+            $tmp[1] = 'a';
+            while ($tmp[1]!='') {
+                $tmp = splitfirst($html, '<!--IsFolderStart-->');
+                $html = $tmp[0];
+                $tmp = splitfirst($tmp[1], '<!--IsFolderEnd-->');
+                $html .= $tmp[1];
+            }
+            while (strpos($html, '<!--IsFileStart-->')) {
+                $html = str_replace('<!--IsFileStart-->', '', $html);
+                $html = str_replace('<!--IsFileEnd-->', '', $html);
+            }
+            $html = str_replace('<!--FileEncodeUrl-->', str_replace('%2523', '%23', str_replace('%26amp%3B','&amp;',spurlencode(path_format($_SERVER['base_disk_path'] . '/' . $path), '/'))), $html);
+            $html = str_replace('<!--FileUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
+            
+            $ext = strtolower(substr($path, strrpos($path, '.') + 1));
+            if (in_array($ext, $exts['img'])) $ext = 'img';
+            elseif (in_array($ext, $exts['video'])) $ext = 'video';
+            elseif (in_array($ext, $exts['music'])) $ext = 'music';
+            //elseif (in_array($ext, $exts['pdf'])) $ext = 'pdf';
+            elseif ($ext=='pdf') $ext = 'pdf';
+            elseif (in_array($ext, $exts['office'])) $ext = 'office';
+            elseif (in_array($ext, $exts['txt'])) $ext = 'txt';
+            else $ext = 'Other';
+            $previewext = ['img', 'video', 'music', 'pdf', 'office', 'txt', 'Other'];
+            $previewext = array_diff($previewext, [ $ext ]);
+            foreach ($previewext as $ext1) {
+                $tmp[1] = 'a';
+                while ($tmp[1]!='') {
+                    $tmp = splitfirst($html, '<!--Is'.$ext1.'FileStart-->');
+                    $html = $tmp[0];
+                    $tmp = splitfirst($tmp[1], '<!--Is'.$ext1.'FileEnd-->');
+                    $html .= $tmp[1];
+                }
+            }
+            while (strpos($html, '<!--Is'.$ext.'FileStart-->')) {
+                $html = str_replace('<!--Is'.$ext.'FileStart-->', '', $html);
+                $html = str_replace('<!--Is'.$ext.'FileEnd-->', '', $html);
+            }
+            //while (strpos($html, '<!--FileDownUrl-->')) $html = str_replace('<!--FileDownUrl-->', $files[$_SERVER['DownurlStrName']], $html);
+            while (strpos($html, '<!--FileDownUrl-->')) $html = str_replace('<!--FileDownUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
+            while (strpos($html, '<!--FileEncodeReplaceUrl-->')) $html = str_replace('<!--FileEncodeReplaceUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
+            while (strpos($html, '<!--FileName-->')) $html = str_replace('<!--FileName-->', $files['name'], $html);
+            $html = str_replace('<!--FileEncodeDownUrl-->', urlencode($files[$_SERVER['DownurlStrName']]), $html);
+            $html = str_replace('<!--constStr@ClicktoEdit-->', getconstStr('ClicktoEdit'), $html);
+            $html = str_replace('<!--constStr@CancelEdit-->', getconstStr('CancelEdit'), $html);
+            $html = str_replace('<!--constStr@Save-->', getconstStr('Save'), $html);
+            while (strpos($html, '<!--TxtContent-->')) $html = str_replace('<!--TxtContent-->', htmlspecialchars(curl_request($files[$_SERVER['DownurlStrName']])['body']), $html);
+            $html = str_replace('<!--constStr@FileNotSupport-->', getconstStr('FileNotSupport'), $html);
+
+
+            //$html = str_replace('<!--constStr@File-->', getconstStr('File'), $html);
+        } elseif (isset($files['children'])) {
             while (strpos($html, '<!--GuestUploadStart-->')) {
                 $tmp = splitfirst($html, '<!--GuestUploadStart-->');
                 $html = $tmp[0];
@@ -2259,69 +2365,6 @@ function render_list($path = '', $files = '')
                 }
             }
             
-        } elseif (isset($files['file'])) {
-            while (strpos($html, '<!--GuestUploadStart-->')) {
-                $tmp = splitfirst($html, '<!--GuestUploadStart-->');
-                $html = $tmp[0];
-                $tmp = splitfirst($tmp[1], '<!--GuestUploadEnd-->');
-                $html .= $tmp[1];
-            }
-            $tmp = splitfirst($html, '<!--EncryptedStart-->');
-            $html = $tmp[0];
-            $tmp = splitfirst($tmp[1], '<!--EncryptedEnd-->');
-            $html .= $tmp[1];
-
-            $tmp[1] = 'a';
-            while ($tmp[1]!='') {
-                $tmp = splitfirst($html, '<!--IsFolderStart-->');
-                $html = $tmp[0];
-                $tmp = splitfirst($tmp[1], '<!--IsFolderEnd-->');
-                $html .= $tmp[1];
-            }
-            while (strpos($html, '<!--IsFileStart-->')) {
-                $html = str_replace('<!--IsFileStart-->', '', $html);
-                $html = str_replace('<!--IsFileEnd-->', '', $html);
-            }
-            $html = str_replace('<!--FileEncodeUrl-->', str_replace('%2523', '%23', str_replace('%26amp%3B','&amp;',spurlencode(path_format($_SERVER['base_disk_path'] . '/' . $path), '/'))), $html);
-            $html = str_replace('<!--FileUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
-            
-            $ext = strtolower(substr($path, strrpos($path, '.') + 1));
-            if (in_array($ext, $exts['img'])) $ext = 'img';
-            elseif (in_array($ext, $exts['video'])) $ext = 'video';
-            elseif (in_array($ext, $exts['music'])) $ext = 'music';
-            //elseif (in_array($ext, $exts['pdf'])) $ext = 'pdf';
-            elseif ($ext=='pdf') $ext = 'pdf';
-            elseif (in_array($ext, $exts['office'])) $ext = 'office';
-            elseif (in_array($ext, $exts['txt'])) $ext = 'txt';
-            else $ext = 'Other';
-            $previewext = ['img', 'video', 'music', 'pdf', 'office', 'txt', 'Other'];
-            $previewext = array_diff($previewext, [ $ext ]);
-            foreach ($previewext as $ext1) {
-                $tmp[1] = 'a';
-                while ($tmp[1]!='') {
-                    $tmp = splitfirst($html, '<!--Is'.$ext1.'FileStart-->');
-                    $html = $tmp[0];
-                    $tmp = splitfirst($tmp[1], '<!--Is'.$ext1.'FileEnd-->');
-                    $html .= $tmp[1];
-                }
-            }
-            while (strpos($html, '<!--Is'.$ext.'FileStart-->')) {
-                $html = str_replace('<!--Is'.$ext.'FileStart-->', '', $html);
-                $html = str_replace('<!--Is'.$ext.'FileEnd-->', '', $html);
-            }
-            //while (strpos($html, '<!--FileDownUrl-->')) $html = str_replace('<!--FileDownUrl-->', $files[$_SERVER['DownurlStrName']], $html);
-            while (strpos($html, '<!--FileDownUrl-->')) $html = str_replace('<!--FileDownUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
-            while (strpos($html, '<!--FileEncodeReplaceUrl-->')) $html = str_replace('<!--FileEncodeReplaceUrl-->', path_format($_SERVER['base_disk_path'] . '/' . $path), $html);
-            while (strpos($html, '<!--FileName-->')) $html = str_replace('<!--FileName-->', $files['name'], $html);
-            $html = str_replace('<!--FileEncodeDownUrl-->', urlencode($files[$_SERVER['DownurlStrName']]), $html);
-            $html = str_replace('<!--constStr@ClicktoEdit-->', getconstStr('ClicktoEdit'), $html);
-            $html = str_replace('<!--constStr@CancelEdit-->', getconstStr('CancelEdit'), $html);
-            $html = str_replace('<!--constStr@Save-->', getconstStr('Save'), $html);
-            while (strpos($html, '<!--TxtContent-->')) $html = str_replace('<!--TxtContent-->', htmlspecialchars(curl_request($files[$_SERVER['DownurlStrName']])['body']), $html);
-            $html = str_replace('<!--constStr@FileNotSupport-->', getconstStr('FileNotSupport'), $html);
-
-
-            //$html = str_replace('<!--constStr@File-->', getconstStr('File'), $html);
         }
 
         $html = str_replace('<!--constStr@language-->', $constStr['language'], $html);
@@ -2650,19 +2693,17 @@ function render_list($path = '', $files = '')
         $html = str_replace('<!--FootStr-->', date("Y-m-d H:i:s")." ".getconstStr('Week')[date("w")]." ".$_SERVER['REMOTE_ADDR'].' Runningtime:'.$exetime.'s Mem:'.size_format(memory_get_usage()), $html);
     }
 
-    $theme_arr = scandir('theme');
-    $html .= '
+    if ($_SERVER['admin']||!getConfig('disableChangeTheme')) {
+        $theme_arr = scandir(__DIR__.'/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)">
         <option value="">'.getconstStr('Theme').'</option>';
-    foreach ($theme_arr as $v1) {
-        if ($v1!='.' && $v1!='..') $html .= '
-        <option value="'.$v1.'" '.($v1==$theme?'selected="selected"':'').'>'.$v1.'</option>';
-    }
-    //$tmp = getConfig('customTheme');
-    //if ($tmp!='') $html .= '
-    //    <option value="" '.($tmp==$theme?'selected="selected"':'').'>customTheme</option>';
-    $html .= '
+        foreach ($theme_arr as $v1) {
+            if ($v1!='.' && $v1!='..') $html .= '
+        <option value="'.$v1.'"'.($v1==$theme?' selected="selected"':'').'>'.$v1.'</option>';
+        }
+        $html .= '
     </select>
 </div>
 <script type="text/javascript">
@@ -2675,6 +2716,7 @@ function render_list($path = '', $files = '')
         location.href = location.href;
     }
 </script>';
+    }
 
     $html = $authinfo . $html;
     if (isset($_SERVER['Set-Cookie'])) return output($html, $statusCode, [ 'Set-Cookie' => $_SERVER['Set-Cookie'], 'Content-Type' => 'text/html' ]);

conststr.php

@@ -1,5 +1,8 @@
 <?php
 
+global $exts;
+global $constStr;
+
 $exts['img'] = ['ico', 'bmp', 'gif', 'jpg', 'jpeg', 'jpe', 'jfif', 'tif', 'tiff', 'png', 'heic', 'webp'];
 $exts['music'] = ['mp3', 'wma', 'flac', 'ape', 'wav', 'ogg', 'm4a'];
 $exts['office'] = ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'];
@@ -10,7 +13,7 @@ $exts['zip'] = ['zip', 'rar', '7z', 'gz', 'tar'];
 $constStr = [
     'languages' => [
         'en-us' => 'English',
-        'zh-cn' => '中文',
+        'zh-cn' => '简体中文',
         'ja' => '日本語',
         'ko-kr' => '한국어',
         'fa' => 'فارسی',
@@ -73,6 +76,7 @@ $constStr = [
             'diskname' => 'The disk name you want show.',
             'disktag' => 'A tag used in store config and url.',
             'disableShowThumb' => 'if 1, the ShowThumbnail button will not display',
+            '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.',
             'theme' => 'Select theme.',
@@ -95,6 +99,7 @@ $constStr = [
             'diskname' => '这个盘你想显示什么名称。',
             'disktag' => '一个标签，用于保存配置，多盘时会显示在url中。',
             'disableShowThumb' => '如果填 1, ‘显示缩略’按钮将被隐藏。',
+            'disableChangeTheme' => '如果填 1, 主题选择切换将被隐藏',
             'downloadencrypt' => '0 或 1。如果 1, 那加密目录内的文件可以不需要密码就能下载。',
             'background' => '设置一个url作为背景。',
             'theme' => '选择一个主题。',
@@ -204,7 +209,7 @@ $constStr = [
         'zh-cn' => '先在环境变量设置passfile才能加密',
         'ja' => '最初に暗号化する環境変数にパスファイルを設定します',
         'ko-kr' => '암호화하기 전에 환경 변수에 패스 파일을 설정하십시오',
-        'fa' => 'قبل از رمزگذاری \ "pass file \" را در محیط تنظیم کنید',
+        'fa' => 'قبل از رمزگذاری \"pass file \" را در محیط تنظیم کنید',
     ],
     'updateProgram' => [
         'en-us' => 'Update Program',

index.php

@@ -8,8 +8,9 @@ include 'common.php';
 if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
     include 'platform/TencentSCF.php';
 } elseif (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') {
-    //echo '<pre>'. json_encode($_SERVER, JSON_PRETTY_PRINT).'</pre>';
     include 'platform/AliyunFC.php';
+} elseif ($_SERVER['_APP_SHARE_DIR']=='/var/share/CFF/processrouter') {
+    include 'platform/HuaweiFG.php';
 } elseif (isset($_SERVER['HEROKU_APP_DIR'])&&$_SERVER['HEROKU_APP_DIR']==='/app') {
     include 'platform/Heroku.php';
     $path = getpath();
@@ -56,31 +57,53 @@ function main_handler($event, $context)
     return main($path);
 }
 
-// Aliyun FC
-function handler($request, $context)
+// Aliyun FC & Huawei FG
+function handler($event, $context)
 {
-    set_error_handler("myErrorHandler");
-    $event = array(
-        'method' => $request->getMethod(),
-        'clientIP' => $request->getAttribute("clientIP"),
-        'requestURI' => $request->getAttribute("requestURI"),
-        'path' => spurlencode($request->getAttribute("path"), '/'),
-        'queryString' => $request->getQueryParams(),
-        'headers' => $request->getHeaders(),
-        'body' => $request->getBody()->getContents(),
-    );
-    $context = json_decode(json_encode($context), true);
-    printInput($event, $context);
-    unset($_POST);
-    unset($_GET);
-    unset($_COOKIE);
-    unset($_SERVER);
-    GetGlobalVariable($event);
-    $path = GetPathSetting($event, $context);
+    if (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') {
+        // Aliyun FC
+        set_error_handler("myErrorHandler");
+        $tmp = array(
+            'method' => $event->getMethod(),
+            'clientIP' => $event->getAttribute("clientIP"),
+            'eventURI' => $event->getAttribute("eventURI"),
+            'path' => spurlencode($event->getAttribute("path"), '/'),
+            'queryString' => $event->getQueryParams(),
+            'headers' => $event->getHeaders(),
+            'body' => $event->getBody()->getContents(),
+        );
+        $event = $tmp;
+        $context = json_decode(json_encode($context), true);
+        printInput($event, $context);
+        unset($_POST);
+        unset($_GET);
+        unset($_COOKIE);
+        unset($_SERVER);
+        GetGlobalVariable($event);
+        $path = GetPathSetting($event, $context);
 
-    $re = main($path);
+        $re = main($path);
 
-    return new RingCentral\Psr7\Response($re['statusCode'], $re['headers'], $re['body']);
+        return new RingCentral\Psr7\Response($re['statusCode'], $re['headers'], $re['body']);
+
+    } elseif ($_SERVER['_APP_SHARE_DIR']=='/var/share/CFF/processrouter') {
+        // Huawei FG
+        global $contextUserData;
+        $contextUserData = $context;
+        $event = json_decode(json_encode($event), true);
+        if ($event['isBase64Encoded']) $event['body'] = base64_decode($event['body']);
+
+        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 main($path);
+    }
 }
 
 // used by Aliyun FC
@@ -105,6 +128,5 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) {
         break;
     }
 
-    /* Don't execute PHP internal error handler */
     return true;
 }

platform/AliyunFC.php

@@ -124,9 +124,23 @@ function install()
         setConfig($tmp);
         if (needUpdate()) {
             OnekeyUpate();
-            return message('update to github version, reinstall.<script>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . $url . '">', 'Program updating', 201);
+            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>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+        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']!='') {
@@ -191,7 +205,10 @@ language:<br>';
         document.cookie="timezone="+timezone+"; path=/; "+expires;
         function changelanguage(str)
         {
-            document.cookie=\'language=\'+str+\'; path=/\';
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=\'+str+\'; path=/; \'+expires;
             location.href = location.href;
         }
         function notnull(t)
@@ -317,7 +334,7 @@ function api_error($response)
 
 function api_error_msg($response)
 {
-    return json_encode( $response, JSON_PRETTY_PRINT );
+    return $response;
     return $response['Error']['Code'] . '<br>
 ' . $response['Error']['Message'] . '<br><br>
 function_name:' . $_SERVER['function_name'] . '<br>
@@ -337,7 +354,7 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
     $outPath = '/tmp/';
 
     // 从github下载对应tar.gz，并解压
-    $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . $branch . '/';
+    $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);

platform/Heroku.php

@@ -126,7 +126,14 @@ function install()
                 $html = api_error_msg($response);
                 $title = 'Error';
             } else {
-                return output('Jump<meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+                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);
             }
             return message($html, $title, 201);
         }
@@ -156,7 +163,10 @@ language:<br>';
         document.cookie="timezone="+timezone+"; path=/; "+expires;
         function changelanguage(str)
         {
-            document.cookie=\'language=\'+str+\'; path=/\';
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=\'+str+\'; path=/; \'+expires;
             location.href = location.href;
         }
         function notnull(t)
@@ -250,8 +260,8 @@ function_name:' . $_SERVER['function_name'] . '<br>
 function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
 {
     //'https://github.com/qkqpttgf/OneManager-php/tarball/master/';
-    $source = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . $branch . '/';
-    return json_decode(updateHerokuapp(getConfig('function_name'), getConfig('APIKey'), $source)['body'], true);
+    $source = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
+    return updateHerokuapp(getConfig('function_name'), getConfig('APIKey'), $source);
 }
 
 function setConfigResponse($response)

platform/HuaweiFG.php

@@ -0,0 +1,743 @@
+<?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 equal_replace($env[$str],1);
+            else return $env[$str];
+        }
+    } else {
+        if (in_array($str, $Base64Env)) return equal_replace($contextUserData->getUserData($str),1);
+        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] = equal_replace($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] = equal_replace($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'));
+    // WaitSCFStat();
+    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;
+    if ($_GET['install2']) {
+        $tmp['admin'] = $_POST['admin'];
+        setConfig($tmp);
+        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'];
+            }
+            //$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 {
+                $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="password" 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('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 getfunctioninfo($HW_urn, $HW_key, $HW_secret)
+{
+    $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';
+    $signer = new Signer();
+    $signer->Key = $HW_key;
+    $signer->Secret = $HW_secret;
+    $req = new Request('GET', $url);
+    $req->headers = array(
+        'content-type' => 'application/json;charset=utf8',
+    );
+    $req->body = '';
+    $curl = $signer->Sign($req);
+    $response = curl_exec($curl);
+    $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+    curl_close($curl);
+    return $response;
+}
+
+
+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);
+
+    $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';
+    $signer = new Signer();
+    $signer->Key = $HW_key;
+    $signer->Secret = $HW_secret;
+    $req = new Request('PUT', $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);
+    $curl = $signer->Sign($req);
+    $response = curl_exec($curl);
+    $status = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+    curl_close($curl);
+    return $response;
+}
+
+function SetbaseConfig($Envs, $HW_urn, $HW_key, $HW_secret)
+{
+    //echo json_encode($Envs,JSON_PRETTY_PRINT);
+    $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);
+
+    // https://functiongraph.cn-north-4.myhuaweicloud.com/v2/{project_id}/fgs/functions/{function_urn}/config
+    $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';
+    $signer = new Signer();
+    $signer->Key = $HW_key;
+    $signer->Secret = $HW_secret;
+    $req = new Request('PUT', $url);
+    $req->headers = array(
+        'content-type' => 'application/json;charset=utf8',
+    );
+    $tmpdata['handler'] = 'index.handler';
+    $tmpdata['memory_size'] = 128;
+    $tmpdata['runtime'] = 'PHP7.3';
+    $tmpdata['timeout'] = 30;
+    $tmpdata['user_data'] = json_encode($tmp_env);
+    $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;
+}
+
+function updateProgram($HW_urn, $HW_key, $HW_secret, $source)
+{
+    $URN = explode(':', $HW_urn);
+    $Region = $URN[2];
+    $project_id = $URN[3];
+    $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->headers = array(
+        'content-type' => 'application/json;charset=utf8',
+    );
+    $tmpdata['code_type'] = 'zip';
+    $tmpdata['func_code']['file'] = base64_encode( file_get_contents($source) );
+    $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;
+}
+
+function api_error($response)
+{
+    return isset($response['error_code']);
+}
+
+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);//路径 要解压的文件 是否覆盖
+
+    // 获取解压出的目录名
+/*
+    @ob_start();
+    passthru('ls /tmp | grep '.$auth.'-'.$project.'',$stat);
+            $html.='状态：' . $stat . '
+    结果：
+    ';
+    $archivefolder = ob_get_clean();
+    if (substr($archivefolder,-1)==PHP_EOL) $archivefolder = substr($archivefolder, 0, -1);
+    $outPath .= $archivefolder;
+    $html.=htmlspecialchars($archivefolder);
+    //return $html;
+*/
+    $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);
+}
+
+
+
+
+
+
+
+
+define("BasicDateFormat", "Ymd\THis\Z");
+define("Algorithm", "SDK-HMAC-SHA256");
+define("HeaderXDate", "X-Sdk-Date");
+define("HeaderHost", "host");
+define("HeaderAuthorization", "Authorization");
+define("HeaderContentSha256", "X-Sdk-Content-Sha256");
+
+class Request
+{
+    public $method = '';
+    public $scheme = '';
+    public $host = '';
+    public $uri = '';
+    public $query = array();
+    public $headers = array();
+    public $body = '';
+
+    function __construct()
+    {
+        $args = func_get_args();
+        $i = count($args);
+        if ($i == 0) {
+            $this->construct(NULL, NULL, NULL, NULL);
+        } elseif ($i == 1) {
+            $this->construct($args[0], NULL, NULL, NULL);
+        } elseif ($i == 2) {
+            $this->construct($args[0], $args[1], NULL, NULL);
+        } elseif ($i == 3) {
+            $this->construct($args[0], $args[1], $args[2], NULL);
+        } else {
+            $this->construct($args[0], $args[1], $args[2], $args[3]);
+        }
+    }
+
+    function construct($method, $url, $headers, $body)
+    {
+        if ($method != NULL) {
+            $this->method = $method;
+        }
+        if ($url != NULL) {
+            $spl = explode("://", $url, 2);
+            $scheme = 'http';
+            if (count($spl) > 1) {
+                $scheme = $spl[0];
+                $url = $spl[1];
+            }
+            $spl = explode("?", $url, 2);
+            $url = $spl[0];
+            $query = array();
+            if (count($spl) > 1) {
+                foreach (explode("&", $spl[1]) as $kv) {
+                    $spl = explode("=", $kv, 2);
+                    $key = $spl[0];
+                    if (count($spl) == 1) {
+                        $value = "";
+                    } else {
+                        $value = $spl[1];
+                    }
+                    if ($key != "") {
+                        $key = urldecode($key);
+                        $value = urldecode($value);
+                        if (array_key_exists($key, $query)) {
+                            array_push($query[$key], $value);
+                        } else {
+                            $query[$key] = array($value);
+                        }
+                    }
+                }
+            }
+            $spl = explode("/", $url, 2);
+            $host = $spl[0];
+            if (count($spl) == 1) {
+                $url = "/";
+            } else {
+                $url = "/" . $spl[1];
+            }
+            $this->scheme = $scheme;
+            $this->host = $host;
+            $this->uri = urldecode($url);
+            $this->query = $query;
+        }
+        if ($headers != NULL) {
+            $this->headers = $headers;
+        }
+        if ($body != NULL) {
+            $this->body = $body;
+        }
+    }
+}
+
+class Signer
+{
+    public $Key = '';
+    public $Secret = '';
+
+    function escape($string)
+    {
+        $entities = array('+', "%7E");
+        $replacements = array('%20', "~");
+        return str_replace($entities, $replacements, urlencode($string));
+    }
+
+    function findHeader($r, $header)
+    {
+        foreach ($r->headers as $key => $value) {
+            if (!strcasecmp($key, $header)) {
+                return $value;
+            }
+        }
+        return NULL;
+    }
+
+// Build a CanonicalRequest from a regular request string
+//
+// CanonicalRequest =
+//  HTTPRequestMethod + '\n' +
+//  CanonicalURI + '\n' +
+//  CanonicalQueryString + '\n' +
+//  CanonicalHeaders + '\n' +
+//  SignedHeaders + '\n' +
+//  HexEncode(Hash(RequestPayload))
+    function CanonicalRequest($r, $signedHeaders)
+    {
+        $CanonicalURI = $this->CanonicalURI($r);
+        $CanonicalQueryString = $this->CanonicalQueryString($r);
+        $canonicalHeaders = $this->CanonicalHeaders($r, $signedHeaders);
+        $signedHeadersString = join(";", $signedHeaders);
+        $hash = $this->findHeader($r, HeaderContentSha256);
+        if (!$hash) {
+            $hash = hash("sha256", $r->body);
+        }
+        return "$r->method\n$CanonicalURI\n$CanonicalQueryString\n$canonicalHeaders\n$signedHeadersString\n$hash";
+    }
+
+// CanonicalURI returns request uri
+    function CanonicalURI($r)
+    {
+        $pattens = explode("/", $r->uri);
+        $uri = array();
+        foreach ($pattens as $v) {
+            array_push($uri, $this->escape($v));
+        }
+        $urlpath = join("/", $uri);
+        if (substr($urlpath, -1) != "/") {
+            $urlpath = $urlpath . "/";
+        }
+        return $urlpath;
+    }
+
+// CanonicalQueryString
+    function CanonicalQueryString($r)
+    {
+        $keys = array();
+        foreach ($r->query as $key => $value) {
+            array_push($keys, $key);
+        }
+        sort($keys);
+        $a = array();
+        foreach ($keys as $key) {
+            $k = $this->escape($key);
+            $value = $r->query[$key];
+            if (is_array($value)) {
+                sort($value);
+                foreach ($value as $v) {
+                    $kv = "$k=" . $this->escape($v);
+                    array_push($a, $kv);
+                }
+            } else {
+                $kv = "$k=" . $this->escape($value);
+                array_push($a, $kv);
+            }
+        }
+        return join("&", $a);
+    }
+
+// CanonicalHeaders
+    function CanonicalHeaders($r, $signedHeaders)
+    {
+        $headers = array();
+        foreach ($r->headers as $key => $value) {
+            $headers[strtolower($key)] = trim($value);
+        }
+        $a = array();
+        foreach ($signedHeaders as $key) {
+            array_push($a, $key . ':' . $headers[$key]);
+        }
+        return join("\n", $a) . "\n";
+    }
+
+    function curlHeaders($r)
+    {
+        $header = array();
+        foreach ($r->headers as $key => $value) {
+            array_push($header, strtolower($key) . ':' . trim($value));
+        }
+        return $header;
+    }
+
+// SignedHeaders
+    function SignedHeaders($r)
+    {
+        $a = array();
+        foreach ($r->headers as $key => $value) {
+            array_push($a, strtolower($key));
+        }
+        sort($a);
+        return $a;
+    }
+
+// Create a "String to Sign".
+    function StringToSign($canonicalRequest, $t)
+    {
+        date_default_timezone_set('UTC');
+        $date = date(BasicDateFormat, $t);
+        $hash = hash("sha256", $canonicalRequest);
+        return "SDK-HMAC-SHA256\n$date\n$hash";
+    }
+
+// Create the HWS Signature.
+    function SignStringToSign($stringToSign, $signingKey)
+    {
+        return hash_hmac("sha256", $stringToSign, $signingKey);
+    }
+
+// Get the finalized value for the "Authorization" header. The signature parameter is the output from SignStringToSign
+    function AuthHeaderValue($signature, $accessKey, $signedHeaders)
+    {
+        $signedHeadersString = join(";", $signedHeaders);
+        return "SDK-HMAC-SHA256 Access=$accessKey, SignedHeaders=$signedHeadersString, Signature=$signature";
+    }
+
+    public function Sign($r)
+    {
+        date_default_timezone_set('UTC');
+        $date = $this->findHeader($r, HeaderXDate);
+        if ($date) {
+            $t = date_timestamp_get(date_create_from_format(BasicDateFormat, $date));
+        }
+        if (!@$t) {
+            $t = time();
+            $r->headers[HeaderXDate] = date(BasicDateFormat, $t);
+        }
+        $queryString = $this->CanonicalQueryString($r);
+        if ($queryString != "") {
+            $queryString = "?" . $queryString;
+        }
+        $signedHeaders = $this->SignedHeaders($r);
+        $canonicalRequest = $this->CanonicalRequest($r, $signedHeaders);
+        $stringToSign = $this->StringToSign($canonicalRequest, $t);
+        $signature = $this->SignStringToSign($stringToSign, $this->Secret);
+        $authValue = $this->AuthHeaderValue($signature, $this->Key, $signedHeaders);
+        $r->headers[HeaderAuthorization] = $authValue;
+
+        $curl = curl_init();
+        $uri = str_replace(array("%2F"), array("/"), rawurlencode($r->uri));
+        $url = $r->scheme . '://' . $r->host . $uri . $queryString;
+        $headers = $this->curlHeaders($r);
+        curl_setopt($curl, CURLOPT_URL, $url);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $r->method);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $r->body);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+        curl_setopt($curl, CURLOPT_NOBODY, FALSE);
+        return $curl;
+    }
+}

platform/Normal.php

@@ -128,7 +128,14 @@ function install()
                 $title = 'Error';
                 return message($html, $title, 201);
             } else {
-                return output('Jump<script>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+                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);
             }
         }
     }
@@ -206,7 +213,10 @@ language:<br>';
     <script>
         function changelanguage(str)
         {
-            document.cookie=\'language=\'+str+\'; path=/\';
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=\'+str+\'; path=/; \'+expires;
             location.href = location.href;
         }
     </script>';
@@ -263,7 +273,7 @@ function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch =
     $projectPath = splitlast(__DIR__, '/')[0];
 
     // 从github下载对应tar.gz，并解压
-    $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . $branch . '/';
+    $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/';
     $tarfile = $projectPath.'/github.tar.gz';
     $githubfile = file_get_contents($url);
     if (!$githubfile) return 0;

platform/TencentSCF.php

@@ -33,20 +33,15 @@ function GetPathSetting($event, $context)
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['accept-language'],';')[0],',')[0]);
     $_SERVER['function_name'] = $context['function_name'];
     $_SERVER['namespace'] = $context['namespace'];
+    $_SERVER['Region'] = getenv('TENCENTCLOUD_REGION');
     $host_name = $event['headers']['host'];
     $_SERVER['HTTP_HOST'] = $host_name;
     $serviceId = $event['requestContext']['serviceId'];
     if ( $serviceId === substr($host_name,0,strlen($serviceId)) ) {
         $_SERVER['base_path'] = '/'.$event['requestContext']['stage'].'/'.$_SERVER['function_name'].'/';
-        $_SERVER['Region'] = getenv('Region');
-        if ($_SERVER['Region'] == '') {
-            $_SERVER['Region'] = substr($host_name, strpos($host_name, '.')+1);
-            $_SERVER['Region'] = substr($_SERVER['Region'], 0, strpos($_SERVER['Region'], '.'));
-        }
         $path = substr($event['path'], strlen('/'.$_SERVER['function_name'].'/'));
     } else {
         $_SERVER['base_path'] = $event['requestContext']['path'];
-        $_SERVER['Region'] = getenv('Region');
         $path = substr($event['path'], strlen($event['requestContext']['path']));
     }
     if (substr($path,-1)=='/') $path=substr($path,0,-1);
@@ -61,16 +56,23 @@ 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 equal_replace($env[$str],1);
-            else return $env[$str];
+    //include 'config.php';
+    $s = file_get_contents('config.php');
+    $configs = substr($s, 18, -2);
+    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);
+                else return $envs[$disktag][$str];
+            }
+        } else {
+            if (isset($envs[$str])) {
+                if (in_array($str, $Base64Env)) return equal_replace($envs[$str],1);
+                else return $envs[$str];
+            }
         }
-    } else {
-        if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1);
-        else return getenv($str);
     }
     return '';
 }
@@ -80,50 +82,53 @@ function setConfig($arr, $disktag = '')
     global $InnerEnv;
     global $Base64Env;
     if ($disktag=='') $disktag = $_SERVER['disktag'];
+    //include 'config.php';
+    $s = file_get_contents('config.php');
+    $configs = substr($s, 18, -2);
+    if ($configs!='') $envs = json_decode($configs, true);
     $disktags = explode("|",getConfig('disktag'));
-    $diskconfig = json_decode(getenv($disktag), true);
-    $tmp = [];
     $indisk = 0;
-    $oparetdisk = 0;
+    $operatedisk = 0;
     foreach ($arr as $k => $v) {
         if (in_array($k, $InnerEnv)) {
-            if (in_array($k, $Base64Env)) $diskconfig[$k] = equal_replace($v);
-            else $diskconfig[$k] = $v;
+            if (in_array($k, $Base64Env)) $envs[$disktag][$k] = equal_replace($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] = equal_replace($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, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
-    WaitSCFStat();
+    $envs = array_filter($envs, 'array_value_isnot_null');
+    ksort($envs);
+    $response = updateEnvironment($envs, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
+    WaitSCFStat($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
     return $response;
 }
 
-function WaitSCFStat()
+function WaitSCFStat($function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
     $trynum = 0;
-    while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey')),true)['Response']['Status']!='Active' ) echo '
+    while( json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
 '.++$trynum;
 }
 
@@ -135,32 +140,43 @@ function install()
         setConfig($tmp);
         if (needUpdate()) {
             OnekeyUpate();
-            return message('update to github version, reinstall.<script>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . $url . '">', 'Program updating', 201);
+            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>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+        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['language'] = $_POST['language'];
-            $tmp['Region'] = $_POST['Region'];
-            $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 = json_decode(SetbaseConfig($tmp, $_SERVER['function_name'], $_POST['Region'], $_SERVER['namespace'], $SecretId, $SecretKey), true)['Response'];
-            if (api_error($response)) {
-                $html = api_error_msg($response);
-                $title = 'Error';
-                return message($html, $title, 201);
-            } else {
-                $html .= '
+        $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 = 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 {
+            $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').'">
@@ -175,10 +191,9 @@ function install()
             return true;
         }
     </script>';
-                $title = getconstStr('SetAdminPassword');
-                return message($html, $title, 201);
-            }
-        //}
+            $title = getconstStr('SetAdminPassword');
+            return message($html, $title, 201);
+        }
     }
     if ($_GET['install0']) {
         $html .= '
@@ -193,21 +208,6 @@ 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 .= '
-        <select class="changelanguage" name="Region">
-            <option value="">选择区域</option>
-            <option value="ap-beijing">华北地区(北京)</option>
-            <option value="ap-chengdu">西南地区(成都)</option>
-            <option value="ap-guangzhou">华南地区(广州)</option>
-            <option value="ap-guangzhou-open">华南地区(广州Open)</option>
-            <option value="ap-hongkong">港澳台地区(中国香港)</option>
-            <option value="ap-mumbai">亚太南部(孟买)</option>
-            <option value="ap-shanghai">华东地区(上海)</option>
-            <option value="ap-shanghai-fsi">华东地区(上海金融)</option>
-            <option value="ap-singapore">亚太东南(新加坡)</option>
-            <option value="ap-tokyo">亚太东北(东京)</option>
-            <option value="na-siliconvalley">美国西部(硅谷)</option>
-            <option value="na-toronto">北美地区(多伦多)</option>
-        </select>（腾讯几个月了还不做出来，只能先弄选择了）<br>
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
     <script>
@@ -219,7 +219,10 @@ language:<br>';
         document.cookie="timezone="+timezone+"; path=/; "+expires;
         function changelanguage(str)
         {
-            document.cookie=\'language=\'+str+\'; path=/\';
+            var expd = new Date();
+            expd.setTime(expd.getTime()+(2*60*60*1000));
+            var expires = "expires="+expd.toGMTString();
+            document.cookie=\'language=\'+str+\'; path=/; \'+expires;
             location.href = location.href;
         }
         function notnull(t)
@@ -295,31 +298,12 @@ function getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $Secret
     return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
 }
 
-function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
+function getfunctioncodeurl($function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
-    //print_r($Envs);
-    WaitSCFStat();
-    //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key']
-    $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
-    foreach ($tmp as $tmp1) {
-        $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);
-
-    $i = 0;
-    foreach ($tmp_env as $key1 => $value1) {
-        $tmpdata['Environment.Variables.'.$i.'.Key'] = $key1;
-        $tmpdata['Environment.Variables.'.$i.'.Value'] = $value1;
-        $i++;
-    }
+    //$meth = 'GET';
     $meth = 'POST';
     $host = 'scf.tencentcloudapi.com';
-    $tmpdata['Action'] = 'UpdateFunctionConfiguration';
+    $tmpdata['Action'] = 'GetFunctionAddress';
     $tmpdata['FunctionName'] = $function_name;
     $tmpdata['Namespace'] = $Namespace;
     $tmpdata['Nonce'] = time();
@@ -331,16 +315,24 @@ function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId
     $data = ReorganizeDate($tmpdata);
     $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
     //echo urlencode($signStr);
+    //return file_get_contents('https://'.$url.'&Signature='.urlencode($signStr));
     return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
 }
 
-function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
+function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
 {
-    echo json_encode($Envs,JSON_PRETTY_PRINT);
-    /*$trynum = 0;
-    while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
-'.++$trynum;*/
-    //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key']
+    // 获取当前代码并解压
+    $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'];
@@ -349,15 +341,32 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
         $tmp_env[$key1] = $value1;
     }
     $tmp_env = array_filter($tmp_env, 'array_value_isnot_null'); // remove null. 清除空值
-    $tmp_env['Region'] = $Region;
+    //$tmp_env['Region'] = $Region;
     ksort($tmp_env);
 
-    $i = 0;
-    foreach ($tmp_env as $key1 => $value1) {
-        $tmpdata['Environment.Variables.'.$i.'.Key'] = $key1;
-        $tmpdata['Environment.Variables.'.$i.'.Value'] = $value1;
-        $i++;
-    }
+    $prestr = '<?php $configs = \'
+';
+    $aftstr = '
+\';';
+    file_put_contents($outPath . 'config.php', $prestr . json_encode($tmp_env, JSON_PRETTY_PRINT) . $aftstr);
+
+    // 将目录中文件打包成zip
+    $source = '/tmp/code.zip';
+    //$zip=new ZipArchive();
+    $zip=new PharData($source);
+    //if($zip->open($source, ZipArchive::CREATE)){
+        addFileToZip($zip, $outPath); //调用方法，对要打包的根目录进行操作，并将ZipArchive的对象传递给方法
+    //    $zip->close(); //关闭处理的zip文件
+    //}
+
+    return updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey, $source);
+    $tmp1['Response']['Error']['Message'] = $codeurl;
+    error_log($tmp1['Response']['Error']['Message']);
+    return json_encode($tmp1);
+}
+
+function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
+{
     $meth = 'POST';
     $host = 'scf.tencentcloudapi.com';
     $tmpdata['Action'] = 'UpdateFunctionConfiguration';
@@ -373,39 +382,124 @@ function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $S
     $tmpdata['MemorySize'] = 64;
     $tmpdata['Timeout'] = 30;
     $data = ReorganizeDate($tmpdata);
-    echo $data;
+    //echo $data;
     $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
     //echo urlencode($signStr);
-    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+    $response = post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+    if (api_error(setConfigResponse($response))) {
+        return $response;
+    }
+    if ( json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Timeout'] < 25 ) {
+        $tmp['Response']['Error']['Message'] = 'Operating, please try again.';
+        $tmp['Response']['Error']['Code'] = 'Retry';
+        return json_encode($tmp);
+    }
+    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'];
+    }
+    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();
+    return $response;
 }
 
 function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKey, $source)
 {
-    WaitSCFStat();
-    $meth = 'POST';
+    $secretId = $SecretId;
+    $secretKey = $SecretKey;
     $host = 'scf.tencentcloudapi.com';
-    $tmpdata['Action'] = 'UpdateFunctionCode';
-    $tmpdata['Code.GitUrl'] = $source['url'];
-    $tmpdata['Code.GitBranch'] = $source['branch'];
-    $tmpdata['CodeSource'] = 'Git';
+    $service = "scf";
+    $version = "2018-04-16";
+    $action = "UpdateFunctionCode";
+    $region = $Region;
+    $timestamp = time();
+    $algorithm = "TC3-HMAC-SHA256";
+
+    // step 1: build canonical request string
+    $httpRequestMethod = "POST";
+    $canonicalUri = "/";
+    $canonicalQueryString = "";
+    $canonicalHeaders = "content-type:application/json; charset=utf-8\n"."host:".$host."\n";
+    $signedHeaders = "content-type;host";
+
+    //$tmpdata['Action'] = 'UpdateFunctionCode';
+    $tmpdata['Code']['ZipFile'] = base64_encode( file_get_contents($source) );
+    $tmpdata['CodeSource'] = 'ZipFile';
     $tmpdata['FunctionName'] = $function_name;
     $tmpdata['Handler'] = 'index.main_handler';
-    $tmpdata['Namespace'] = $Namespace;
-    $tmpdata['Nonce'] = time();
-    $tmpdata['Region'] = $Region;
-    $tmpdata['SecretId'] = $SecretId;
-    $tmpdata['Timestamp'] = time();
-    $tmpdata['Token'] = '';
-    $tmpdata['Version'] = '2018-04-16';
-    $data = ReorganizeDate($tmpdata);
-    $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
-    //echo urlencode($signStr);
-    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+    //$tmpdata['Namespace'] = $Namespace;
+    //$tmpdata['Nonce'] = time();
+    //$tmpdata['Region'] = $Region;
+    //$tmpdata['SecretId'] = $SecretId;
+    //$tmpdata['Timestamp'] = time();
+    //$tmpdata['Token'] = '';
+    //$tmpdata['Version'] = '2018-04-16';
+    $payload = json_encode($tmpdata);
+    //$payload = '{"Limit": 1, "Filters": [{"Values": ["\u672a\u547d\u540d"], "Name": "instance-name"}]}';
+    $hashedRequestPayload = hash("SHA256", $payload);
+    $canonicalRequest = $httpRequestMethod."\n"
+        .$canonicalUri."\n"
+        .$canonicalQueryString."\n"
+        .$canonicalHeaders."\n"
+        .$signedHeaders."\n"
+        .$hashedRequestPayload;
+    //echo $canonicalRequest.PHP_EOL;
+
+    // step 2: build string to sign
+    $date = gmdate("Y-m-d", $timestamp);
+    $credentialScope = $date."/".$service."/tc3_request";
+    $hashedCanonicalRequest = hash("SHA256", $canonicalRequest);
+    $stringToSign = $algorithm."\n"
+        .$timestamp."\n"
+        .$credentialScope."\n"
+        .$hashedCanonicalRequest;
+    //echo $stringToSign.PHP_EOL;
+
+    // step 3: sign string
+    $secretDate = hash_hmac("SHA256", $date, "TC3".$secretKey, true);
+    $secretService = hash_hmac("SHA256", $service, $secretDate, true);
+    $secretSigning = hash_hmac("SHA256", "tc3_request", $secretService, true);
+    $signature = hash_hmac("SHA256", $stringToSign, $secretSigning);
+    //echo $signature.PHP_EOL;
+
+    // step 4: build authorization
+    $authorization = $algorithm
+        ." Credential=".$secretId."/".$credentialScope
+        .", SignedHeaders=content-type;host, Signature=".$signature;
+    //echo $authorization.PHP_EOL;
+
+    //$curl = "curl -X POST https://".$host
+    //    .' -H "Authorization: '.$authorization.'"'
+    //    .' -H "Content-Type: application/json; charset=utf-8"'
+    //    .' -H "Host: '.$host.'"'
+    //    .' -H "X-TC-Action: '.$action.'"'
+    //    .' -H "X-TC-Timestamp: '.$timestamp.'"'
+    //    .' -H "X-TC-Version: '.$version.'"'
+    //    .' -H "X-TC-Region: '.$region.'"'
+    //    ." -d '".$payload."'";
+    //error_log( $curl.PHP_EOL );
+    //return '{"response": {"Error": {"Message":"' . $curl . '"}}}';
+    $headers['Authorization'] = $authorization;
+    $headers['Content-Type'] = 'application/json; charset=utf-8';
+    $headers['Host'] = $host;
+    $headers['X-TC-Action'] = $action;
+    $headers['X-TC-Timestamp'] = $timestamp;
+    $headers['X-TC-Version'] = $version;
+    $headers['X-TC-Region'] = $region;
+    return curl_request('https://'.$host, $payload, $headers)['body'];
 }
 
 function api_error($response)
 {
     return isset($response['Error']);
+    return ($response==null)||isset($response['Error']);
 }
 
 function api_error_msg($response)
@@ -418,14 +512,64 @@ namespace:' . $_SERVER['namespace'] . '<br>
 <button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>';
 }
 
-function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
-{
-    $source['url'] = 'https://github.com/' . $auth . '/' . $project;
-    $source['branch'] = $branch;
-    return json_decode(updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source), true)['Response'];
-}
-
 function setConfigResponse($response)
 {
     return json_decode( $response, true )['Response'];
 }
+
+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($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'), $source);
+}
+
+function addFileToZip($zip, $rootpath, $path = '')
+{
+    if (substr($rootpath,-1)=='/') $rootpath = substr($rootpath, 0, -1);
+    if (substr($path,0,1)=='/') $path = substr($path, 1);
+    $handler=opendir(path_format($rootpath.'/'.$path)); //打开当前文件夹由$path指定。
+    while($filename=readdir($handler)){
+        if($filename != "." && $filename != ".."){//文件夹文件名字为'.'和‘..’，不要对他们进行操作
+            $nowname = path_format($rootpath.'/'.$path."/".$filename);
+            if(is_dir($nowname)){// 如果读取的某个对象是文件夹，则递归
+                $zip->addEmptyDir($path."/".$filename);
+                addFileToZip($zip, $rootpath, $path."/".$filename);
+            }else{ //将文件加入zip对象
+                $newname = $path."/".$filename;
+                if (substr($newname,0,1)=='/') $newname = substr($newname, 1);
+                $zip->addFile($nowname, $newname);
+                //$zip->renameName($nowname, $newname);
+            }
+        }
+    }
+    @closedir($path);
+}

platform/TencentSCF_env.php

@@ -0,0 +1,424 @@
+<?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['queryString'];
+    $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['USER'] = 'qcloud';
+}
+
+function GetPathSetting($event, $context)
+{
+    $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($event['headers']['accept-language'],';')[0],',')[0]);
+    $_SERVER['function_name'] = $context['function_name'];
+    $_SERVER['namespace'] = $context['namespace'];
+    $_SERVER['Region'] = getenv('TENCENTCLOUD_REGION');
+    $host_name = $event['headers']['host'];
+    $_SERVER['HTTP_HOST'] = $host_name;
+    $serviceId = $event['requestContext']['serviceId'];
+    if ( $serviceId === substr($host_name,0,strlen($serviceId)) ) {
+        $_SERVER['base_path'] = '/'.$event['requestContext']['stage'].'/'.$_SERVER['function_name'].'/';
+        $path = substr($event['path'], strlen('/'.$_SERVER['function_name'].'/'));
+    } else {
+        $_SERVER['base_path'] = $event['requestContext']['path'];
+        $path = substr($event['path'], strlen($event['requestContext']['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 equal_replace($env[$str],1);
+            else return $env[$str];
+        }
+    } else {
+        if (in_array($str, $Base64Env)) return equal_replace(getenv($str),1);
+        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] = equal_replace($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] = equal_replace($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, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], getConfig('SecretId'), getConfig('SecretKey'));
+    WaitSCFStat();
+    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;
+    if ($_GET['install2']) {
+        $tmp['admin'] = $_POST['admin'];
+        setConfig($tmp);
+        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 = 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 {
+            $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.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 .= '
+        <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 SecretId\');
+                return false;
+            }
+            if (t.SecretKey.value==\'\') {
+                alert(\'input SecretKey\');
+                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 post2url($url, $data)
+{
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_POST, 1);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_HEADER, 0);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+    $response = curl_exec($ch);
+    curl_close($ch);
+    //echo $response;
+    return $response;
+}
+
+function ReorganizeDate($arr)
+{
+    $str = '';
+    ksort($arr);
+    foreach ($arr as $k1 => $v1) {
+        $str .= '&' . $k1 . '=' . $v1;
+    }
+    $str = substr($str, 1); // remove first '&'. 去掉第一个&
+    return $str;
+}
+
+function getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey)
+{
+    //$meth = 'GET';
+    $meth = 'POST';
+    $host = 'scf.tencentcloudapi.com';
+    $tmpdata['Action'] = 'GetFunction';
+    $tmpdata['FunctionName'] = $function_name;
+    $tmpdata['Namespace'] = $Namespace;
+    $tmpdata['Nonce'] = time();
+    $tmpdata['Region'] = $Region;
+    $tmpdata['SecretId'] = $SecretId;
+    $tmpdata['Timestamp'] = time();
+    $tmpdata['Token'] = '';
+    $tmpdata['Version'] = '2018-04-16';
+    $data = ReorganizeDate($tmpdata);
+    $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
+    //echo urlencode($signStr);
+    //return file_get_contents('https://'.$url.'&Signature='.urlencode($signStr));
+    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+}
+
+function updateEnvironment($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
+{
+    //print_r($Envs);
+    WaitSCFStat();
+    //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key']
+    $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
+    foreach ($tmp as $tmp1) {
+        $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);
+
+    $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';
+    $tmpdata['FunctionName'] = $function_name;
+    $tmpdata['Namespace'] = $Namespace;
+    $tmpdata['Nonce'] = time();
+    $tmpdata['Region'] = $Region;
+    $tmpdata['SecretId'] = $SecretId;
+    $tmpdata['Timestamp'] = time();
+    $tmpdata['Token'] = '';
+    $tmpdata['Version'] = '2018-04-16';
+    $data = ReorganizeDate($tmpdata);
+    $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
+    //echo urlencode($signStr);
+    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+}
+
+function SetbaseConfig($Envs, $function_name, $Region, $Namespace, $SecretId, $SecretKey)
+{
+    echo json_encode($Envs,JSON_PRETTY_PRINT);
+    /*$trynum = 0;
+    while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
+'.++$trynum;*/
+    //json_decode($a,true)['Response']['Environment']['Variables'][0]['Key']
+    $tmp = json_decode(getfunctioninfo($function_name, $Region, $Namespace, $SecretId, $SecretKey),true)['Response']['Environment']['Variables'];
+    foreach ($tmp as $tmp1) {
+        $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);
+
+    $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';
+    $tmpdata['FunctionName'] = $function_name;
+    $tmpdata['Namespace'] = $Namespace;
+    $tmpdata['Nonce'] = time();
+    $tmpdata['Region'] = $Region;
+    $tmpdata['SecretId'] = $SecretId;
+    $tmpdata['Timestamp'] = time();
+    $tmpdata['Token'] = '';
+    $tmpdata['Version'] = '2018-04-16';
+    $tmpdata['Description'] = 'Onedrive index and manager in SCF.';
+    $tmpdata['MemorySize'] = 64;
+    $tmpdata['Timeout'] = 30;
+    $data = ReorganizeDate($tmpdata);
+    echo $data;
+    $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
+    //echo urlencode($signStr);
+    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+}
+
+function updateProgram($function_name, $Region, $Namespace, $SecretId, $SecretKey, $source)
+{
+    WaitSCFStat();
+    $meth = 'POST';
+    $host = 'scf.tencentcloudapi.com';
+    $tmpdata['Action'] = 'UpdateFunctionCode';
+    $tmpdata['Code.GitUrl'] = $source['url'];
+    $tmpdata['Code.GitBranch'] = $source['branch'];
+    $tmpdata['CodeSource'] = 'Git';
+    $tmpdata['FunctionName'] = $function_name;
+    $tmpdata['Handler'] = 'index.main_handler';
+    $tmpdata['Namespace'] = $Namespace;
+    $tmpdata['Nonce'] = time();
+    $tmpdata['Region'] = $Region;
+    $tmpdata['SecretId'] = $SecretId;
+    $tmpdata['Timestamp'] = time();
+    $tmpdata['Token'] = '';
+    $tmpdata['Version'] = '2018-04-16';
+    $data = ReorganizeDate($tmpdata);
+    $signStr = base64_encode(hash_hmac('sha1', $meth.$host.'/?'.$data, $SecretKey, true));
+    //echo urlencode($signStr);
+    return post2url('https://'.$host, $data.'&Signature='.urlencode($signStr));
+}
+
+function api_error($response)
+{
+    return isset($response['Error']);
+}
+
+function api_error_msg($response)
+{
+    return $response['Error']['Code'] . '<br>
+' . $response['Error']['Message'] . '<br><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 OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master')
+{
+    $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'];
+}
+
+function setConfigResponse($response)
+{
+    return json_decode( $response, true )['Response'];
+}

readme.md

@@ -1,25 +1,25 @@
 Install program first, then add onedrive in setup after login.  
 先安装程序，登录后在设置中添加onedrive。  
 
-# Deploy to heroku  
+# Deploy to Heroku  
 Official: https://heroku.com  
+Demo: https://herooneindex.herokuapp.com/  
 
 How to Install: Click the button [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/qkqpttgf/OneManager-php) to Deploy a new app, or create an app then deploy via connect to your github fork.  
 
-DEMO:  https://herooneindex.herokuapp.com/  
 
-
-# Deploy to Tencent Serverless Cloud Function (腾讯无服务器云函数 SCF)  
+# Deploy to Tencent Serverless Cloud Function (SCF 腾讯无服务器云函数)  
 Official: https://cloud.tencent.com/product/scf  
+DEMO:  无  
+注意：SCF新增限制，环境变量整体最大4KB，所以最多添加4个盘。  
 
-~~How to Install:  https://service-pgxgvop2-1258064400.ap-hongkong.apigateway.myqcloud.com/test/abcdef/%E6%97%A0%E6%9C%8D%E5%8A%A1%E5%99%A8%E5%87%BD%E6%95%B0SCF%E6%90%AD%E5%BB%BAOneDrive.mp4?preview~~  
+How to Install:  无  
   
 添加网盘时，SCF反应不过来，会添加失败，请不要删除，再添加一次相同的就可以了。  
 
-DEMO:  https://service-pgxgvop2-1258064400.ap-hongkong.apigateway.myqcloud.com/test/abcdef/  
 
-
-# Deploy to VPS(Virtual Private Server) 部署到VPS或空间  
+# Deploy to Virtual Private Server (VPS 或空间)  
+DEMO:  无  
 How to Install:  
     1.Start web service on your server (httpd or other), make sure you can visit it.  
     启动web服务器，确保你能访问到。  
@@ -33,8 +33,22 @@ How to Install:
     在浏览器中访问。  
 
 
-# Deploy to Aliyun Function Compute (阿里函数计算 FC)  
+# Deploy to Huawei cloud Function Graph (FG 华为云函数工作流)  
+Official: https://console.huaweicloud.com/functiongraph/  
+DEMO:  无  
+注意：FG中，环境变量整体大小为2KB，所以最多添加2个盘。  
+
+How to Install:  
+1，在函数列表，点右边创建函数  
+2，输入名称，选择运行时语言为PHP7.3，点上传ZIP文件，选择文件，然后点右边的创建函数（这里的ZIP文件不能直接用从Github上下载的ZIP文件，要将它解压后，去掉外层文件夹后，再压缩为ZIP。）  
+3，创建触发器：选API网关，安全认证选None，后端超时（毫秒）将5000改成30000，上面创建分组一下，其它的点点点  
+4，访问触发器给的url，开始安装  
+5，在触发器界面点触发器名称，跳到API网关管理，右边更多URL，可以添加自定义域名，自定义域名后发现还是要 xxxx.com/函数名 来访问，点上方的编辑，第1页不用改，点下一步，请求Path改成/，注意匹配模式是前缀匹配，Method为ANY，然后不用点下一步了，点立即完成，然后去发布生效  
+
+
+# Deploy to Aliyun Function Compute (FC 阿里云函数计算)  
 Official: https://fc.console.aliyun.com/  
+DEMO:  无  
 
 How to Install:  
 1，新建函数 -- HTTP函数  
@@ -44,8 +58,6 @@ How to Install:
 5，触发器中点进去，找到配置自定义域名，点击前往，创建，路径中填 /* ，其它下拉选择。  
 6，访问你的域名，开始安装  
 
-DEMO:  无  
-
 
 # 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.  

theme/Onedrive-dev.html

@@ -0,0 +1,584 @@
+<!DOCTYPE html>
+<html lang="<!--constStr@language-->">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><!--Title--></title>
+    <link rel="shortcut icon" href="<!--base_path-->favicon.ico" type="image/x-icon">
+    <!--https://p.sfx.ms/images/favicon.ico-->
+    <style>
+        /* 通用样式 */
+        /* 用于消除默认自带样式 */
+        html, body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            color: #333;
+            font-family: "Segoe UI", Tahoma, Arial, sans-serif;
+            overflow: hidden;
+        }
+        a { 
+            text-decoration: none;
+        }
+        ul { 
+            list-style: none;
+        }
+        input[type="radio"] {
+            margin: 0;
+            outline: none;
+        }
+
+        /* 兼容样式 */
+        body {
+            -webkit-user-select:none;
+            -moz-user-select:none;
+            -ms-user-select:none;
+            user-select:none;
+        }
+        select:-moz-focusring {
+            color: transparent;
+            text-shadow: 0 0 0 #000;
+        }
+
+        /* 自定义样式 */
+        .container {
+            margin-left: auto;
+            margin-right: auto;
+            max-width: 1100px;
+        }
+        .pull-left { 
+            float: left; 
+        }
+        .pull-right { 
+            float: right; 
+        }
+
+        /* 字体外部引用 */
+        @font-face {
+            font-family: 'iconfont';  /* project id 1634400 */
+            src: url('//at.alicdn.com/t/font_1634400_9yg8f5s278.eot');
+            src: url('//at.alicdn.com/t/font_1634400_9yg8f5s278.eot?#iefix') format('embedded-opentype'),
+            url('//at.alicdn.com/t/font_1634400_9yg8f5s278.woff2') format('woff2'),
+            url('//at.alicdn.com/t/font_1634400_9yg8f5s278.woff') format('woff'),
+            url('//at.alicdn.com/t/font_1634400_9yg8f5s278.ttf') format('truetype'),
+            url('//at.alicdn.com/t/font_1634400_9yg8f5s278.svg#iconfont') format('svg');
+        }
+        .iconfont {
+            font-family:"iconfont" !important;
+            font-size:16px;font-style:normal;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-stroke-width: 0.2px;
+            -moz-osx-font-smoothing: grayscale;
+        }
+
+        /* header */
+        header {
+            width: 100%;
+            /*height: 88px;*/
+            line-height: 48px;
+            font-size: 16px;
+            background-color: #0078D4;
+        }
+        header nav {
+            margin: 0 auto;
+            padding: 0 10px;
+            height: 48px;
+            color: #FFF;
+            box-sizing: border-box;
+        }
+        header nav a {
+            color: #FFF;
+            font-weight: 600;
+        }
+        header nav .lang .language { outline: none; }
+        header .control {
+            height: 40px;
+            line-height: 40px;
+            background-color: #f4f4f4;
+        }
+        header .control .control-item {
+            padding-left: 10px;
+            padding-right: 10px;
+        }
+
+        /* main */
+        main { 
+            position: relative;
+            height: 100%;
+        }
+        main .scroll {
+            overflow-y: scroll;
+            position: absolute;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            left: 0;
+        }
+        main .main-item-list {
+            padding-left: 32px;
+            padding-right: 32px;
+            height: 32px;
+            line-height: 32px;
+            font-size: 12px;
+            box-sizing: border-box;
+        }
+        main .main-title h1 {
+            margin: 0;
+            padding: 32px;
+            font-size: 20px;
+            font-weight: 100;
+        }
+        main .main-items:hover { 
+            background-color: #F4F4F4;
+        }
+        main .main-items:hover .main-items-radio { 
+            display: inline-block!important; 
+        }
+        main .main-item-list .inner-container {
+            display: flex;
+            justify-content: flex-start;
+            width: 100%;
+            height: 32px;
+            border-bottom: 1px solid #FFF;
+            box-sizing: border-box;
+        }
+        main .main-item-list .inner-container > div {
+            padding-left: 12px;
+            padding-right: 8px;
+            box-sizing: border-box;
+        }
+        main .main-item-list .main-item-title { 
+            border-bottom: 1px solid #EAEAEA;
+        }
+        main .main-item-list .main-items-radio-box {
+            width: 48px;
+            height: 32px;
+            line-height: 40px;
+            text-align: center;
+        }
+        main .main-item-list .main-items-radio-box .main-items-radio {
+            display: none;
+            width: 18px;
+            height: 18px;
+        }
+        main .main-item-list .main-items-radio-box .main-items-radio[currstatus=true] {
+            display: block;
+        }
+        main .main-item-list .main-items-icon {
+            min-width: 38px;
+            height: 32px;
+            line-height: 32px;
+            text-align: center;
+        }
+        main .main-item-title .main-items-icon {
+            height: 32px!important;
+            line-height: 9px!important;
+        }
+        main .main-item-title .main-items-icon:hover,
+        main .main-item-list .main-items-displayName:hover,
+        main .main-item-list .main-items-dateModified:hover,
+        main .main-item-list .main-items-size:hover { 
+            background-color: #EAEAEA; 
+        }
+        main .main-item-list .main-items-icon .iconfont {
+            font-size: 20px;
+        }
+        main .main-item-list .main-items-icon img {
+            display: inline-block;
+            width: 20px;
+            height: 20px;
+        }
+        main .main-items {
+            display: flex;
+            justify-content: flex-start;
+            border-bottom: 1px solid #F4F4F4;
+            box-sizing: border-box;
+        }
+        main .main-item-list .main-items-displayName,
+        main .main-item-list .main-items-fileName { 
+            width: 520px;
+        }
+        main .main-item-list .main-items-dateModified,
+        main .main-item-list .main-items-dateTime { 
+            width: 250px; 
+        }
+        main .main-item-list .main-items-size,
+        main .main-item-list .main-items-fileSize { 
+            width: 180px;
+        }
+        main .main-item-list .main-items-radio-box,
+        main .main-item-list .main-items-icon,
+        main .main-item-list .main-items-fileName,
+        main .main-item-list .main-items-dateTime,
+        main .main-item-list .main-items-fileSize {
+            padding: 11px 8px 11px 12px;
+            height: 42px;
+            line-height: 22px;
+            font-family: "Microsoft Yahei UI", Verdana, Simsun, "Segoe UI", -apple-system, BlinkMacSystemFont, "Roboto", "Helvetica Neue", sans-serif;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            box-sizing: border-box;
+            /*overflow: hidden;*/
+        }
+        main .main-item-list .main-items-fileName a {
+            color: inherit;
+        }
+        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;
+            text-overflow:ellipsis;
+            white-space: nowrap;
+            display: inline-block;
+            max-width: 100px;
+        }
+        .more-disk div{
+            list-style:none;
+            position:absolute;
+            display:none;background:#ffffff;border-radius:5px;margin:0 0 0 -10px;/*padding:0 7px;*/color:#205D67;z-index:1;
+            box-shadow: 0 0.5em 3em rgba(161,177,204,.4);
+        }
+        .more-disk:hover div{display:block}
+        .more-disk div li{line-height:normal;padding: 3px 10px;}
+        .more-disk div li a{text-decoration: none; color:rgba(0,0,0,.3);}
+        .more-disk div li a:hover{color:rgba(0,0,0,.87);}
+        .more-disk div li a[now]{color:rgba(0,0,0,1);}
+    </style>
+</head>
+<body>
+    <header>
+        <nav class="container">
+            <div class="title pull-left">
+                <a href="<!--base_path-->"><!--Sitename--></a>
+            </div>
+            <div class="pull-right">
+<!--LoginStart-->
+                <a class="pull-left" onclick="/*login();*/"><!--constStr@Login--></a>
+<!--LoginEnd-->
+<!--AdminStart-->
+                <a class="pull-left" onclick="logout();"><!--constStr@Logout--></a>
+<!--AdminEnd-->
+                &nbsp;| 
+                <div class="pull-right lang">
+                    <select name="language" id="language" class="language" onchange="changelanguage(this.options[this.options.selectedIndex].value)">
+                        <option value="">Language</option>
+<!--SelectLanguageStart-->
+                        <option value="<!--SelectLanguageKey-->" <!--SelectLanguageSelected-->><!--SelectLanguageValue--></option>
+<!--SelectLanguageEnd-->
+                    </select>
+                </div>
+            </div>
+        </nav>
+<!--AdminStart-->
+        <div class="control">
+            <div class="container">
+                <div class="control-item">
+                    <button class="control-items">
+                        <i class="iconfont control-items-icon">&#xe755;</i>
+                        <span class="control-items-content"><!--constStr@Create--></span>
+                    </button>
+                </div>
+            </div>
+        </div>
+<!--AdminEnd-->
+    </header>
+    <main>
+        <!--ListStart-->
+        <div class="scroll">
+            <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="<!--PathArrayLink-->"><!--PathArrayName--></a>
+<!--PathArrayEnd-->
+                    </h1>
+                </div>
+<!--IsFileStart-->
+                <div class="main-item-list">
+                    <div class="main-items main-item-title">
+                        <div class="inner-container">
+                            <div>
+                            <div style="margin: 24px">
+                                <textarea id="url" title="url" rows="1" style="width: 100%; margin-top: 2px;" readonly><!--FileEncodeUrl--></textarea>
+                                <a href="<!--FileUrl-->"><ion-icon name="download" style="line-height: 16px;vertical-align: middle;"></ion-icon>&nbsp;<!--constStr@Download--></a>
+                            </div>
+                            </div>
+                            <div>
+                                <!--IsimgFileStart-->
+                                <img src="<!--FileDownUrl-->" alt="<!--FileName-->" onload="if (this.offsetWidth>document.getElementById('url').offsetWidth) this.style.width='100%';" />
+                                <!--IsimgFileEnd-->
+                                <!--IsvideoFileStart-->
+                                <div id="video-a0"></div>
+                                <!--IsvideoFileEnd-->
+                            </div>
+                        </div>
+                    </div>
+                </div>
+<!--IsFileEnd-->
+<!--IsFolderStart-->
+                <div class="main-item-list">
+                    <div class="main-items main-item-title">
+                        <div class="inner-container">
+<!--AdminStart-->
+                            <div class="main-items-radio-box">
+                                <!-- <input class="main-items-radio main-items-check-all" type="radio" name="" id=""> -->
+                            </div>
+<!--AdminEnd-->
+                            <div class="main-items-icon">
+                                <i class="iconfont">&#xe746;</i>
+                            </div>
+                            <div class="main-items-displayName"><!--constStr@File--></div>
+                            <div class="main-items-dateModified"><!--constStr@EditTime--></div>
+                            <div class="main-items-size"><!--constStr@Size--></div>
+                        </div>
+                    </div>
+<!--FolderListStart-->
+                    <div class="main-items">
+<!--AdminStart-->
+                        <div class="main-items-radio-box">
+                            <input class="main-items-radio" type="radio" checked name="file" id="">
+                        </div>
+<!--AdminEnd-->
+                        <div class="main-items-icon">
+                            <img src="https://spoprod-a.akamaihd.net/files/fabric/assets/item-types-fluent/20/folder.svg" alt="folder icon">
+                        </div>
+                        <div class="main-items-fileName">
+                            <a href="<!--FileEncodeReplaceUrl-->/"><!--FileEncodeReplaceName--></a>
+                        </div>
+                        <div class="main-items-dateTime" ><!--lastModifiedDateTime--></div>
+                        <div class="main-items-fileSize" ><!--size--></div>
+                    </div>
+<!--FolderListEnd-->
+<!--FileListStart-->
+                    <div class="main-items">
+<!--AdminStart-->
+                        <div class="main-items-radio-box">
+                            <input class="main-items-radio" type="radio" checked name="file" id="">
+                        </div>
+<!--AdminEnd-->
+                        <div class="main-items-icon">
+                            <i class="iconfont">&#xe746;</i>
+                        </div>
+                        <div class="main-items-fileName">
+                            <a href="<!--FileEncodeReplaceUrl-->?preview" target="_blank"><!--FileEncodeReplaceName--></a>
+                        </div>
+                        <div class="main-items-dateTime" ><!--lastModifiedDateTime--></div>
+                        <div class="main-items-fileSize" ><!--size--></div>
+                    </div>
+<!--FileListEnd-->
+                </div>
+<!--IsFolderEnd-->
+            </div>
+        </div>
+<!--ListEnd-->
+    </main>
+    <footer>
+        <!-- OneDrive程序 -->
+    </footer>
+    <div id="mask" class="mask" style="display:none;"></div>
+<!--LoginStart-->
+    <div id="login_div" class="operatediv" style="display:none">
+        <div style="margin:50px">
+            <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
+	        <center>
+	            <form action="<!--IsPreview?-->admin" method="post">
+		        <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
+		        <input type="submit" value="<!--constStr@Login-->">
+	            </form>
+            </center>
+        </div>
+	</div>
+<!--LoginEnd-->
+    <script src="https://cdn.bootcss.com/jquery/2.1.1/jquery.min.js"></script>
+    <script>
+        window.onload = function () 
+        {
+            // 获取所有radios元素
+            var allRadios = document.getElementsByClassName("main-items-radio");
+            RegisterRadioClick(allRadios);
+        }
+
+        // 为所有radio注册点击事件
+        function RegisterRadioClick(radios) 
+        {
+            if (radios != null) 
+            {
+                var radio;
+                for (var i = 0; i < radios.length ; i++) 
+                {
+                    // 获取单个radio元素
+                    radio = radios[i];
+                    // 为每个radio元素设置当前状态为：False
+                    //radio.setAttribute("currStatus", "false");
+                    // 页面刚加载后，取消因缓存的checked属性
+                    radio.checked = false;
+                    // 为页面中每个radio元素注册点击事件
+                    radio.onclick = function()
+                    {
+                        // 获取当前点击对象的自定义属性
+                        var currStatus = this.getAttribute("currStatus");
+                        AllRadioCurrentStatus2False(radios);
+                        if (currStatus === "true") 
+                        {
+                            AllRadioCurrentStatus2False(radios);
+                            this.setAttribute("currStatus", false);
+                            this.checked = false;
+                        }
+                        else 
+                        {
+                            this.setAttribute("currStatus", true);
+                            this.checked = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        // 把页面里所有radio元素自定义属性变成为false
+        // 不然会出现需要点击两次才会被选中
+        function AllRadioCurrentStatus2False(radios)
+        {
+            for (var i = 0; i < radios.length; i++)
+            {
+                radios[i].setAttribute("currStatus", false);
+            }
+        }
+        function changelanguage(str)
+    {
+        if (str=='Language') str = '';
+        document.cookie='language='+str+'; path=/';
+        location.href = location.href;
+    }
+<!--ListStart-->
+    /*var root = '<!--base_disk_path-->';
+    function path_format(path) {
+        path = '/' + path + '/';
+        while (path.indexOf('//') !== -1) {
+            path = path.replace('//', '/')
+        }
+        return path
+    }
+    document.querySelectorAll('.main-title-path').forEach(function (e) {
+        var path = e.innerText;
+        if (path.substr(path.length-1)=='/') path = path.substr(0, path.length-1);
+        var paths = path.split('/');
+        e.innerHTML = '<a href="' + root + '"><!--constStr@Home--></a> > ';
+        if (paths <= 2) return;
+        for (var i = 1; i < paths.length - 1; i++) {
+            var to = path_format(root + paths.slice(0, i + 1).join('/'));
+            e.innerHTML += '<a href="' + to + '">' + paths[i] + '</a> > '
+        }
+        e.innerHTML += paths[paths.length - 1];
+        e.innerHTML = e.innerHTML.replace(/\s\/\s$/, '')
+    });*/
+<!--IsFileStart-->
+    var $url = document.getElementById('url');
+    if ($url) {
+        $url.innerHTML = location.protocol + '//' + location.host + $url.innerHTML;
+        $url.style.height = $url.scrollHeight + 'px';
+    }
+<!--IsvideoFileStart-->
+    function loadResources(type, src, callback) {
+        let script = document.createElement(type);
+        let loaded = false;
+        if (typeof callback === 'function') {
+            script.onload = script.onreadystatechange = () => {
+                if (!loaded && (!script.readyState || /loaded|complete/.test(script.readyState))) {
+                    script.onload = script.onreadystatechange = null;
+                    loaded = true;
+                    callback();
+                }
+            }
+        }
+        if (type === 'link') {
+            script.href = src;
+            script.rel = 'stylesheet';
+        } else {
+            script.src = src;
+        }
+        document.getElementsByTagName('head')[0].appendChild(script);
+    }
+    function addVideos(videos) {
+        let host = 'https://s0.pstatp.com/cdn/expire-1-M';
+        let unloadedResourceCount = 4;
+        let callback = (() => {
+            return () => {
+                if (!--unloadedResourceCount) {
+                    createDplayers(videos);
+                }
+            };
+        })(unloadedResourceCount, videos);
+        loadResources(
+            'link',
+            host + '/dplayer/1.25.0/DPlayer.min.css',
+            callback
+        );
+        loadResources(
+            'script',
+            host + '/dplayer/1.25.0/DPlayer.min.js',
+            callback
+        );
+        loadResources(
+            'script',
+            host + '/hls.js/0.12.4/hls.light.min.js',
+            callback
+        );
+        loadResources(
+            'script',
+            host + '/flv.js/1.5.0/flv.min.js',
+            callback
+        );
+    }
+    function createDplayers(videos) {
+        for (i = 0; i < videos.length; i++) {
+            console.log(videos[i]);
+            new DPlayer({
+                container: document.getElementById('video-a' + i),
+                screenshot: true,
+                video: {
+                    url: videos[i]
+                }
+            });
+        }
+    }
+    addVideos(['<!--FileDownUrl-->']);
+<!--IsvideoFileEnd-->
+<!--IsFileEnd-->
+<!--ListEnd-->
+<!--AdminStart-->
+        function logout() {
+            document.cookie = "admin=; path=/";
+            location.href = location.href;
+        }
+<!--AdminEnd-->
+<!--LoginStart-->
+        function login() {
+            document.getElementById('mask').style.display='';
+                //document.getElementById('mask').style.width=document.documentElement.scrollWidth+'px';
+            document.getElementById('mask').style.height=document.documentElement.scrollHeight<window.innerHeight?window.innerHeight:document.documentElement.scrollHeight+'px';
+            document.getElementById('login_div').style.display='';
+            document.getElementById('login_div').style.left=(document.body.clientWidth-document.getElementById('login_div').offsetWidth)/2 +'px';
+            document.getElementById('login_div').style.top=(window.innerHeight-document.getElementById('login_div').offsetHeight)/2+document.body.scrollTop +'px';
+            document.getElementById('login_input').focus();
+        }
+<!--LoginEnd-->
+    </script>
+</body>
+</html>

theme/classic.html

@@ -190,7 +190,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>
@@ -476,7 +476,10 @@
     function changelanguage(str)
     {
         if (str=='Language') str = '';
-        document.cookie='language='+str+'; path=/';
+        var expd = new Date();
+        expd.setTime(expd.getTime()+(2*60*60*1000));
+        var expires = "expires="+expd.toGMTString();
+        document.cookie='language='+str+'; path=/; '+expires;
         location.href = location.href;
     }
 <!--ListStart-->
@@ -587,10 +590,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;
@@ -814,19 +823,26 @@
         var timea=new Date().getTime();
         var i=0;
         getuplink(i);
-        function getuplink(i) {
+        function getuplink(i, r=0) {
             var file=files[i];
-            var tr1=document.createElement('tr');
-            table1.appendChild(tr1);
-            tr1.setAttribute('data-to',1);
-            var td1=document.createElement('td');
-            tr1.appendChild(td1);
-            td1.setAttribute('style','width:30%;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');
-            tr1.appendChild(td2);
-            td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            var td1;
+            var td2;
+            if (r==0) {
+                var tr1=document.createElement('tr');
+                table1.appendChild(tr1);
+                tr1.setAttribute('data-to',1);
+                td1=document.createElement('td');
+                tr1.appendChild(td1);
+                td1.setAttribute('style','width:30%;word-break:break-word;');
+                td1.setAttribute('id','upfile_td1_'+timea+'_'+i);
+                td1.innerHTML=(file.webkitRelativePath||file.name)+'<br>'+size_format(file.size);
+                td2=document.createElement('td');
+                tr1.appendChild(td2);
+                td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
+            }
+            var tdnum = timea+'_'+i;
+            td1=document.getElementById('upfile_td1_'+tdnum);
+            td2=document.getElementById('upfile_td2_'+tdnum);
             if (file.size>100*1024*1024*1024) {
                 td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
                 uploadbuttonshow();
@@ -871,35 +887,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) {
@@ -992,7 +1019,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);
@@ -1015,7 +1042,7 @@
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';
                     }
-                    uploadbuttonshow();
+                    // uploadbuttonshow();
                 }
             }
         }

theme/nchyn_grey.html

@@ -21,8 +21,8 @@
     <meta name=viewport content="width=device-width,initial-scale=1">
     <meta name="keywords" content="<!--Keywords-->">
     <meta name="description" content="<!--Description-->">
-    <link rel="icon" href="<!--base_disk_path-->favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="<!--base_disk_path-->favicon.ico" type="image/x-icon" />
+    <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 href="//cdn.bootcdn.net/ajax/libs/twitter-bootstrap/4.5.0/css/bootstrap.min.css" rel="stylesheet">
     <script src="//cdn.bootcdn.net/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
 

theme/nexmoe1.html

@@ -51,8 +51,8 @@
             /*.mdui-toolbar>*{display:none}*/
             .mdui-toolbar>a:last-child,.mdui-toolbar>.mdui-typo-headline,.mdui-toolbar>i:first-child{display:block}
         }
-        
-	</style>
+    </style>
+    <!--customCss-->
 	<script src="//cdnjs.loli.net/ajax/libs/mdui/0.4.1/js/mdui.min.js"></script>
 </head>
 <body class="mdui-theme-primary-blue-grey mdui-theme-accent-blue">
@@ -115,16 +115,12 @@
 <!--GuestUploadEnd-->
 <!--HeadomfStart-->
 <div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-    <!--HeadomfContent-->
+<!--HeadomfContent-->
 </div>
 <!--HeadomfEnd-->
 <!--HeadmdStart-->
-<div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-    <!--<div class="mdui-chip">
-    <span class="mdui-chip-icon"><i class="mdui-icon material-icons">face</i></span>
-    <span class="mdui-chip-title">HEAD.md</span>
-    </div>-->
-    <!--HeadmdContent-->
+<div class="mdui-typo mdui-shadow-3 markdown" style="padding: 20px;margin: 20px 0">
+<!--HeadmdContent-->
 </div>
 <!--HeadmdEnd-->
 <!--IsFileStart-->
@@ -188,7 +184,6 @@
         width:100% !important;
         height:230px;
     }
-    
     .thumb .mdui-list-item .mdui-icon{
         font-size:100px;
         display: block;
@@ -203,7 +198,6 @@
         position: absolute;
         top: 180px;
     }
-    
     </style>
     <div class="nexmoe-item">
 
@@ -253,39 +247,34 @@
 <!--FileListEnd-->
 
 <!--MorePageStart-->
-<form action="" method="POST" id="nextpageform">
-    <input type="hidden" id="pagenum" name="pagenum" value="">
-		  <li class="mdui-list-item th">
-		    <div class="mdui-col-sm-6 mdui-left mdui-text-left">
+            <form action="" method="POST" id="nextpageform">
+                <input type="hidden" id="pagenum" name="pagenum" value="">
+                <li class="mdui-list-item th">
+                    <div class="mdui-col-sm-6 mdui-left mdui-text-left">
 <!--PrePageStart-->
-		        <a onclick="nextpage(<!--PrePageNum-->);" class="mdui-btn mdui-btn-raised"><!--constStr@PrePage--></a>
+                        <a onclick="nextpage(<!--PrePageNum-->);" class="mdui-btn mdui-btn-raised"><!--constStr@PrePage--></a>
 <!--PrePageEnd-->
 <!--NextPageStart-->
-		        <a onclick="nextpage(<!--NextPageNum-->);" class="mdui-btn mdui-btn-raised"><!--constStr@NextPage--></a>
+                        <a onclick="nextpage(<!--NextPageNum-->);" class="mdui-btn mdui-btn-raised"><!--constStr@NextPage--></a>
 <!--NextPageEnd-->
-		    </div>
-		    <div class="mdui-col-sm-6 mdui-right mdui-text-right">
-		      <div class="mdui-right mdui-text-right"><span class="mdui-chip-title">Page: <!--MorePageListStart--><!--MorePageListEnd--><!--MorePageListNowStart--><!--PageNum--><!--MorePageListNowEnd-->/<!--MaxPageNum--></span></div>
-            </div>
-          </li>
-        </form>
+                    </div>
+                    <div class="mdui-col-sm-6 mdui-right mdui-text-right">
+                        <div class="mdui-right mdui-text-right"><span class="mdui-chip-title">Page: <!--MorePageListStart--><!--MorePageListEnd--><!--MorePageListNowStart--><!--PageNum--><!--MorePageListNowEnd-->/<!--MaxPageNum--></span></div>
+                    </div>
+                </li>
+            </form>
 <!--MorePageEnd-->
-
         </ul>
     </div>
     </div>
 <!--ReadmemdStart-->
-    <div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-        <!--<div class="mdui-chip">
-          <span class="mdui-chip-icon"><i class="mdui-icon material-icons">face</i></span>
-          <span class="mdui-chip-title">README.md</span>
-        </div>-->
-        <!--ReadmemdContent-->
+    <div class="mdui-typo mdui-shadow-3 markdown" style="padding: 20px;margin: 20px 0">
+<!--ReadmemdContent-->
     </div>
 <!--ReadmemdEnd-->
 <!--FootomfStart-->
 <div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-    <!--FootomfContent-->
+<!--FootomfContent-->
 </div>
 <!--FootomfEnd-->
     </div>
@@ -294,6 +283,8 @@
 <!--ShowThumbnailsEnd-->
 <!--IsFolderEnd-->
 <!--ListEnd-->
+<!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
+<script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
     <script>
 <!--MorePageStart-->
     function nextpage(num) {
@@ -302,11 +293,9 @@
     }
 <!--MorePageEnd-->
     $ = mdui.JQ;
-    
     $.fn.extend({
         sortElements: function (comparator, getSortable) {
             getSortable = getSortable || function () { return this; };
-    
             var placements = this.map(function () {
                 var sortElement = getSortable.call(this),
                     parentNode = sortElement.parentNode,
@@ -314,13 +303,11 @@
                         document.createTextNode(''),
                         sortElement.nextSibling
                     );
-    
                 return function () {
                     parentNode.insertBefore(this, nextSibling);
                     parentNode.removeChild(nextSibling);
                 };
             });
-    
             return [].sort.call(this, comparator).each(function (i) {
                 placements[i].call(getSortable.call(this));
             });
@@ -331,7 +318,6 @@
          let dl_link_list = Array.from(document.querySelectorAll("li a"))
              .map(x => x.href) // 所有list中的链接
              .filter(x => x.slice(-1) != "/"); // 筛选出非文件夹的文件下载链接
-    
          let blob = new Blob([dl_link_list.join("\r\n")], {
              type: 'text/plain'
          }); // 构造Blog对象
@@ -360,7 +346,6 @@
                 }
             });
         }
-    
     }	
 <!--ShowThumbnailsEnd-->
     $(function(){
@@ -373,23 +358,20 @@
                 return false;
             });
         });
-    
         $('.icon-sort').on('click', function () {
             let sort_type = $(this).attr("data-sort"), sort_order = $(this).attr("data-order");
             let sort_order_to = (sort_order === "less") ? "more" : "less";
-    
             $('li[data-sort]').sortElements(function (a, b) {
                 let data_a = $(a).attr("data-sort-" + sort_type), data_b = $(b).attr("data-sort-" + sort_type);
                 let rt = data_a.localeCompare(data_b, undefined, {numeric: true});
                 return (sort_order === "more") ? 0-rt : rt;
             });
-    
             $(this).attr("data-order", sort_order_to).text("expand_" + sort_order_to);
         });
-    
+    });
+    document.querySelectorAll('.markdown').forEach(function (e) {
+        e.innerHTML = marked(e.innerHTML);
     });
     </script>
-    
-  
 </body>
 </html>

theme/nexmoe2.html

@@ -239,12 +239,8 @@
 </div>
 <!--HeadomfEnd-->
 <!--HeadmdStart-->
-<div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-    <!--<div class="mdui-chip">
-    <span class="mdui-chip-icon"><i class="mdui-icon material-icons">face</i></span>
-    <span class="mdui-chip-title">HEAD.md</span>
-    </div>-->
-    <!--HeadmdContent-->
+<div class="mdui-typo mdui-shadow-3 markdown" style="padding: 20px;margin: 20px 0">
+<!--HeadmdContent-->
 </div>
 <!--HeadmdEnd-->
         <style>
@@ -363,12 +359,8 @@
 </div>
 </div>
 <!--ReadmemdStart-->
-<div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
-    <!--<div class="mdui-chip">
-      <span class="mdui-chip-icon"><i class="mdui-icon material-icons">face</i></span>
-      <span class="mdui-chip-title">README.md</span>
-    </div>-->
-    <!--ReadmemdContent-->
+<div class="mdui-typo mdui-shadow-3 markdown" style="padding: 20px;margin: 20px 0">
+<!--ReadmemdContent-->
 </div>
 <!--ReadmemdEnd-->
 <!--FootomfStart-->
@@ -382,6 +374,8 @@
 <!--ListEnd-->
 <script src="//cdn.jsdelivr.net/gh/mcstudios/glightbox/dist/js/glightbox.min.js"></script>
 <script src="//cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js"></script>
+<!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
+<script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
 <script>
 <!--MorePageStart-->
     function nextpage(num) {
@@ -533,8 +527,6 @@ function thumb(){
 }
 <!--ShowThumbnailsEnd-->
 $(function(){
-
-
 	$('.icon-sort').on('click', function () {
         let sort_type = $(this).attr("data-sort"), sort_order = $(this).attr("data-order");
         let sort_order_to = (sort_order === "less") ? "more" : "less";
@@ -547,9 +539,6 @@ $(function(){
 
         $(this).attr("data-order", sort_order_to).text("expand_" + sort_order_to);
     });
-
-  	
-  
 });
 
 var ckname='image_mode';
@@ -583,7 +572,9 @@ $('#image_view').on('click', function () {
 		window.location.href=window.location.href;
 	}
 });
-  
+document.querySelectorAll('.markdown').forEach(function (e) {
+    e.innerHTML = marked(e.innerHTML);
+});
 </script>
 </body>
 </html>

theme/onemoe.html

@@ -25,23 +25,9 @@
     <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-->
-    <style>
-        body {
-            background-repeat: no-repeat;
-            background-size: cover;
-            background-attachment: fixed;
-            background-position-x: center;
-            background-image: url("<!--BackgroundUrl-->");
-        }
-    </style>
+    <style>body{background-repeat:no-repeat;background-size:cover;background-attachment:fixed;background-position-x:center;background-image:url("<!--BackgroundUrl-->")}</style>
 	<!--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>
+	<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>
 
@@ -123,7 +109,7 @@
                     <ion-icon name="arrow-back"></ion-icon>
                 </a>
 <!--BackArrowEnd-->
-                <h3 class="table-header"><!--Path--></h3>
+                <h3 class="table-header"><!--PathArrayStart--> / <a href="<!--PathArrayLink-->"><!--PathArrayName--></a><!--PathArrayEnd--></h3>
             </div>
             <div class="list-body-container">
 <!--EncryptedStart-->
@@ -448,11 +434,14 @@
     function changelanguage(str)
     {
         if (str=='Language') str = '';
-        document.cookie='language='+str+'; path=/';
+        var expd = new Date();
+        expd.setTime(expd.getTime()+(2*60*60*1000));
+        var expires = "expires="+expd.toGMTString();
+        document.cookie='language='+str+'; path=/; '+expires;
         location.href = location.href;
     }
 <!--ListStart-->
-    var root = '<!--base_disk_path-->';
+    /*var root = '<!--base_disk_path-->';
     function path_format(path) {
         path = '/' + path + '/';
         while (path.indexOf('//') !== -1) {
@@ -472,7 +461,7 @@
         }
         e.innerHTML += paths[paths.length - 1];
         e.innerHTML = e.innerHTML.replace(/\s\/\s$/, '')
-    });
+    });*/
 <!--IsFileStart-->
     var $url = document.getElementById('url');
     if ($url) {
@@ -793,20 +782,55 @@
             tr1.setAttribute('data-to',1);
             var td1=document.createElement('td');
             tr1.appendChild(td1);
-            td1.setAttribute('style','width:30%');
+            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');
             tr1.appendChild(td2);
             td2.setAttribute('id','upfile_td2_'+timea+'_'+i);
-            td2.innerHTML='<!--constStr@GetUploadLink--> ...';
             if (file.size>100*1024*1024*1024) {
                 td2.innerHTML='<font color="red"><!--constStr@UpFileTooLarge--></font>';
                 uploadbuttonshow();
                 return;
             }
+            upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
+<!--GuestStart-->
+            function getext(str) {
+                strarry=str.split('.');
+                ext=strarry[strarry.length-1].toLowerCase();
+                var reg = new RegExp(".","g");
+                var a = str.replace(reg,"");
+                if (a == ext) ext = "";
+                else ext = "." + ext;
+                return ext;
+            }
+        var ext = getext(file.webkitRelativePath||file.name);
+        var spark = new SparkMD5.ArrayBuffer();
+        var reader = new FileReader();
+        var chunksize=10*1024*1024;
+        var asize = 0;
+        function readblob(start) {
+            var end=start+chunksize;
+            var blob = file.slice(start,end);
+            reader.readAsArrayBuffer(blob);
+        }
+        readblob(asize);
+
+        reader.onload = function(e){
+            td2.innerHTML='<!--constStr@Calculate--> md5: '+(asize*100/file.size).toFixed(2)+'%';
+            var binary = this.result;
+            spark.append(binary);
+            asize += chunksize;
+            if (asize < file.size) {
+                readblob(asize);
+            } else {
+                var filemd5 = spark.end();
+                td2.innerHTML='md5: '+filemd5;
+                upbigfilename = filemd5+ext;
+<!--GuestEnd-->
+            td2.innerHTML='<!--constStr@GetUploadLink--> ...';
             var xhr1 = new XMLHttpRequest();
-            xhr1.open("GET", '?action=upbigfile&upbigfilename='+ encodeURIComponent((file.webkitRelativePath||file.name)) +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
+            xhr1.open("GET", '?action=upbigfile&upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&lastModified='+ file.lastModified);
             xhr1.setRequestHeader('x-requested-with','XMLHttpRequest');
             xhr1.send(null);
             xhr1.onload = function(e){
@@ -819,14 +843,23 @@
                         uploadbuttonshow();
                     } else {
                         td2.innerHTML='<!--constStr@UploadStart--> ...';
-                        binupfile(file,html['uploadUrl'],timea+'_'+i);
+                        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);
                 }
             }
+<!--GuestStart-->
+            }
+        }
+<!--GuestEnd-->
         }
     }
     function size_format(num) {
@@ -847,7 +880,7 @@
         }
         return num.toFixed(2) + ' GB';
     }
-    function binupfile(file,url,tdnum){
+    function binupfile(file,url,tdnum,filename){
         var label=document.getElementById('upfile_td2_'+tdnum);
         var reader = new FileReader();
         var StartStr='';
@@ -868,9 +901,7 @@
                     var a = html['nextExpectedRanges'][0];
                     newstartsize = Number( a.slice(0,a.indexOf("-")) );
                     StartTime = new Date();
-<!--AdminStart-->
                     asize = newstartsize;
-<!--AdminEnd-->
                     if (newstartsize==0) {
                         StartStr='<!--constStr@UploadStartAt-->:' +StartTime.toLocaleString()+'<br>' ;
                     } else {
@@ -884,19 +915,9 @@
                         reader.readAsArrayBuffer(blob);
                     }
                     readblob(asize);
-<!--GuestStart-->
-                    var spark = new SparkMD5.ArrayBuffer();
-<!--GuestEnd-->
+
                     reader.onload = function(e){
                         var binary = this.result;
-<!--GuestStart-->
-                        spark.append(binary);
-                        if (asize < newstartsize) {
-                            asize += chunksize;
-                            readblob(asize);
-                            return;
-                        }
-<!--GuestEnd-->
                         var xhr = new XMLHttpRequest();
                         xhr.open("PUT", url, true);
                         //xhr.setRequestHeader('x-requested-with','XMLHttpRequest');
@@ -917,38 +938,12 @@
                             if (response['size']>0) {
                                 // contain size, upload finish. 有size说明是最终返回，上传结束
                                 var xhr3 = new XMLHttpRequest();
-                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+encodeURIComponent((file.webkitRelativePath||file.name)));
+                                xhr3.open("GET", '?action=del_upload_cache&filelastModified='+file.lastModified+'&filesize='+file.size+'&filename='+filename);
                                 xhr3.setRequestHeader('x-requested-with','XMLHttpRequest');
                                 xhr3.send(null);
                                 xhr3.onload = function(e){
                                     console.log(xhr3.responseText+','+xhr3.status);
                                 }
-<!--GuestStart-->
-                                var filemd5 = spark.end();
-                                var xhr4 = new XMLHttpRequest();
-                                xhr4.open("GET", '?action=uploaded_rename&filename='+encodeURIComponent((file.webkitRelativePath||file.name))+'&filemd5='+filemd5);
-                                xhr4.setRequestHeader('x-requested-with','XMLHttpRequest');
-                                xhr4.send(null);
-                                xhr4.onload = function(e){
-                                    console.log(xhr4.responseText+','+xhr4.status);
-                                    var filename;
-                                    //if (xhr4.status==200) filename = JSON.parse(xhr4.responseText)['name'];
-                                    //if (xhr4.status==409) filename = filemd5 + (file.webkitRelativePath||file.name).substr((file.webkitRelativePath||file.name).indexOf('.'));
-                                    filename = JSON.parse(xhr4.responseText)['name'];
-                                    if (filename=='') {
-                                        alert('<!--constStr@UploadErrorUpAgain-->');
-                                        uploadbuttonshow();
-                                        return;
-                                    }
-                                    var lasturl = location.href;
-                                    if (lasturl.substr(lasturl.length-1)!='/') lasturl += '/';
-                                    lasturl += filename + '?preview';
-                                    //window.open(lasturl);
-                                    document.getElementById('upfile_a_'+tdnum).href = lasturl;
-                                    document.getElementById('upfile_a1_'+tdnum).href = filename;
-                                    document.getElementById('upfile_cpbt_'+tdnum).style.display = "";
-                                }
-<!--GuestEnd-->
                                 EndTime=new Date();
                                 MiddleStr = '<!--constStr@EndAt-->:'+EndTime.toLocaleString()+'<br>';
                                 if (newstartsize==0) {
@@ -976,7 +971,7 @@
                         xhr.send(binary);
                     }
                 } else {
-                    if (window.location.pathname.indexOf('%23')>0||(file.webkitRelativePath||file.name).indexOf('%23')>0) {
+                    if (window.location.pathname.indexOf('%23')>0||filename.indexOf('%23')>0) {
                         label.innerHTML='<font color="red"><!--constStr@UploadFail23--></font>';
                     } else {
                         label.innerHTML='<font color="red">'+xhr2.responseText+'</font>';

theme/renexmoe.html

@@ -17,13 +17,11 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1.0, user-scalable=no"/>
 	<title><!--Title--></title>
-	<link rel="stylesheet" href="//cdnjs.loli.net/ajax/libs/mdui/0.4.1/css/mdui.css">
-	<script src="//cdnjs.loli.net/ajax/libs/mdui/0.4.1/js/mdui.min.js"></script>
-	<script src="https://cdn.my-file.cn/mduilw/MDUILW/jquery.min.js"></script>
-    <!--<script src="https://cdn.my-file.cn/mduilw/MDUILW/jquery.pjax.js"></script>-->	
-	<script src="//cdn.staticfile.org/layer/2.3/layer.js"></script>
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/glightbox/dist/css/glightbox.min.css">
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css">
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/mdui@0.4.3/dist/css/mdui.min.css">
+	<script src="https://cdn.jsdelivr.net/npm/mdui@0.4.3/dist/js/mdui.min.js"></script>	
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/glightbox/dist/css/glightbox.min.css">
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css">
+    <!--<script src="https://cdn.jsdelivr.net/npm/pjax@0.2.8/pjax.js"></script>-->
 	<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">
 
@@ -120,6 +118,18 @@
 
 <div class="mdui-drawer mdui-drawer-close" id="main-drawer"> 
 	<div class="mdui-list" mdui-collapse="{accordion: true}">
+    <!--LoginStart-->
+    <li class="mdui-list-item mdui-ripple" href="javascript:void(0);" mdui-dialog="{target: '#login_input'}">
+            <a class="mdui-list-item-icon mdui-icon material-icons">account_circle</a>
+            <a class="mdui-list-item-content">登录</a>
+        </li>
+    <!--LoginEnd-->
+    <!--AdminStart-->
+        <li class="mdui-list-item mdui-ripple" href="?setup">
+            <a class="mdui-list-item-icon mdui-icon material-icons" href="?setup">account_circle</a>
+            <a class="mdui-list-item-content" href="?setup">管理</a>
+        </li>
+    <!--AdminEnd-->
         <li class="mdui-list-item mdui-ripple" href="javascript:void(0);" onclick="darkmod_use()">
             <a class="mdui-list-item-icon mdui-icon material-icons">brightness_4</a>
             <a class="mdui-list-item-content">深色模式</a>
@@ -163,8 +173,7 @@
   </div>
 <!--EncryptedEnd-->
 <!--GuestUploadStart-->
-<!--
-            <div class="nexmoe-item" style="padding: 100px!important;" id="pjax-main">
+            <div class="nexmoe-item" style="padding: 100px!important;" id="content">
                 <div class="mdui-typo-display-3-opacity" style="text-align:center;">OneImages</div>
                 <form action="" method="post" enctype="multipart/form-data">
                     <input class="mdui-center" type="file" style="margin: 50px 0;" name="file" />
@@ -176,11 +185,10 @@
                     </div>
                 </form>
             </div>
--->
 <!--GuestUploadEnd-->
 
 <!--IsFileStart-->
-<div class="mdui-container-fluid" id="pjax-main">
+<div class="mdui-container-fluid" id="content">
 <!--IsimgFileStart-->
 <div class="nexmoe-item">
     <img class="mdui-img-fluid mdui-center mdui-m-t-5 "src="<!--FileDownUrl-->"/>
@@ -227,8 +235,25 @@
 <!--IsFileEnd-->
 
 <!--IsFolderStart-->
-<div class="mdui-container">
-	<div class="mdui-container-fluid"></div>
+<div class="mdui-container" id="content">
+	<div class="mdui-container-fluid">
+    <form action="?admin" method="post">
+    <div class="mdui-dialog" id="login_input">
+        <div class="mdui-dialog-title">登录</div>
+        <div class="mdui-dialog-content">
+        <div class="mdui-textfield mdui-textfield-floating-label">
+            <i class="mdui-icon material-icons">lock</i>
+            <label class="mdui-textfield-label">密码</label>
+            <input class="mdui-textfield-input" type="password"/>
+        </div>
+        </div>
+        <div class="mdui-dialog-actions">
+            <button class="mdui-btn mdui-ripple" mdui-dialog-close>取消</button>
+            <button class="mdui-btn mdui-ripple" type="submit">登录</button>
+        </div>
+    </div>
+    </form>
+    </div>
     <div class="mdui-container-fluid">
 <!--HeadomfStart-->
 <div class="mdui-typo mdui-shadow-3" style="padding: 20px;margin: 20px 0">
@@ -292,6 +317,7 @@
                         </li>
 <!--BackArrowStart-->
 		<li class="mdui-list-item mdui-ripple">
+            <div class="mdui-row mdui-col-sm-12">
 			<a href="<!--BackArrowUrl-->">
 			  <div class="mdui-col-xs-7">
 				<i class="mdui-icon material-icons">arrow_upward</i>
@@ -299,20 +325,23 @@
 			  </div>
 			  <div class="mdui-col-xs-3 mdui-text-right"></div>
 			  <div class="mdui-col-xs-2 mdui-text-right"></div>
-		  	</a>
+              </a>
+            </div>
 		</li>
 <!--BackArrowEnd-->
 		
 <!--FolderListStart-->
-		<li class="mdui-list-item mdui-ripple" data-sort data-sort-name="<!--FileEncodeReplaceName-->" data-sort-date="<!--lastModifiedDateTime-->" data-sort-size="<!--size-->" style="padding-right:36px;">
+        <li class="mdui-list-item mdui-ripple" data-sort data-sort-name="<!--FileEncodeReplaceName-->" data-sort-date="<!--lastModifiedDateTime-->" data-sort-size="<!--size-->" style="padding-right:36px;">
+            <div class="mdui-row mdui-col-sm-12">
 			<a href="<!--FileEncodeReplaceUrl-->/">
-			  <div class="mdui-col-xs-7 mdui-text-truncate">
+			  <div class="mdui-col-xs-12 mdui-col-sm-7 mdui-text-truncate">
 				<i class="mdui-icon material-icons">folder_open</i>
 		    	<span><!--FileEncodeReplaceName--></span>
 			  </div>
 			  <div class="mdui-col-xs-3 mdui-text-right"><!--lastModifiedDateTime--></div>
 			  <div class="mdui-col-xs-2 mdui-text-right"><!--size--></div>
-		  	</a>
+              </a>
+            </div>
 		</li>
 <!--FolderListEnd-->
 <!--FileListStart-->
@@ -322,15 +351,15 @@
 			  <img class="mdui-img-fluid" src="<?php echo get_absolute_path($root.$path).rawurlencode($item['name']); ?>">
               <?php else:?>-->
               <div class="mdui-row mdui-col-sm-12">
-              <div class="mdui-col-xs-7 mdui-text-truncate">
+              <div class="mdui-col-xs-12 mdui-col-sm-7 mdui-text-truncate">
 				<i class="mdui-icon material-icons"><!--IconValue--></i>
 		    	<span><!--FileEncodeReplaceName--></span>
 			  </div>
-			  <div class="mdui-col-xs-3 mdui-text-right"><!--lastModifiedDateTime--></div>
-			  <div class="mdui-col-xs-2 mdui-text-right"><!--size--></div>
+			  <div class="mdui-col-sm-3 mdui-text-right"><!--lastModifiedDateTime--></div>
+			  <div class="mdui-col-sm-2 mdui-text-right"><!--size--></div>
 		  	</a>
         </div>
-			<div class="forcedownload "  >
+			<div class="forcedownload mdui-text-right" >
  			      <a title="<!--constStr@Download-->" href="<!--FileEncodeReplaceUrl-->">
 			          <button class="mdui-btn mdui-ripple mdui-btn-icon"><i class="mdui-icon material-icons">file_download</i></button>
 			      </a>
@@ -388,7 +417,9 @@
         document.getElementById('nextpageform').submit();
     }
 <!--MorePageEnd-->
+var $ =  mdui.JQ;
 var $$ = mdui.JQ;
+var jQuery = mdui.JQ;
 $$(function() {
     $$('.file .iframe').each(function() {
         $$(this).on('click', function() {
@@ -422,10 +453,7 @@ $$(function() {
     });
 }); 
 window.TC=window.TC||{};
-jQuery(".file .audio").click(function(e){
-            e.preventDefault();
-            TC.preview_audio(this);
-});
+$$(".file .audio").on('click',function(e){e.preventDefault();TC.preview_audio(this);});
 TC.preview_audio = function(aud){
     if(!TC.aplayer){
         TC.aplayerList=[];
@@ -596,7 +624,16 @@ function darkmod_use(){
         } else {
             mainbody.classList.add("mdui-theme-layout-dark");darkmod = 1;
             }};
-//$(document).pjax('a', '#pjax-main' , {fragment:'#pjax-main', timeout:8000});
+function login() {
+    $$("content").write("")
+}
+//var pjax = new Pjax({
+//    selectors :[
+//        "content"
+//    ],
+//    debug: true,
+//    timeout: 8000
+//})
 </script>
 </body>
 </html>

version

@@ -1,7 +1,16 @@
+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。
+20200713-1800.20
+add platform: Huawei cloud Function Graph. now you can use "?json" to get a json of folder or file. fix some bug.
+新增白嫖平台：华为云函数工作流FG。可以用"?json"来获得目录或文件的json。修复bug。
 20200607-1856.19
 add platform: Aliyun Function Compute. add setting: replace sharepoint.com to a proxy server name. add setting: disableShowThumb,customTheme. add function: php hosting website can update by a click
 现在可以安装到阿里函数计算FC了。php空间可以一键更新了。可以设置某个盘替换sharpoint.com域名为你的反代域名。新增disableShowThumb,customTheme。
-
 20200503-1848.18
 Rebuild theme. Add custom Css & custom Script, add FunctionalityFile: head.omf & foot.omf.
 重建主题文件结构。增加自定义css与自定义script。增加2个功能文件：head.omf、foot.omf。