diff --git a/common.php b/common.php index dbf58a2..defc676 100644 --- a/common.php +++ b/common.php @@ -1512,9 +1512,11 @@ function EnvOpt($needUpdate = 0) $canOneKeyUpate = 1; } elseif (isset($_SERVER['FC_SERVER_PATH'])&&$_SERVER['FC_SERVER_PATH']==='/var/fc/runtime/php7.2') { $canOneKeyUpate = 1; - } elseif ($_SERVER['BCE_CFC_RUNTIME_NAME']=='php7') { + } elseif (isset($_SERVER['BCE_CFC_RUNTIME_NAME'])&&$_SERVER['BCE_CFC_RUNTIME_NAME']=='php7') { $canOneKeyUpate = 1; - } elseif ($_SERVER['_APP_SHARE_DIR']==='/var/share/CFF/processrouter') { + } elseif (isset($_SERVER['_APP_SHARE_DIR'])&&$_SERVER['_APP_SHARE_DIR']==='/var/share/CFF/processrouter') { + $canOneKeyUpate = 1; + } elseif (isset($_SERVER['DOCUMENT_ROOT'])&&$_SERVER['DOCUMENT_ROOT']==='/var/task/user') { $canOneKeyUpate = 1; } else { $tmp = time(); diff --git a/disk/Onedrive.php b/disk/Onedrive.php index 8972d77..426397d 100644 --- a/disk/Onedrive.php +++ b/disk/Onedrive.php @@ -342,7 +342,8 @@ class Onedrive { $oldname = path_format($file['path'] . '/' . $oldname); $data = '{"name":"' . $newname . '"}'; //echo $oldname; - $result = $this->MSAPI('PATCH', $oldname, $data); + if ($file['id']) $result = $this->MSAPI('PATCH', "/items/" . $file['id'], $data); + else $result = $this->MSAPI('PATCH', $oldname, $data); return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); } public function Delete($file) { @@ -350,8 +351,9 @@ class Onedrive { $filename = path_format($file['path'] . '/' . $filename); //echo $filename; $result = $this->MSAPI('DELETE', $filename); - return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); - return output($result['body'], $result['stat']); + if ($result['stat']!=204) $r_body = json_encode($this->files_format(json_decode($result['body'], true))); + return output($r_body, $result['stat']); + //return output($result['body'], $result['stat']); } public function Encrypt($folder, $passfilename, $pass) { $filename = path_format($folder['path'] . '/' . urlencode($passfilename)); @@ -364,7 +366,7 @@ class Onedrive { if ($path1!='/'&&substr($path1, -1)=='/') $path1 = substr($path1, 0, -1); savecache('path_' . $path1 . '/?password', '', $this->disktag, 1); return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); - return output($result['body'], $result['stat']); + //return output($result['body'], $result['stat']); } public function Move($file, $folder) { $filename = spurlencode($file['name']); @@ -375,7 +377,7 @@ class Onedrive { if ($path2!='/'&&substr($path2, -1)=='/') $path2 = substr($path2, 0, -1); savecache('path_' . $path2, json_decode('{}', true), $this->disktag, 1); return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); - return output($result['body'], $result['stat']); + //return output($result['body'], $result['stat']); } public function Copy($file) { $filename = spurlencode($file['name']); @@ -404,7 +406,7 @@ class Onedrive { $result = $this->MSAPI('copy', $filename, $data); }*/ return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); - return output($result['body'], $result['stat']); + //return output($result['body'], $result['stat']); } public function Edit($file, $content) { /*TXT一般不会超过4M，不用二段上传 @@ -431,7 +433,7 @@ class Onedrive { } //savecache('path_' . $path1, json_decode('{}',true), $_SERVER['disktag'], 1); return output(json_encode($this->files_format(json_decode($result['body'], true))), $result['stat']); - return output($result['body'], $result['stat']); + //return output($result['body'], $result['stat']); } public function AddDisk() { @@ -456,6 +458,7 @@ class Onedrive { } $tmp = null; + $tmp['Driver'] = get_class($this); if ($_POST['DriveType']=='Onedrive') { /*$api = $this->api_url . '/me'; $arr = curl('GET', $api, '', [ 'Authorization' => 'Bearer ' . $this->access_token ], 1); @@ -946,6 +949,9 @@ class Onedrive { $url = $this->api_url . $this->ext_api_url; if ($path=='' or $path=='/') { $url .= '/'; + } elseif (substr($path, 0, 6)=="/items") { + $url = substr($url, 0, -5); + $url .= $path; } else { $url .= ':' . $path; if (substr($url,-1)=='/') $url=substr($url,0,-1); diff --git a/index.php b/index.php index 3e584dc..f029312 100644 --- a/index.php +++ b/index.php @@ -6,6 +6,7 @@ include 'conststr.php'; include 'common.php'; //echo '
'. json_encode($_SERVER, JSON_PRETTY_PRINT).'
'; +//echo '
'. json_encode($_ENV, JSON_PRETTY_PRINT).'
'; if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') { if (getenv('ONEMANAGER_CONFIG_SAVE')=='file') include 'platform/TencentSCF_file.php'; else include 'platform/TencentSCF_env.php'; @@ -30,6 +31,19 @@ if (isset($_SERVER['USER'])&&$_SERVER['USER']==='qcloud') { } http_response_code($re['statusCode']); echo $re['body']; +} elseif (isset($_SERVER['DOCUMENT_ROOT'])&&$_SERVER['DOCUMENT_ROOT']==='/var/task/user') { + include 'platform/Vercel.php'; + $path = getpath(); + //echo 'path:'. $path; + $_GET = getGET(); + //echo '
'. json_encode($_GET, JSON_PRETTY_PRINT).'
'; + $re = main($path); + $sendHeaders = array(); + foreach ($re['headers'] as $headerName => $headerVal) { + header($headerName . ': ' . $headerVal, true); + } + http_response_code($re['statusCode']); + echo $re['body']; } else { include 'platform/Normal.php'; $path = getpath(); diff --git a/platform/BaiduCFC.php b/platform/BaiduCFC.php index 63a61db..6fc4db2 100644 --- a/platform/BaiduCFC.php +++ b/platform/BaiduCFC.php @@ -363,7 +363,7 @@ function api_error_msg($response) { if (isset($response['code'])) $html = $response['code'] . '
' . $response['message']; - else $html = var_dump($response); + else $html = json_encode($response, JSON_PRETTY_PRINT); return $html . '

BRN: ' . $_SERVER['functionBrn'] . '
'; diff --git a/platform/Vercel.php b/platform/Vercel.php new file mode 100644 index 0000000..3f38087 --- /dev/null +++ b/platform/Vercel.php @@ -0,0 +1,387 @@ +0) $path = substr($_SERVER['REQUEST_URI'], 0, $p); + else $path = $_SERVER['REQUEST_URI']; + $path = path_format( substr($path, strlen($_SERVER['base_path'])) ); + $_SERVER['DOCUMENT_ROOT'] = '/var/task/user'; + return $path; +} + +function getGET() +{ + if (!$_POST) { + if (!!$HTTP_RAW_POST_DATA) { + $tmpdata = $HTTP_RAW_POST_DATA; + } else { + $tmpdata = file_get_contents('php://input'); + } + if (!!$tmpdata) { + $postbody = explode("&", $tmpdata); + foreach ($postbody as $postvalues) { + $pos = strpos($postvalues,"="); + $_POST[urldecode(substr($postvalues,0,$pos))]=urldecode(substr($postvalues,$pos+1)); + } + } + } + if (isset($_SERVER['UNENCODED_URL'])) $_SERVER['REQUEST_URI'] = $_SERVER['UNENCODED_URL']; + $p = strpos($_SERVER['REQUEST_URI'],'?'); + if ($p>0) { + $getstr = substr($_SERVER['REQUEST_URI'], $p+1); + $getstrarr = explode("&",$getstr); + foreach ($getstrarr as $getvalues) { + if ($getvalues != '') { + $pos = strpos($getvalues, "="); + //echo $pos; + if ($pos > 0) { + $getarry[urldecode(substr($getvalues, 0, $pos))] = urldecode(substr($getvalues, $pos + 1)); + } else { + $getarry[urldecode($getvalues)] = true; + } + } + } + } + if (isset($getarry)) { + return $getarry; + } else { + return []; + } +} + +function getConfig($str, $disktag = '') +{ + if (isInnerEnv($str)) { + if ($disktag=='') $disktag = $_SERVER['disktag']; + $tmp = getenv($disktag); + if (is_array($tmp)) $env = $tmp; + else $env = json_decode($tmp, true); + if (isset($env[$str])) { + if (isBase64Env($str)) return base64y_decode($env[$str]); + else return $env[$str]; + } + } else { + if (isBase64Env($str)) return base64y_decode(getenv($str)); + else return getenv($str); + } + return ''; +} + +function setConfig($arr, $disktag = '') +{ + if ($disktag=='') $disktag = $_SERVER['disktag']; + $disktags = explode("|", getenv('disktag')); + if ($disktag!='') { + $tmp = getenv($disktag); + if (is_array($tmp)) $diskconfig = $tmp; + else $diskconfig = json_decode($tmp, true); + } + $tmp = []; + $indisk = 0; + $operatedisk = 0; + foreach ($arr as $k => $v) { + if (isCommonEnv($k)) { + if (isBase64Env($k)) $tmp[$k] = base64y_encode($v); + else $tmp[$k] = $v; + } elseif (isInnerEnv($k)) { + if (isBase64Env($k)) $diskconfig[$k] = base64y_encode($v); + else $diskconfig[$k] = $v; + $indisk = 1; + } elseif ($k=='disktag_add') { + array_push($disktags, $v); + $operatedisk = 1; + } elseif ($k=='disktag_del') { + $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 { + $tmp[$k] = json_encode($v); + } + } + if ($indisk) { + $diskconfig = array_filter($diskconfig, 'array_value_isnot_null'); + ksort($diskconfig); + $tmp[$disktag] = json_encode($diskconfig); + } + if ($operatedisk) { + if (isset($arr['disktag_newname']) && $arr['disktag_newname']!='') { + $tags = []; + foreach ($disktags as $tag) { + if ($tag==$arr['disktag_rename']) array_push($tags, $arr['disktag_newname']); + else array_push($tags, $tag); + } + $tmp['disktag'] = implode('|', $tags); + $tmp[$arr['disktag_newname']] = getConfig($arr['disktag_rename']); + $tmp[$arr['disktag_rename']] = null; + } else { + $disktags = array_unique($disktags); + foreach ($disktags as $disktag) if ($disktag!='') $disktag_s .= $disktag . '|'; + if ($disktag_s!='') $tmp['disktag'] = substr($disktag_s, 0, -1); + else $tmp['disktag'] = null; + } + } + foreach ($tmp as $key => $val) if ($val=='') $tmp[$key]=null; + + return setVercelConfig($tmp, getConfig('HerokuappId'), getConfig('APIKey')); + error_log1(json_encode($arr, JSON_PRETTY_PRINT) . ' => tmp：' . json_encode($tmp, JSON_PRETTY_PRINT)); +} + +function install() +{ + global $constStr; + if ($_GET['install1']) { + if ($_POST['admin']!='') { + $tmp['admin'] = $_POST['admin']; + //$tmp['language'] = $_POST['language']; + $tmp['timezone'] = $_COOKIE['timezone']; + $APIKey = getConfig('APIKey'); + if ($APIKey=='') { + $APIKey = $_POST['APIKey']; + $tmp['APIKey'] = $APIKey; + } + + $projectPath = splitlast(__DIR__, "/")[0]; + //$html .= file_get_contents($projectPath . "/.data/config.php") . "
";GET /v5/now/deployments /v8/projects/:id/env + $token = $tmp['APIKey']; + $header["Authorization"] = "Bearer " . $token; + $header["Content-Type"] = "application/json"; + $aliases = json_decode(curl("GET", "https://api.vercel.com/v3/now/aliases", "", $header)['body'], true); + $host = splitfirst($_SERVER["host"], "//")[1]; + foreach ($aliases["aliases"] as $key => $aliase) { + if ($host==$aliase["alias"]) $projectId = $aliase["projectId"]; + } + //$envs = json_decode(curl("GET", "https://api.vercel.com/v8/projects/" . $projectId . "/env", "", $header)['body'], true); + + $tmp['HerokuappId'] = $projectId; + $response = json_decode(setVercelConfig($tmp, $projectId, $APIKey)['body'], true); + if (api_error($response)) { + $html = api_error_msg($response); + $title = 'Error'; + } else { + return output(' + + ', 302); + } + return message($html, $title, 201); + } + } + if ($_GET['install0']) { + $html .= ' +
+language:
'; + foreach ($constStr['languages'] as $key1 => $value1) { + $html .= ' +
'; + } + if (getConfig('APIKey')=='') $html .= ' + ' . getconstStr('Create') . ' token
+
'; + $html .= '
+
'; + $html .= ' + +
+ '; + $title = getconstStr('SelectLanguage'); + return message($html, $title, 201); + } + + if (substr($_SERVER["host"], -10)=="vercel.app") { + $html .= '' . getconstStr('ClickInstall') . ', ' . getconstStr('LogintoBind'); + $html .= "
Remember: you MUST wait 30-60s after each operate / do some change, that make sure Vercel has done the building
" ; + } else { + $html.= "Please visit form *.vercel.app"; + } + $title = 'Install'; + return message($html, $title, 201); +} + +// POST /v8/projects/:id/env +function setVercelConfig($envs, $appId, $token) +{ + $url = "https://api.vercel.com/v8/projects/" . $appId . "/env"; + $header["Authorization"] = "Bearer " . $token; + $header["Content-Type"] = "application/json"; + $response = curl("GET", $url, "", $header); + $result = json_decode($response['body'], true); + foreach ($result["envs"] as $key => $value) { + $existEnvs[$value["key"]] = $value["id"]; + } + $response = null; + foreach ($envs as $key => $value) { + $tmp = null; + $tmp["type"] = "encrypted"; + $tmp["key"] = $key; + $tmp["value"] = $value; + $tmp["target"] = [ "development", "production", "preview" ]; + if (isset($existEnvs[$key])) { + if ($value) $response = curl("PATCH", $url . "/" . $existEnvs[$key], json_encode($tmp), $header); + else $response = curl("DELETE", $url . "/" . $existEnvs[$key], "", $header); + } else { + if ($value) $response = curl("POST", $url, json_encode($tmp), $header); + } + //echo $key . ":" . $value . ", " . json_encode($response, JSON_PRETTY_PRINT) . "
"; + } + return VercelUpdate($appId, $token); + //return $response; +} + +function VercelUpdate($appId, $token, $sourcePath = "") +{ + $url = "https://api.vercel.com/v12/now/deployments"; + $header["Authorization"] = "Bearer " . $token; + $header["Content-Type"] = "application/json"; + $data["name"] = "OneManager"; + $data["project"] = $appId; + $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"; + if ($sourcePath=="") $sourcePath = splitlast(splitlast(__DIR__, "/")[0], "/")[0]; + //echo $sourcePath . "
"; + getEachFiles($file, $sourcePath); + $data["files"] = $file; + + //echo json_encode($data, JSON_PRETTY_PRINT) . " ,data
"; + $response = curl("POST", $url, json_encode($data), $header); + return $response["body"]; +} + +function getEachFiles(&$file, $base, $path = "") +{ + //if (substr($base, -1)=="/") $base = substr($base, 0, -1); + //if (substr($path, -1)=="/") $path = substr($path, 0, -1); + $handler=opendir(path_format($base . "/" . $path)); + while($filename=readdir($handler)) { + if($filename != '.' && $filename != '..' && $filename != '.git'){ + $fromfile = path_format($base . "/" . $path . "/" . $filename); + //echo $fromfile . "
"; + if(is_dir($fromfile)){// 如果读取的某个对象是文件夹，则递归 + $response = getEachFiles($file, $base, path_format($path . "/" . $filename)); + if (api_error(setConfigResponse($response))) return $response; + }else{ + $tmp['file'] = path_format($path . "/" . $filename); + $tmp['data'] = file_get_contents($fromfile); + $file[] = $tmp; + } + } + } + closedir($handler); + + return json_encode( [ 'response' => 'success' ] ); +} + +function api_error($response) +{ + return isset($response['error']); +} + +function api_error_msg($response) +{ + return $response['error']['code'] . '
+' . $response['error']['message'] . '
+'; +} + +function setConfigResponse($response) +{ + return json_decode($response, true); +} + +function OnekeyUpate($auth = 'qkqpttgf', $project = 'OneManager-php', $branch = 'master') +{ + $tmppath = '/tmp'; + + // 从github下载对应tar.gz，并解压 + $url = 'https://github.com/' . $auth . '/' . $project . '/tarball/' . urlencode($branch) . '/'; + $tarfile = $tmppath . '/github.tar.gz'; + $githubfile = file_get_contents($url); + if (!$githubfile) return '{"error":{"message":"fail to download from github"}}'; + file_put_contents($tarfile, $githubfile); + $phar = new PharData($tarfile); // need php5.3, 7, 8 + $phar->extractTo($tmppath, null, true);//路径 要解压的文件 是否覆盖 + unlink($tarfile); + + $outPath = ''; + $tmp = scandir($tmppath); + $name = $auth . '-' . $project; + mkdir($tmppath . "/" . $name, 0777); + foreach ($tmp as $f) { + if ( substr($f, 0, strlen($name)) == $name) { + rename($tmppath . '/' . $f, $tmppath . "/" . $name . '/api'); + $outPath = $tmppath . "/" . $name; + break; + } + } + //echo $outPath . "
"; + //error_log1($outPath); + if ($outPath=='') return '{"error":{"message":"no outpath"}}'; + + return VercelUpdate(getConfig('HerokuappId'), getConfig('APIKey'), $outPath); +} diff --git a/readme.md b/readme.md index 98336f7..5dd2166 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,7 @@ # NOTICE: the release is used as archive. # 注意：release只是用来存档的。 -Please read the descriptions of settings before raising an issue. 请将设置中所有的设置项的说明都读一遍，有些问题就不用问了。 +Please read the descriptions of settings before raising an issue. +请将设置中所有的设置项的说明都读一遍，有些问题就不用问了。 # Deploy to Heroku Official: https://heroku.com @@ -8,7 +9,7 @@ Demo: https://herooneindex.herokuapp.com/ How to Install: > ~~Click the button [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/qkqpttgf/OneManager-php) to Deploy a new app~~(`"We couldn't deploy your app because the source code violates the Salesforce Acceptable Use and External-Facing Services Policy."`) -> Fork this project, create an heroku app, then turn to Deploy tab, deploy via connect to your github fork. +> Fork this project, create a heroku app, then turn to Deploy tab, deploy via connect to your github fork. # Deploy to Glitch @@ -18,6 +19,17 @@ Demo: https://onemanager.glitch.me/ How to Install: New Project -> Import form Github -> paste "https://github.com/qkqpttgf/OneManager-php", after done, Show -> In a New Window. +# Deploy to Vercel +Official: https://vercel.com/ +Demo: null +Notice: +> 1, you must wait 30-50s to make sure deploy READY after change config; +> 2, the max size of environment is 4k, so you can add 3 onedrive or less; +> 3, Vercel limit 100 deploy every day. + +How to Install: https://scfonedrive.github.io/Vercel/Deploy.html . + + # Deploy to Tencent Serverless Cloud Function (SCF 腾讯无服务器云函数) Official: https://cloud.tencent.com/product/scf DEMO: 无 @@ -117,5 +129,9 @@ it will showed at top or bottom as markdown. 以MD语法显示在顶部或底部 ### head.omf foot.omf it will showed at top or bottom as html (javascript works!). 以html显示在顶部或底部（可以跑js）。 +# A cup of coffee +paypal.me/qkqpttgf + +# Chat QQ Group: 212088653 (请看完上面的中英双语再加群，谢谢！) Telegram Group: https://t.me/joinchat/I_RVc0bqxuxlT-d0cO7ozw diff --git a/theme/classic.html b/theme/classic.html index b7b155e..3188f68 100644 --- a/theme/classic.html +++ b/theme/classic.html @@ -63,7 +63,7 @@ .operatediv_close{position:absolute;right:3px;top:3px;} .readme{padding:8px;} .markdown-body, .customfile{padding:20px;text-align:left} - @media only screen and (max-width:480px){ + @media only screen and (orientation: portrait){ body{background-repeat:no-repeat;background-size:cover;background-attachment:fixed;background-image:url("");} diff --git a/theme/flatcard.html b/theme/flatcard.html index c068c92..35ad6f1 100644 --- a/theme/flatcard.html +++ b/theme/flatcard.html @@ -3,9 +3,9 @@ "music":"musical-notes", "video":"logo-youtube", "img":"image", - "office":"paper", + "office":"newspaper", "txt":"clipboard", - "zip":"filing", + "zip":"file-tray-full", "iso":"disc", "apk":"logo-android", "exe":"logo-windows", @@ -108,7 +108,7 @@