mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 20:17:24 +08:00
fix ddsubment https blank
This commit is contained in:
@@ -50,15 +50,7 @@ class NexusUpdate extends Command
|
|||||||
if ($includeComposer) {
|
if ($includeComposer) {
|
||||||
$includes[] = 'composer';
|
$includes[] = 'composer';
|
||||||
}
|
}
|
||||||
if ($tag !== null) {
|
|
||||||
if ($tag === 'dev') {
|
|
||||||
$url = "https://github.com/xiaomlove/nexusphp/archive/refs/heads/php8.zip";
|
|
||||||
} else {
|
|
||||||
$url = "https://api.github.com/repos/xiaomlove/nexusphp/tarball/v$tag";
|
|
||||||
}
|
|
||||||
$this->doLog("Specific tag: '$tag', download from '$url' and extra code, includes: " . implode(', ', $includes));
|
|
||||||
$tmpPath = $this->update->downAndExtractCode($url, $includes);
|
|
||||||
}
|
|
||||||
//Step 1
|
//Step 1
|
||||||
$step = $this->update->currentStep();
|
$step = $this->update->currentStep();
|
||||||
$log = sprintf('Step %s, %s...', $step, $this->update->getStepName($step));
|
$log = sprintf('Step %s, %s...', $step, $this->update->getStepName($step));
|
||||||
@@ -73,6 +65,28 @@ class NexusUpdate extends Command
|
|||||||
}
|
}
|
||||||
$this->update->gotoStep(++$step);
|
$this->update->gotoStep(++$step);
|
||||||
|
|
||||||
|
//Download
|
||||||
|
if ($tag !== null) {
|
||||||
|
if ($tag === 'dev') {
|
||||||
|
$url = "https://github.com/xiaomlove/nexusphp/archive/refs/heads/php8.zip";
|
||||||
|
} else {
|
||||||
|
$url = "https://api.github.com/repos/xiaomlove/nexusphp/tarball/v$tag";
|
||||||
|
}
|
||||||
|
$this->doLog("Specific tag: '$tag', download from '$url' and extra code, includes: " . implode(', ', $includes));
|
||||||
|
$tmpPath = $this->update->downAndExtractCode($url, $includes);
|
||||||
|
}
|
||||||
|
if ($includeComposer) {
|
||||||
|
$requireCommand = 'composer';
|
||||||
|
if (!command_exists($requireCommand)) {
|
||||||
|
$this->doLog("Error: require $requireCommand");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
$command = "composer install";
|
||||||
|
$log = "Running $command ...";
|
||||||
|
$this->doLog($log);
|
||||||
|
$this->update->executeCommand($command);
|
||||||
|
}
|
||||||
|
|
||||||
//Step 2
|
//Step 2
|
||||||
$log = sprintf('Step %s, %s, cli skip...', $step, $this->update->getStepName($step));
|
$log = sprintf('Step %s, %s, cli skip...', $step, $this->update->getStepName($step));
|
||||||
$this->doLog($log);
|
$this->doLog($log);
|
||||||
|
|||||||
@@ -119,7 +119,6 @@ class EditSetting extends Page implements Forms\Contracts\HasForms
|
|||||||
])->columns(2);
|
])->columns(2);
|
||||||
|
|
||||||
$tabs = apply_filter('nexus_setting_tabs', $tabs);
|
$tabs = apply_filter('nexus_setting_tabs', $tabs);
|
||||||
// return $tabs;
|
|
||||||
return $tabs;
|
return $tabs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -322,6 +322,10 @@ class Update extends Install
|
|||||||
|
|
||||||
public function downAndExtractCode($url, array $includes = []): string
|
public function downAndExtractCode($url, array $includes = []): string
|
||||||
{
|
{
|
||||||
|
$requireCommand = 'rsync';
|
||||||
|
if (!command_exists($requireCommand)) {
|
||||||
|
throw new \RuntimeException("command: $requireCommand not exists!");
|
||||||
|
}
|
||||||
$arr = explode('/', $url);
|
$arr = explode('/', $url);
|
||||||
$basename = last($arr);
|
$basename = last($arr);
|
||||||
$isZip = false;
|
$isZip = false;
|
||||||
|
|||||||
Vendored
+1
-1
@@ -19,7 +19,7 @@ arrowpointers:{
|
|||||||
},
|
},
|
||||||
hideinterval: 200, //delay in milliseconds before entire menu disappears onmouseout.
|
hideinterval: 200, //delay in milliseconds before entire menu disappears onmouseout.
|
||||||
effects: {enableswipe: true, enableslide: true, enablefade: true, duration: 200},
|
effects: {enableswipe: true, enableslide: true, enablefade: true, duration: 200},
|
||||||
httpsiframesrc: "blank.htm", //If menu is run on a secure (https) page, the IFRAME shim feature used by the script should point to an *blank* page *within* the secure area to prevent an IE security prompt. Specify full URL to that page on your server (leave as is if not applicable).
|
httpsiframesrc: "about:blank", //If menu is run on a secure (https) page, the IFRAME shim feature used by the script should point to an *blank* page *within* the secure area to prevent an IE security prompt. Specify full URL to that page on your server (leave as is if not applicable).
|
||||||
|
|
||||||
///No need to edit beyond here////////////////////
|
///No need to edit beyond here////////////////////
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user