mv waitfunction before install, add setp=auth
parent
9fdd9227a5
commit
42e06e647d
32
common.php
32
common.php
|
@ -167,6 +167,13 @@ function main($path)
|
||||||
if (isset($_COOKIE['timezone'])&&$_COOKIE['timezone']!='') $_SERVER['timezone'] = $_COOKIE['timezone'];
|
if (isset($_COOKIE['timezone'])&&$_COOKIE['timezone']!='') $_SERVER['timezone'] = $_COOKIE['timezone'];
|
||||||
if ($_SERVER['timezone']=='') $_SERVER['timezone'] = 0;
|
if ($_SERVER['timezone']=='') $_SERVER['timezone'] = 0;
|
||||||
|
|
||||||
|
if (isset($_GET['WaitFunction'])) {
|
||||||
|
$response = WaitFunction($_GET['WaitFunction']);
|
||||||
|
//var_dump($response);
|
||||||
|
if ($response===true) return output("ok", 200);
|
||||||
|
elseif ($response===false) return output("", 206);
|
||||||
|
else return $response;
|
||||||
|
}
|
||||||
if (getConfig('admin')=='') return install();
|
if (getConfig('admin')=='') return install();
|
||||||
if (getConfig('adminloginpage')=='') {
|
if (getConfig('adminloginpage')=='') {
|
||||||
$adminloginpage = 'admin';
|
$adminloginpage = 'admin';
|
||||||
|
@ -204,13 +211,6 @@ function main($path)
|
||||||
$url = path_format($_SERVER['PHP_SELF'] . '/');
|
$url = path_format($_SERVER['PHP_SELF'] . '/');
|
||||||
return output('<script>alert(\''.getconstStr('SetSecretsFirst').'\');</script>', 302, [ 'Location' => $url ]);
|
return output('<script>alert(\''.getconstStr('SetSecretsFirst').'\');</script>', 302, [ 'Location' => $url ]);
|
||||||
}
|
}
|
||||||
if (isset($_GET['WaitFunction'])) {
|
|
||||||
$response = WaitFunction($_GET['WaitFunction']);
|
|
||||||
//var_dump($response);
|
|
||||||
if ($response===true) return output("ok", 200);
|
|
||||||
elseif ($response===false) return output("", 206);
|
|
||||||
else return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
$_SERVER['sitename'] = getConfig('sitename');
|
$_SERVER['sitename'] = getConfig('sitename');
|
||||||
if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
|
if (empty($_SERVER['sitename'])) $_SERVER['sitename'] = getconstStr('defaultSitename');
|
||||||
|
@ -616,7 +616,7 @@ function filecache($disktag)
|
||||||
{
|
{
|
||||||
$dir = sys_get_temp_dir();
|
$dir = sys_get_temp_dir();
|
||||||
if (!is_writable($dir)) {
|
if (!is_writable($dir)) {
|
||||||
$tmp = __DIR__ . '/tmp/';
|
$tmp = $_SERVER['HTTP_HOST'] . '/tmp/';
|
||||||
if (file_exists($tmp)) {
|
if (file_exists($tmp)) {
|
||||||
if ( is_writable($tmp) ) $dir = $tmp;
|
if ( is_writable($tmp) ) $dir = $tmp;
|
||||||
} elseif ( mkdir($tmp) ) $dir = $tmp;
|
} elseif ( mkdir($tmp) ) $dir = $tmp;
|
||||||
|
@ -636,10 +636,10 @@ function sortConfig(&$arr)
|
||||||
{
|
{
|
||||||
ksort($arr);
|
ksort($arr);
|
||||||
|
|
||||||
$tags = explode('|', $arr['disktag']);
|
if (isset($arr['disktag'])) {
|
||||||
unset($arr['disktag']);
|
$tags = explode('|', $arr['disktag']);
|
||||||
if ($tags[0]!='') {
|
unset($arr['disktag']);
|
||||||
foreach($tags as $tag) {
|
foreach($tags as $tag) if (isset($arr[$tag])) {
|
||||||
$disks[$tag] = $arr[$tag];
|
$disks[$tag] = $arr[$tag];
|
||||||
unset($arr[$tag]);
|
unset($arr[$tag]);
|
||||||
}
|
}
|
||||||
|
@ -920,7 +920,7 @@ function message($message, $title = 'Message', $statusCode = 200, $wainstat = 0)
|
||||||
//setTimeout(function() { getStatus() }, 1000);
|
//setTimeout(function() { getStatus() }, 1000);
|
||||||
}
|
}
|
||||||
} else if (xhr.status==206) {
|
} else if (xhr.status==206) {
|
||||||
errordiv.innerHTML = min + "<br>' . getconstStr('Wait') . '" + x;
|
errordiv.innerHTML = "' . getconstStr('Wait') . '" + x + "<br>" + min;
|
||||||
setTimeout(function() { getStatus() }, 1000);
|
setTimeout(function() { getStatus() }, 1000);
|
||||||
} else {
|
} else {
|
||||||
errordiv.innerHTML = "ERROR<br>" + xhr.status + "<br>" + xhr.responseText;
|
errordiv.innerHTML = "ERROR<br>" + xhr.status + "<br>" + xhr.responseText;
|
||||||
|
@ -1405,8 +1405,9 @@ function EnvOpt($needUpdate = 0)
|
||||||
if ($_GET['setup']==='cmd') {
|
if ($_GET['setup']==='cmd') {
|
||||||
$statusCode = 200;
|
$statusCode = 200;
|
||||||
$html .= '
|
$html .= '
|
||||||
|
OneManager DIR: ' . __DIR__ . '
|
||||||
<form name="form1" method="POST" action="">
|
<form name="form1" method="POST" action="">
|
||||||
<input id="inputarea" name="cmd" style="width:100%" value="' . $_POST['cmd'] . '"><br>
|
<input id="inputarea" name="cmd" style="width:100%" value="' . $_POST['cmd'] . '" placeholder="ls, pwd, cat"><br>
|
||||||
<input type="submit" value="post">
|
<input type="submit" value="post">
|
||||||
</form>';
|
</form>';
|
||||||
if ($_POST['cmd']!='') {
|
if ($_POST['cmd']!='') {
|
||||||
|
@ -1436,6 +1437,9 @@ output:
|
||||||
</script>';
|
</script>';
|
||||||
return message($html, 'Run cmd', $statusCode);
|
return message($html, 'Run cmd', $statusCode);
|
||||||
}
|
}
|
||||||
|
if ($_GET['setup']==='auth') {
|
||||||
|
return changeAuthKey();
|
||||||
|
}
|
||||||
if ($_GET['setup']==='platform') {
|
if ($_GET['setup']==='platform') {
|
||||||
$frame .= '
|
$frame .= '
|
||||||
<table border=1 width=100%>
|
<table border=1 width=100%>
|
||||||
|
|
Loading…
Reference in New Issue