0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactored some plugins

Browse source
This commit is contained in:
markseu 2018-08-13 15:39:50 +02:00
parent 768d8988ac
commit 830928e8f7
3 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
system/plugins/command.php
View file

@ -124,31 +124,11 @@ class YellowCommand {
$statusCode = $this->requestStaticFile($scheme, $address, $base, $location);
if ($statusCode<400 || $error) {
$fileData = ob_get_contents();
$modified = strtotime($this->yellow->page->getHeader("Last-Modified"));
if ($modified==0) $modified = $this->yellow->toolbox->getFileModified($this->yellow->page->fileName);
if ($statusCode>=301 && $statusCode<=303) {
$fileData = $this->getStaticRedirect($this->yellow->page->getHeader("Location"));
$modified = time();
}
$fileName = $this->getStaticFile($path, $location, $statusCode);
if (!$this->yellow->toolbox->createFile($fileName, $fileData, true) ||
!$this->yellow->toolbox->modifyFile($fileName, $modified)) {
$statusCode = 500;
$this->yellow->page->statusCode = $statusCode;
$this->yellow->page->set("pageError", "Can't write file '$fileName'!");
}
$statusCode = $this->saveStaticFile($path, $location, $fileData, $statusCode);
}
ob_end_clean();
} else {
$statusCode = 200;
$modified = $this->yellow->toolbox->getFileModified($this->yellow->page->fileName);
$fileName = $this->getStaticFile($path, $location, $statusCode);
if (!$this->yellow->toolbox->copyFile($this->yellow->page->fileName, $fileName, true) ||
!$this->yellow->toolbox->modifyFile($fileName, $modified)) {
$statusCode = 500;
$this->yellow->page->statusCode = $statusCode;
$this->yellow->page->set("pageError", "Can't write file '$fileName'!");
}
$statusCode = $this->copyStaticFile($path, $location);
}
if ($statusCode==200 && $analyse) $this->analyseStaticFile($scheme, $address, $base, $fileData);
if ($statusCode==404 && $probe) $statusCode = 100;
@ -178,6 +158,38 @@ class YellowCommand {
return $this->yellow->request();
}
// Save static file
public function saveStaticFile($path, $location, $fileData, $statusCode) {
$modified = strtotime($this->yellow->page->getHeader("Last-Modified"));
if ($modified==0) $modified = $this->yellow->toolbox->getFileModified($this->yellow->page->fileName);
if ($statusCode>=301 && $statusCode<=303) {
$fileData = $this->getStaticRedirect($this->yellow->page->getHeader("Location"));
$modified = time();
}
$fileName = $this->getStaticFile($path, $location, $statusCode);
if (!$this->yellow->toolbox->createFile($fileName, $fileData, true) ||
!$this->yellow->toolbox->modifyFile($fileName, $modified)) {
$statusCode = 500;
$this->yellow->page->statusCode = $statusCode;
$this->yellow->page->set("pageError", "Can't write file '$fileName'!");
}
return $statusCode;
}
// Copy static file
public function copyStaticFile($path, $location) {
$statusCode = 200;
$modified = $this->yellow->toolbox->getFileModified($this->yellow->page->fileName);
$fileName = $this->getStaticFile($path, $location, $statusCode);
if (!$this->yellow->toolbox->copyFile($this->yellow->page->fileName, $fileName, true) ||
!$this->yellow->toolbox->modifyFile($fileName, $modified)) {
$statusCode = 500;
$this->yellow->page->statusCode = $statusCode;
$this->yellow->page->set("pageError", "Can't write file '$fileName'!");
}
return $statusCode;
}
// Analyse static file, detect locations with arguments
public function analyseStaticFile($scheme, $address, $base, $rawData) {
$pagination = $this->yellow->config->get("contentPagination");

BIN
system/plugins/update-blog.installation
View file

Binary file not shown.

BIN
system/plugins/update-wiki.installation
View file

Binary file not shown.