FormulaStudent · pull · Jan 18, 2021 · Jan 18, 2021 · Jan 18, 2021 · Jan 18, 2021
diff --git a/common.php b/common.php
@@ -40,21 +40,22 @@
     'Driver'            => 0b100,
     'client_id'         => 0b100,
     'client_secret'     => 0b101,
-    'diskname'          => 0b111,
-    'domain_path'       => 0b111,
-    'downloadencrypt'   => 0b110,
-    'guestup_path'      => 0b111,
     'sharepointSite'    => 0b101,
     'shareurl'          => 0b101,
     //'sharecookie'       => 0b101,
     'shareapiurl'       => 0b101,
     'siteid'            => 0b100,
-    'domainforproxy'    => 0b111,
-    'public_path'       => 0b111,
     'refresh_token'     => 0b100,
     'token_expires'     => 0b100,
     'default_drive_id'  => 0b100,
     'default_sbox_drive_id'=> 0b100,
+
+    'diskname'          => 0b111,
+    'domain_path'       => 0b111,
+    'downloadencrypt'   => 0b110,
+    'guestup_path'      => 0b111,
+    'domainforproxy'    => 0b111,
+    'public_path'       => 0b111,
 ];
 
 $timezones = array( 
@@ -417,6 +418,7 @@ function baseclassofdrive($d = null)
 
 function extendShow_diskenv($drive)
 {
+    if (!$drive) return [];
     return $drive->ext_show_innerenv();
 }
 
@@ -1077,18 +1079,19 @@ function EnvOpt($needUpdate = 0)
     if (isset($_POST['submit1'])) {
         $_SERVER['disk_oprating'] = '';
         foreach ($_POST as $k => $v) {
-            if (isShowedEnv($k) || $k=='disktag_del' || $k=='disktag_add' || $k=='disktag_rename') {
+            if (isShowedEnv($k) || $k=='disktag_del' || $k=='disktag_add' || $k=='disktag_rename' || $k=='disktag_copy') {
                 $tmp[$k] = $v;
             }
             if ($k=='disktag_newname') {
                 $v = preg_replace('/[^0-9a-zA-Z|_]/i', '', $v);
                 $f = substr($v, 0, 1);
                 if (strlen($v)==1) $v .= '_';
-                //if (in_array($v, $CommonEnv)) {
                 if (isCommonEnv($v)) {
-                    return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button><script>document.cookie=\'disktag=; path=/\';</script>', 'Error', 201);
+                    return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>', 'Error', 201);
                 } elseif (!(('a'<=$f && $f<='z') || ('A'<=$f && $f<='Z'))) {
-                    return message('Please start with letters');
+                    return message('<button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>', 'Please start with letters', 201);
+                } elseif (getConfig($v)) {
+                    return message('<button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>', 'Same tag', 201);
                 } else {
                     $tmp[$k] = $v;
                 }
@@ -1274,7 +1277,7 @@ function dragsort(t) {
 <table border=1 width=100%>
     <tr>
         <td>
-            <form action="" method="post" style="margin: 0">
+            <form action="" method="post" style="margin: 0" onsubmit="return deldiskconfirm(this);">
                 <input type="hidden" name="disktag_del" value="'.$disktag.'">
                 <input type="submit" name="submit1" value="'.getconstStr('DelDisk').'">
             </form>
@@ -1285,12 +1288,16 @@ function dragsort(t) {
                 <input type="text" name="disktag_newname" value="'.$disktag.'" placeholder="' . getconstStr('EnvironmentsDescription')['disktag'] . '">
                 <input type="submit" name="submit1" value="'.getconstStr('RenameDisk').'">
             </form>
+            <form action="" method="post" style="margin: 0">
+                <input type="hidden" name="disktag_copy" value="' . $disktag . '">
+                <input type="submit" name="submit1" value="' . getconstStr('CopyDisk') . '">
+            </form>
         </td>
     </tr>
     <tr>
         <td>Driver</td>
         <td>' . getConfig('Driver', $disktag);
-            if (baseclassofdrive($disk_tmp)=='Onedrive') $html .= ' <a href="?AddDisk=' . get_class($disk_tmp) . '&disktag=' . $disktag . '&SelectDrive">Change Driver type' . getconstStr(' ') . '</a>';
+            if ($diskok && baseclassofdrive($disk_tmp)=='Onedrive') $html .= ' <a href="?AddDisk=' . get_class($disk_tmp) . '&disktag=' . $disktag . '&SelectDrive">' . getconstStr('ChangeOnedrivetype') . '</a>';
             $html .= '</td>
     </tr>
     ';
@@ -1370,13 +1377,18 @@ function changedrivetype(d) {
 <form name="updateform" action="" method="post">
     <input type="text" name="auth" size="6" placeholder="auth" value="qkqpttgf">
     <input type="text" name="project" size="12" placeholder="project" value="OneManager-php">
-    <button name="QueryBranchs" onclick="querybranchs();return false">'.getconstStr('QueryBranchs').'</button>
+    <button name="QueryBranchs" onclick="querybranchs();return false;">'.getconstStr('QueryBranchs').'</button>
     <select name="branch">
         <option value="master">master</option>
     </select>
     <input type="submit" name="updateProgram" value="'.getconstStr('updateProgram').'">
 </form>
 <script>
+    function deldiskconfirm(t) {
+        var msg="' . getconstStr('Delete') . ' ??";
+        if (confirm(msg)==true) return true;
+        else return false;
+    }
     function renametag(t) {
         if (t.disktag_newname.value==\'\') {
             alert(\''.getconstStr('DiskTag').'\');

diff --git a/conststr.php b/conststr.php
@@ -407,12 +407,20 @@
         'fa' => 'پاک کردن این دیسک',
         'ar-sa' => 'حذف هذا القرص',
     ],
+    'CopyDisk' => [
+        'en-us' => 'Copy this Disk',
+        'zh-cn' => '复制此盘',
+    ],
     'RenameDisk' => [
         'en-us' => 'Rename Disk Tag',
         'zh-cn' => '改变标签',
         'zh-tw' => '修改標籤',
         'ar-sa' => 'تغيير التسمية',
     ],
+    'ChangeOnedrivetype' => [
+        'en-us' => 'Change Onedrive/Sharepoint',
+        'zh-cn' => '切换Onedrive/Sharepoint',
+    ],
     'AddDisk' => [
         'en-us' => 'Add Disk',
         'zh-cn' => '添加盘',

diff --git a/disk/Onedrive.php b/disk/Onedrive.php
@@ -415,7 +415,10 @@ public function AddDisk() {
                 } else {
                     return message($arr['stat'] . $arr['body'], 'Get User ID', $arr['stat']);
                 }*/
-                $tmp = null;
+                if (get_class($this)=='Sharepoint') $tmp['Driver'] = 'Onedrive';
+                elseif (get_class($this)=='SharepointCN') $tmp['Driver'] = 'OnedriveCN';
+                $tmp['sharepointSite'] = '';
+                $tmp['siteid'] = '';
             } elseif ($_POST['DriveType']=='Custom') {
                 // sitename计算siteid
                 $tmp1 = $this->get_siteid($_POST['sharepointSite']);
@@ -454,6 +457,7 @@ public function AddDisk() {
         }
 
         if (isset($_GET['SelectDrive'])) {
+            if (get_class($this)=='Sharelink') return message('Can not change to other.', 'Back', 201);
             if ($this->access_token == '') {
                 $refresh_token = getConfig('refresh_token', $this->disktag);
                 if (!$refresh_token) {
@@ -576,13 +580,7 @@ function notnull(t)
                 $f = substr($_POST['disktag_add'], 0, 1);
                 if (strlen($_POST['disktag_add'])==1) $_POST['disktag_add'] .= '_';
                 if (isCommonEnv($_POST['disktag_add'])) {
-                    return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>
-                    <script>
-                    var expd = new Date();
-                    expd.setTime(expd.getTime()+1);
-                    var expires = "expires="+expd.toGMTString();
-                    document.cookie=\'disktag=; path=/; \'+expires;
-                    </script>', 'Error', 201);
+                    return message('Do not input ' . $envs . '<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>', 'Error', 201);
                 } elseif (!(('a'<=$f && $f<='z') || ('A'<=$f && $f<='Z'))) {
                     return message('Please start with letters<br><button onclick="location.href = location.href;">'.getconstStr('Refresh').'</button>
                     <script>
@@ -922,4 +920,4 @@ protected function MSAPI($method, $path, $data = '', $access_token)
         return $response;
     }
 
-}
+}
diff --git a/platform/AliyunFC.php b/platform/AliyunFC.php
@@ -96,6 +96,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/BaiduCFC.php b/platform/BaiduCFC.php
@@ -86,6 +86,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/Heroku.php b/platform/Heroku.php
@@ -92,6 +92,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/HuaweiFG_env.php b/platform/HuaweiFG_env.php
@@ -110,6 +110,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/HuaweiFG_file.php b/platform/HuaweiFG_file.php
@@ -123,6 +123,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/Normal.php b/platform/Normal.php
@@ -105,6 +105,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/TencentSCF_env.php b/platform/TencentSCF_env.php
@@ -93,6 +93,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $tmp[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $tmp[$newtag] = getConfig($v);
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/platform/TencentSCF_file.php b/platform/TencentSCF_file.php
@@ -104,6 +104,11 @@ function setConfig($arr, $disktag = '')
             $disktags = array_diff($disktags, [ $v ]);
             $envs[$v] = '';
             $operatedisk = 1;
+        } elseif ($k=='disktag_copy') {
+            $newtag = $v . '_' . date("Ymd_His");
+            $envs[$newtag] = $envs[$v];
+            array_push($disktags, $newtag);
+            $operatedisk = 1;
         } elseif ($k=='disktag_rename' || $k=='disktag_newname') {
             if ($arr['disktag_rename']!=$arr['disktag_newname']) $operatedisk = 1;
         } else {

diff --git a/version b/version
@@ -1,7 +1,10 @@
+20210118-1600.31
+can change Ondrive to Sharepoint, can copy a disk. fix a bug that 500 error in setup.
+Onedrive跟Sharepoint可以切换了，可以复制一个盘。修复bug。
+
 20210115-1111.30
 <font color=red>v3, after update, please AddDisk again, please set passfile again.</font> themes of php deleted, or you can use branch v2_last.
 <font color=red>v3，一键升级后请重新添加盘，passfile失效，重新设置。</font>php主题删掉了，要么就用v2_last分支。
-
 20201229.29
 Modify tags, change sequence of disk.
 可以修改标签，移动标签顺序。