From dd54c94d54fe895b6f4c7b3d9c20c26835393921 Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 10:19:59 +0800
Subject: [PATCH 1/5] change install in vps

---
 function/normal.php | 63 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/function/normal.php b/function/normal.php
index e6bf1e8..e970fe0 100644
--- a/function/normal.php
+++ b/function/normal.php
@@ -115,7 +115,7 @@ function setConfig($arr, $disktag = '')
 function install()
 {
     global $constStr;
-    if ($_GET['install1']) {
+    if ($_GET['install2']) {
         if ($_POST['admin']!='') {
             $tmp['admin'] = $_POST['admin'];
             $tmp['language'] = $_POST['language'];
@@ -129,27 +129,70 @@ function install()
             }
         }
     }
-    if ($_GET['install0']) {
+    if ($_GET['install1']) {
         if (!ConfigWriteable()) {
             $html .= getconstStr('MakesuerWriteable');
             $title = 'Error';
             return message($html, $title, 201);
         }
-        if (!RewriteEngineOn()) {
+        /*if (!RewriteEngineOn()) {
             $html .= getconstStr('MakesuerRewriteOn');
             $title = 'Error';
             return message($html, $title, 201);
+        }*/
+        $html .= '<button id="checkrewritebtn" onclick="checkrewrite();">'.getconstStr('MakesuerRewriteOn').'</button>
+<div id="formdiv" style="display: none">
+    <form action="?install2" method="post" onsubmit="return notnull(this);">
+        <input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"><br>
+        <input id="submitbtn" type="submit" value="'.getconstStr('Submit').'" disabled>
+    </form>
+</div>
+    <script>
+        function notnull(t)
+        {
+            if (t.admin.value==\'\') {
+                alert(\''.getconstStr('SetAdminPassword').'\');
+                return false;
+            }
+            return true;
         }
+        function checkrewrite()
+        {
+            url=location.protocol + "//" + location.host;
+            if (location.port!="") url += ":" + location.port;
+            url += location.pathname;
+            if (url.substr(-1)!="/") url += "/";
+            url += "config.php";
+            //alert(url);
+            var xhr4 = new XMLHttpRequest();
+            xhr4.open("GET", url);
+            xhr4.setRequestHeader("x-requested-with","XMLHttpRequest");
+            xhr4.send(null);
+            xhr4.onload = function(e){
+                console.log(xhr4.responseText+","+xhr4.status);
+                //filename = JSON.parse(xhr4.responseText);
+                if (xhr4.status==201) {
+                    document.getElementById("checkrewritebtn").style.display = "none";
+                    document.getElementById("submitbtn").disabled = false;
+                    document.getElementById("formdiv").style.display = "";
+                } else {
+                    alert(xhr4.status);
+                }
+            }
+        }
+    </script>';
+        $title = getconstStr('SetAdminPassword');
+        return message($html, $title, 201);
+    }
+    if ($_GET['install0']) {
         $html .= '
-    <form action="?install1" method="post" onsubmit="return notnull(this);">
+    <form action="?install1" method="post">
 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>';
         }
         $html .= '
-        <label>Set admin password:<input name="admin" type="password" placeholder="' . getconstStr('EnvironmentsDescription')['admin'] . '" size="' . strlen(getconstStr('EnvironmentsDescription')['admin']) . '"></label><br>';
-        $html .= '
         <input type="submit" value="'.getconstStr('Submit').'">
     </form>
     <script>
@@ -158,14 +201,6 @@ language:<br>';
             document.cookie=\'language=\'+str+\'; path=/\';
             location.href = location.href;
         }
-        function notnull(t)
-        {
-            if (t.admin.value==\'\') {
-                alert(\'input admin\');
-                return false;
-            }
-            return true;
-        }
     </script>';
         $title = getconstStr('SelectLanguage');
         return message($html, $title, 201);

From 4b177b1a65bc3450f1aa800f049c8244537ab23f Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 10:28:20 +0800
Subject: [PATCH 2/5] Update normal.php

---
 function/normal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function/normal.php b/function/normal.php
index e970fe0..f8770ab 100644
--- a/function/normal.php
+++ b/function/normal.php
@@ -125,7 +125,7 @@ function install()
                 $title = 'Error';
                 return message($html, $title, 201);
             } else {
-                return output('Jump<meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+                return output('Jump<script>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
             }
         }
     }

From 9f604f047ee8a6a6d047c9e375f805401808d6ee Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 10:30:18 +0800
Subject: [PATCH 3/5] Update scf.php

---
 function/scf.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/function/scf.php b/function/scf.php
index 978eaac..7aaa711 100644
--- a/function/scf.php
+++ b/function/scf.php
@@ -132,9 +132,9 @@ function install()
         setConfig($tmp);
         if (needUpdate()) {
             updateProgram($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey);
-            return message('update to github version, reinstall.<meta http-equiv="refresh" content="3;URL=' . $url . '">', 'Program updating', 201);
+            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 output('Jump<meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
+        return output('Jump<script>document.cookie=\'language=; path=/\';</script><meta http-equiv="refresh" content="3;URL=' . path_format($_SERVER['base_path'] . '/') . '">', 302);
     }
     if ($_GET['install1']) {
         //if ($_POST['admin']!='') {
@@ -166,7 +166,7 @@ function install()
         function notnull(t)
         {
             if (t.admin.value==\'\') {
-                alert(\'Input admin\');
+                alert(\''.getconstStr('SetAdminPassword').'\');
                 return false;
             }
             return true;

From be2b52f98b31953a951f6cad8a8ada906c23a6f1 Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 10:47:43 +0800
Subject: [PATCH 4/5] fix bug

---
 theme/classic.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/theme/classic.php b/theme/classic.php
index 7f266b5..1f84ab6 100644
--- a/theme/classic.php
+++ b/theme/classic.php
@@ -705,8 +705,8 @@
         tmptextarea.select();
         tmptextarea.setSelectionRange(0, tmptextarea.value.length);
         document.execCommand("copy");
-        alert(tmptextarea.innerHTML);
-        //alert('Success');
+        //alert(tmptextarea.innerHTML);
+        alert('Success');
     }
     var sort=0;
     function sortby(string) {
@@ -999,6 +999,7 @@
                                     //window.open(lasturl);
                                     document.getElementById('upfile_a_'+tdnum).href = lasturl;
                                     document.getElementById('upfile_a1_'+tdnum).href = filename;
+                                    document.getElementById('upfile_cpbt_'+tdnum).style.display = "";
                                 }
 <?php } ?>
                                 EndTime=new Date();
@@ -1008,7 +1009,7 @@
                                 } else {
                                     MiddleStr += '<?php echo getconstStr('ThisTime').getconstStr('AverageSpeed'); ?>:'+size_format((totalsize-newstartsize)*1000/(EndTime.getTime()-StartTime.getTime()))+'/s<br>';
                                 }
-                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="'+response.name+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="'+response.name+'" id="upfile_a1_'+tdnum+'"></a><?php echo getconstStr('UploadComplete'); ?><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');"><?php echo getconstStr('CopyUrl'); ?></button></div>';
+                                document.getElementById('upfile_td1_'+tdnum).innerHTML='<div style="color:green"><a href="'+response.name+'?preview" id="upfile_a_'+tdnum+'" target="_blank">'+document.getElementById('upfile_td1_'+tdnum).innerHTML+'</a><br><a href="'+response.name+'" id="upfile_a1_'+tdnum+'"></a><?php echo getconstStr('UploadComplete'); ?><button onclick="CopyAllDownloadUrl(\'#upfile_a1_'+tdnum+'\');" id="upfile_cpbt_'+tdnum+'" <?php if (!$_SERVER['admin']) echo 'style="display:none"'; ?> ><?php echo getconstStr('CopyUrl'); ?></button></div>';
                                 label.innerHTML=StartStr+MiddleStr;
                                 uploadbuttonshow();
 <?php if ($_SERVER['admin']) { ?>

From 6aeb7c483cdcd7a4eaf51582147d0ab7570bcfbb Mon Sep 17 00:00:00 2001
From: qkqpttgf <45693631+qkqpttgf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 10:49:09 +0800
Subject: [PATCH 5/5] hide secret and id when click other

---
 function/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/function/common.php b/function/common.php
index 1aa6697..6c57325 100644
--- a/function/common.php
+++ b/function/common.php
@@ -1261,8 +1261,8 @@ function get_refresh_token()
         '.getconstStr('OnedriveDiskTag').': ('.getConfig('disktag').')<input type="text" name="disktag_add" placeholder="' . getconstStr('EnvironmentsDescription')['disktag'] . '" style="width:100%"><br>
         '.getconstStr('OnedriveDiskName').':<input type="text" name="diskname" placeholder="' . getconstStr('EnvironmentsDescription')['diskname'] . '" style="width:100%"><br>
         Onedrive_Ver：<br>
-        <label><input type="radio" name="Onedrive_ver" value="MS" checked>MS: '.getconstStr('OndriveVerMS').'</label><br>
-        <label><input type="radio" name="Onedrive_ver" value="CN">CN: '.getconstStr('OndriveVerCN').'</label><br>
+        <label><input type="radio" name="Onedrive_ver" value="MS" checked onclick="document.getElementById(\'secret\').style.display=\'none\';">MS: '.getconstStr('OndriveVerMS').'</label><br>
+        <label><input type="radio" name="Onedrive_ver" value="CN" onclick="document.getElementById(\'secret\').style.display=\'none\';">CN: '.getconstStr('OndriveVerCN').'</label><br>
         <label><input type="radio" name="Onedrive_ver" value="MSC" onclick="document.getElementById(\'secret\').style.display=\'\';">MSC: '.getconstStr('OndriveVerMSC').'
             <div id="secret" style="display:none">
                 <a href="'.$app_url.'" target="_blank">'.getconstStr('GetSecretIDandKEY').'</a><br>