commit bf80348802fb23dee4846de37639f9951e025e24
parent 0aaadad66850ec1760ec7d4729cbb0572bede8c2
Author: markseu <mark2011@mayberg.se>
Date: Wed, 13 Apr 2022 22:44:07 +0200
Refactored code, spring cleanup
Diffstat:
5 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/system/extensions/bundle.php b/system/extensions/bundle.php
@@ -2,7 +2,7 @@
// Bundle extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/bundle
class YellowBundle {
- const VERSION = "0.8.24";
+ const VERSION = "0.8.25";
public $yellow; // access to API
// Handle initialisation
@@ -19,7 +19,7 @@ class YellowBundle {
$cleanup = $action!="daily" || !$this->isBundleRequired($entry);
if ($cleanup && !$this->yellow->toolbox->deleteFile($entry)) $statusCode = 500;
}
- if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!\n");
+ if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!");
}
}
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -2,7 +2,7 @@
// Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
class YellowCore {
- const VERSION = "0.8.65";
+ const VERSION = "0.8.66";
const RELEASE = "0.8.19";
public $page; // current page
public $content; // content files
@@ -36,13 +36,20 @@ class YellowCore {
$this->system->setDefault("coreServerUrl", "auto");
$this->system->setDefault("coreStaticUrl", "auto");
$this->system->setDefault("coreTimezone", "UTC");
- $this->system->setDefault("coreMultiLanguageMode", "0");
- $this->system->setDefault("coreDebugMode", "0");
+ $this->system->setDefault("coreContentExtension", ".md");
+ $this->system->setDefault("coreContentDefaultFile", "page.md");
+ $this->system->setDefault("coreContentErrorFile", "page-error-(.*).md");
+ $this->system->setDefault("coreSystemFile", "yellow-system.ini");
+ $this->system->setDefault("coreUserFile", "yellow-user.ini");
+ $this->system->setDefault("coreLanguageFile", "yellow-language.ini");
+ $this->system->setDefault("coreWebsiteFile", "yellow-website.log");
$this->system->setDefault("coreMediaLocation", "/media/");
$this->system->setDefault("coreDownloadLocation", "/media/downloads/");
$this->system->setDefault("coreImageLocation", "/media/images/");
$this->system->setDefault("coreExtensionLocation", "/media/extensions/");
$this->system->setDefault("coreThemeLocation", "/media/themes/");
+ $this->system->setDefault("coreMultiLanguageMode", "0");
+ $this->system->setDefault("coreDebugMode", "0");
$this->system->setDefault("coreMediaDirectory", "media/");
$this->system->setDefault("coreDownloadDirectory", "media/downloads/");
$this->system->setDefault("coreImageDirectory", "media/images/");
@@ -56,14 +63,6 @@ class YellowCore {
$this->system->setDefault("coreContentRootDirectory", "default/");
$this->system->setDefault("coreContentHomeDirectory", "home/");
$this->system->setDefault("coreContentSharedDirectory", "shared/");
- $this->system->setDefault("coreContentDefaultFile", "page.md");
- $this->system->setDefault("coreContentErrorFile", "page-error-(.*).md");
- $this->system->setDefault("coreContentExtension", ".md");
- $this->system->setDefault("coreDownloadExtension", ".download");
- $this->system->setDefault("coreSystemFile", "yellow-system.ini");
- $this->system->setDefault("coreUserFile", "yellow-user.ini");
- $this->system->setDefault("coreLanguageFile", "yellow-language.ini");
- $this->system->setDefault("coreWebsiteFile", "yellow-website.log");
$this->language->setDefault("coreDateFormatShort");
$this->language->setDefault("coreDateFormatMedium");
$this->language->setDefault("coreDateFormatLong");
diff --git a/system/extensions/image.php b/system/extensions/image.php
@@ -2,7 +2,7 @@
// Image extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/image
class YellowImage {
- const VERSION = "0.8.13";
+ const VERSION = "0.8.14";
public $yellow; // access to API
// Handle initialisation
@@ -25,7 +25,7 @@ class YellowImage {
foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/.*/", false, false) as $entry) {
if (!$this->yellow->toolbox->deleteFile($entry)) $statusCode = 500;
}
- if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!\n");
+ if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!");
}
}
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -1,11 +1,11 @@
# Datenstrom Yellow update settings
Extension: Bundle
-Version: 0.8.24
+Version: 0.8.25
Description: Bundle website files.
HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/bundle
DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/bundle.zip
-Published: 2022-03-11 00:39:48
+Published: 2022-04-13 18:41:53
Developer: Datenstrom
Tag: feature
system/extensions/bundle.php: bundle.php, create, update
@@ -21,11 +21,11 @@ Tag: feature
system/extensions/command.php: command.php, create, update
Extension: Core
-Version: 0.8.65
+Version: 0.8.66
Description: Core functionality of the website.
HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/core
DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/core.zip
-Published: 2022-04-12 17:24:28
+Published: 2022-04-13 21:43:31
Developer: Datenstrom
Tag: feature
system/extensions/core.php: core.php, create, update
@@ -52,11 +52,11 @@ system/extensions/edit.woff: edit.woff, delete
content/shared/page-new-default.md: page-new-default.md, create, optional
Extension: Image
-Version: 0.8.13
+Version: 0.8.14
Description: Images and thumbnails.
HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/image
DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/image.zip
-Published: 2021-05-25 09:17:59
+Published: 2022-04-13 18:42:22
Developer: Datenstrom
Tag: feature
system/extensions/image.php: image.php, create, update
@@ -131,11 +131,11 @@ system/themes/stockholm-opensans-light.woff: stockholm-opensans-light.woff, crea
system/themes/stockholm-opensans-regular.woff: stockholm-opensans-regular.woff, create, update, careful
Extension: Update
-Version: 0.8.66
+Version: 0.8.67
Description: Keep your website up to date.
HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/update
DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/update.zip
-Published: 2022-03-16 14:33:19
+Published: 2022-04-13 18:51:09
Developer: Datenstrom
Tag: feature
system/extensions/update.php: update.php, create, update
diff --git a/system/extensions/update.php b/system/extensions/update.php
@@ -2,7 +2,7 @@
// Update extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/update
class YellowUpdate {
- const VERSION = "0.8.66";
+ const VERSION = "0.8.67";
const PRIORITY = "2";
public $yellow; // access to API
public $updates; // number of updates
@@ -25,11 +25,10 @@ class YellowUpdate {
if ($action=="clean" || $action=="daily") {
$statusCode = 200;
$path = $this->yellow->system->get("coreExtensionDirectory");
- $regex = "/^.*\\".$this->yellow->system->get("coreDownloadExtension")."$/";
- foreach ($this->yellow->toolbox->getDirectoryEntries($path, $regex, false, false) as $entry) {
+ foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/^.*\.download$/", false, false) as $entry) {
if (!$this->yellow->toolbox->deleteFile($entry)) $statusCode = 500;
}
- if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!\n");
+ if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!");
$statusCode = 200;
$path = $this->yellow->system->get("coreTrashDirectory");
foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/.*/", false, false) as $entry) {
@@ -40,7 +39,7 @@ class YellowUpdate {
$expire = $this->yellow->toolbox->getFileDeleted($entry) + $this->yellow->system->get("updateTrashTimeout");
if ($expire<=time() && !$this->yellow->toolbox->deleteDirectory($entry)) $statusCode = 500;
}
- if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!\n");
+ if ($statusCode==500) $this->yellow->log("error", "Can't delete files in directory '$path'!");
}
if ($action=="update") { // TODO: remove later, create settings files when missing
$fileNameCurrent = $this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("updateCurrentFile");
@@ -279,11 +278,10 @@ class YellowUpdate {
public function downloadExtensions($settings) {
$statusCode = 200;
$path = $this->yellow->system->get("coreExtensionDirectory");
- $fileExtension = $this->yellow->system->get("coreDownloadExtension");
foreach ($settings as $key=>$value) {
$fileName = $path.$this->yellow->lookup->normaliseName($key, true, false, true).".zip";
list($statusCode, $fileData) = $this->getExtensionFile($value->get("downloadUrl"));
- if (empty($fileData) || !$this->yellow->toolbox->createFile($fileName.$fileExtension, $fileData)) {
+ if (empty($fileData) || !$this->yellow->toolbox->createFile($fileName.".download", $fileData)) {
$statusCode = 500;
$this->yellow->page->error($statusCode, "Can't write file '$fileName'!");
break;
@@ -292,7 +290,7 @@ class YellowUpdate {
if ($statusCode==200) {
foreach ($settings as $key=>$value) {
$fileName = $path.$this->yellow->lookup->normaliseName($key, true, false, true).".zip";
- if (!$this->yellow->toolbox->renameFile($fileName.$fileExtension, $fileName)) {
+ if (!$this->yellow->toolbox->renameFile($fileName.".download", $fileName)) {
$statusCode = 500;
$this->yellow->page->error($statusCode, "Can't write file '$fileName'!");
}
