mikuli.cz

:)
git clone https://git.sr.ht/~ashymad/mikuli.cz
Log | Files | Refs

commit eaea7f4d60da720d5470ed0227c22adf936a5ff8
parent f9c0d9f09ef1b96f135ba1906339e306bbce5162
Author: markseu <mark2011@mayberg.se>
Date:   Tue, 17 Feb 2026 16:19:39 +0100

Updated code for consistency

Diffstat:
Msystem/extensions/update-available.ini | 28++++++++++++++--------------
Msystem/extensions/update-installed.ini | 20++++++++++----------
Msystem/workers/core.php | 50+++++++++++++++++++++++++-------------------------
Msystem/workers/edit.php | 4++--
Msystem/workers/generate.php | 8++++----
Msystem/workers/install.php | 20++++++++++----------
Msystem/workers/update.php | 14+++++++-------
7 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/system/extensions/update-available.ini b/system/extensions/update-available.ini @@ -98,14 +98,14 @@ Status: available system/workers/catalan.php: catalan.php, create, update Extension: Check -Version: 0.9.6 +Version: 0.9.7 Description: Find broken links. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-check/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-check DocumentationLanguage: en, de, sv -Published: 2025-11-21 18:18:32 +Published: 2026-02-17 15:57:34 Status: available system/workers/check.php: check.php, create, update @@ -149,14 +149,14 @@ system/themes/copenhagen.css: copenhagen.css, create, update, careful system/themes/copenhagen.png: copenhagen.png, create Extension: Core -Version: 0.9.20 +Version: 0.9.21 Description: Core functionality of your website. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-core DocumentationLanguage: en, de, sv -Published: 2026-02-09 10:52:06 +Published: 2026-02-17 15:58:14 Status: available system/workers/core.php: core.php, create, update system/extensions/core.php: corepatch.txt, update @@ -213,14 +213,14 @@ Status: available system/workers/dutch.php: dutch.php, create, update Extension: Edit -Version: 0.9.14 +Version: 0.9.15 Description: Edit your website in a web browser. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-edit/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-edit DocumentationLanguage: en, de, sv -Published: 2026-02-09 10:28:18 +Published: 2026-02-17 16:02:00 Status: available system/workers/edit.php: edit.php, create, update system/workers/edit.css: edit.css, create, update @@ -305,14 +305,14 @@ system/workers/gallery-default-skin.svg: gallery-default-skin.svg, create, updat system/workers/gallery-preloader.gif: gallery-preloader.gif, create, update Extension: Generate -Version: 0.9.7 +Version: 0.9.8 Description: Generate a static website. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-generate DocumentationLanguage: en, de, sv -Published: 2025-03-06 11:09:43 +Published: 2026-02-17 15:57:09 Status: available system/workers/generate.php: generate.php, create, update @@ -578,14 +578,14 @@ Status: available system/workers/private.php: private.php, create, update Extension: Publish -Version: 0.9.9 +Version: 0.9.10 Description: Make and publish extensions. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-publish/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-publish DocumentationLanguage: en, de, sv -Published: 2026-01-08 22:59:51 +Published: 2026-02-17 15:56:59 Status: available system/workers/publish.php: publish.php, create, update @@ -730,14 +730,14 @@ Status: available system/workers/toc.php: toc.php, create, update Extension: Traffic -Version: 0.9.2 +Version: 0.9.3 Description: Create traffic analytics from log files. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-traffic/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-traffic DocumentationLanguage: en, de, sv -Published: 2024-04-24 15:17:50 +Published: 2026-02-17 15:56:42 Status: available system/workers/traffic.php: traffic.php, create, update @@ -753,14 +753,14 @@ Status: available system/workers/turkish.php: turkish.php, create, update Extension: Update -Version: 0.9.8 +Version: 0.9.9 Description: Keep your extensions up to date. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-update/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-update DocumentationLanguage: en, de, sv -Published: 2025-12-09 18:50:25 +Published: 2026-02-17 16:14:10 Status: available system/workers/update.php: update.php, create, update system/workers/updatepatch.bin: updatepatch.php, create, additional diff --git a/system/extensions/update-installed.ini b/system/extensions/update-installed.ini @@ -1,14 +1,14 @@ # Datenstrom Yellow update settings for installed extensions Extension: Core -Version: 0.9.20 +Version: 0.9.21 Description: Core functionality of your website. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-core DocumentationLanguage: en, de, sv -Published: 2026-02-09 10:52:06 +Published: 2026-02-17 15:58:14 Status: available system/workers/core.php: core.php, create, update system/extensions/core.php: corepatch.txt, update @@ -20,14 +20,14 @@ system/layouts/navigation.html: navigation.html, create, update, careful system/layouts/pagination.html: pagination.html, create, update, careful Extension: Edit -Version: 0.9.14 +Version: 0.9.15 Description: Edit your website in a web browser. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-edit/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-edit DocumentationLanguage: en, de, sv -Published: 2026-02-09 10:28:18 +Published: 2026-02-17 16:02:00 Status: available system/workers/edit.php: edit.php, create, update system/workers/edit.css: edit.css, create, update @@ -36,14 +36,14 @@ system/workers/edit-stack.svg: edit-stack.svg, create, update content/shared/page-new-default.md: page-new-default.md, create, optional Extension: Generate -Version: 0.9.7 +Version: 0.9.8 Description: Generate a static website. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-generate DocumentationLanguage: en, de, sv -Published: 2025-03-06 11:09:43 +Published: 2026-02-17 15:57:09 Status: available system/workers/generate.php: generate.php, create, update @@ -62,13 +62,13 @@ media/images/photo.jpg: photo.jpg, create, optional media/thumbnails/photo-100x40.jpg: photo-100x40.jpg, create, optional Extension: Install -Version: 0.9.8 +Version: 0.9.9 Description: Install a brand new website. Developer: Anna Svensson DownloadUrl: https://github.com/annaesvensson/yellow-install/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-install DocumentationLanguage: en, de, sv -Published: 2026-02-09 10:35:10 +Published: 2026-02-17 15:55:22 Status: unassembled system/workers/install.php: install.php, create system/workers/install-language.bin: install-language.bin, compress @source/yellow-language/, create @@ -128,14 +128,14 @@ 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.9.8 +Version: 0.9.9 Description: Keep your extensions up to date. Developer: Anna Svensson Tag: feature DownloadUrl: https://github.com/annaesvensson/yellow-update/archive/refs/heads/main.zip DocumentationUrl: https://github.com/annaesvensson/yellow-update DocumentationLanguage: en, de, sv -Published: 2025-12-09 18:50:25 +Published: 2026-02-17 16:14:10 Status: available system/workers/update.php: update.php, create, update system/workers/updatepatch.bin: updatepatch.php, create, additional diff --git a/system/workers/core.php b/system/workers/core.php @@ -2,7 +2,7 @@ // Core extension, https://github.com/annaesvensson/yellow-core class YellowCore { - const VERSION = "0.9.20"; + const VERSION = "0.9.21"; const RELEASE = "0.9"; public $content; // content files public $media; // media files @@ -115,7 +115,7 @@ class YellowCore { ob_end_flush(); $this->toolbox->timerStop($time); if ($this->system->get("coreDebugMode")>=1 && ($this->lookup->isContentFile($fileName) || $this->page->isError())) { - echo "YellowCore::request status:$statusCode time:$time ms<br/>\n"; + echo "YellowCore::request status:$statusCode time:$time ms<br />\n"; } return $statusCode; } @@ -145,7 +145,7 @@ class YellowCore { if (!is_readable($fileName)) $this->page->error(404); } if ($this->system->get("coreDebugMode")>=1 && ($this->lookup->isContentFile($fileName) || $this->page->isError())) { - echo "YellowCore::processRequest file:$fileName<br/>\n"; + echo "YellowCore::processRequest file:$fileName<br />\n"; } return $statusCode; } @@ -155,7 +155,7 @@ class YellowCore { ob_clean(); $statusCode = $this->sendPage($this->page->scheme, $this->page->address, $this->page->base, $this->page->location, $this->page->fileName, false, false); - if ($this->system->get("coreDebugMode")>=1) echo "YellowCore::processRequestError file:".$this->page->fileName."<br/>\n"; + if ($this->system->get("coreDebugMode")>=1) echo "YellowCore::processRequestError file:".$this->page->fileName."<br />\n"; return $statusCode; } @@ -169,7 +169,7 @@ class YellowCore { $this->toolbox->sendHttpHeader($this->toolbox->getHttpStatusFormatted(500)); $troubleshooting = PHP_SAPI!="cli" ? "<a href=\"".$this->toolbox->getTroubleshootingUrl()."\">See troubleshooting</a>." : "See ".$this->toolbox->getTroubleshootingUrl(); - echo "<br/>\nDatenstrom Yellow stopped with fatal error. Activate the debug mode for more information. $troubleshooting\n"; + echo "<br />\nDatenstrom Yellow stopped with fatal error. Activate the debug mode for more information. $troubleshooting\n"; } } @@ -196,13 +196,13 @@ class YellowCore { $statusCode = $this->sendData($this->page->statusCode, $this->page->headerData, $this->page->outputData); if ($this->system->get("coreDebugMode")>=1) { foreach ($this->page->headerData as $key=>$value) { - echo "YellowCore::sendPage $key: $value<br/>\n"; + echo "YellowCore::sendPage $key: $value<br />\n"; } $language = $this->page->get("language"); $layout = $this->page->get("layout"); $theme = $this->page->get("theme"); $parser = $this->page->get("parser"); - echo "YellowCore::sendPage language:$language layout:$layout theme:$theme parser:$parser<br/>\n"; + echo "YellowCore::sendPage language:$language layout:$layout theme:$theme parser:$parser<br />\n"; } return $statusCode; } @@ -283,7 +283,7 @@ class YellowCore { } $this->toolbox->timerStop($time); if ($this->system->get("coreDebugMode")>=1) { - echo "YellowCore::command status:$statusCode time:$time ms<br/>\n"; + echo "YellowCore::command status:$statusCode time:$time ms<br />\n"; } return $statusCode<400 ? 0 : 1; } @@ -352,7 +352,7 @@ class YellowContent { array_push($this->pages[$location], $page); } } else { - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowContent::scanLocation location:$location<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowContent::scanLocation location:$location<br />\n"; $fileNames = $this->yellow->lookup->findChildrenFromContentLocation($location); foreach ($fileNames as $fileName) { $page = new YellowPage($this->yellow); @@ -535,7 +535,7 @@ class YellowMedia { if (is_string_empty($location)) { $fileNames = array($this->yellow->system->get("coreMediaDirectory")); } else { - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowMedia::scanLocation location:$location<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowMedia::scanLocation location:$location<br />\n"; $fileNames = $this->yellow->lookup->findChildrenFromMediaLocation($location); } foreach ($fileNames as $fileName) { @@ -641,10 +641,10 @@ class YellowSystem { $this->modified = $this->yellow->toolbox->getFileModified($fileName); $fileData = $this->yellow->toolbox->readFile($fileName); $this->settings = $this->yellow->toolbox->getTextSettings($fileData, ""); - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowSystem::load file:$fileName<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowSystem::load file:$fileName<br />\n"; if ($this->yellow->system->get("coreDebugMode")>=3) { foreach ($this->settings as $key=>$value) { - echo "YellowSystem::load ".ucfirst($key).":$value<br/>\n"; + echo "YellowSystem::load ".ucfirst($key).":$value<br />\n"; } } } @@ -761,7 +761,7 @@ class YellowLanguage { $this->settings[$language][$key] = $value; } } - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowLanguage::load file:$fileName<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowLanguage::load file:$fileName<br />\n"; foreach ($this->settings->getArrayCopy() as $key=>$value) { if (!isset($this->settings[$key]["languageDescription"])) { unset($this->settings[$key]); @@ -942,7 +942,7 @@ class YellowUser { $this->modified = $this->yellow->toolbox->getFileModified($fileName); $fileData = $this->yellow->toolbox->readFile($fileName); $this->settings = $this->yellow->toolbox->getTextSettings($fileData, "email"); - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUser::load file:$fileName<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUser::load file:$fileName<br />\n"; } // Save user settings to file @@ -1035,7 +1035,7 @@ class YellowExtension { require_once($entry); $name = $this->yellow->lookup->normaliseName(basename($entry), true, true); $this->register(lcfirst($name), "Yellow".ucfirst($name)); - if ($this->yellow->system->get("coreDebugMode")>=3) echo "YellowExtension::load file:$entry<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=3) echo "YellowExtension::load file:$entry<br />\n"; } $callback = function ($a, $b) { return $a["priority"] - $b["priority"]; @@ -1148,7 +1148,7 @@ class YellowLookup { } if ($this->yellow->system->get("coreDebugMode")>=3) { foreach ($rootLocations as $key=>$key) { - echo "YellowLookup::findContentRootLocations $key -> $value<br/>\n"; + echo "YellowLookup::findContentRootLocations $key -> $value<br />\n"; } } return $rootLocations; @@ -1186,7 +1186,7 @@ class YellowLookup { } if ($this->yellow->system->get("coreDebugMode")>=2) { $debug = ($invalid ? "INVALID" : $location)." <- $pathBase$fileName"; - echo "YellowLookup::findContentLocationFromFile $debug<br/>\n"; + echo "YellowLookup::findContentLocationFromFile $debug<br />\n"; } return $invalid ? "" : $location; } @@ -1236,7 +1236,7 @@ class YellowLookup { } if ($this->yellow->system->get("coreDebugMode")>=2) { $debug = "$location -> ".($invalid ? "INVALID" : $path); - echo "YellowLookup::findFileFromContentLocation $debug<br/>\n"; + echo "YellowLookup::findFileFromContentLocation $debug<br />\n"; } } } @@ -1623,7 +1623,7 @@ class YellowLookup { $this->yellow->system->set("coreServerAddress", $address); $this->yellow->system->set("coreServerBase", $base); if ($this->yellow->system->get("coreDebugMode")>=3) { - echo "YellowLookup::getRequestInformation $scheme://$address$base<br/>\n"; + echo "YellowLookup::getRequestInformation $scheme://$address$base<br />\n"; } } $location = substru($this->yellow->toolbox->detectServerLocation(), strlenu($base)); @@ -1639,7 +1639,7 @@ class YellowLookup { if (is_string_empty($line)) { $line = $this->yellow->toolbox->getTextString(array_slice($this->yellow->toolbox->getServer("argv"), 1)); if ($this->yellow->system->get("coreDebugMode")>=3) { - echo "YellowLookup::getCommandInformation $line<br/>\n"; + echo "YellowLookup::getCommandInformation $line<br />\n"; } } return $this->yellow->toolbox->getTextList($line, " ", 2); @@ -3166,7 +3166,7 @@ class YellowPage { $this->set("description", !is_string_empty($description) ? $description : $this->get("title")); } if ($this->yellow->system->get("coreDebugMode")>=3) { - echo "YellowPage::parseContent location:".$this->location."<br/>\n"; + echo "YellowPage::parseContent location:".$this->location."<br />\n"; } } } @@ -3186,7 +3186,7 @@ class YellowPage { } } if ($this->yellow->system->get("coreDebugMode")>=3 && !is_string_empty($name)) { - echo "YellowPage::parseContentElement name:$name type:$type<br/>\n"; + echo "YellowPage::parseContentElement name:$name type:$type<br />\n"; } return $output; } @@ -3252,19 +3252,19 @@ class YellowPage { $this->yellow->lookup->normaliseName($this->get("theme"))."-".$this->yellow->lookup->normaliseName($name).".html"; if (is_file($fileNameLayoutTheme)) { if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowPage::includeLayout file:$fileNameLayoutTheme<br/>\n"; + echo "YellowPage::includeLayout file:$fileNameLayoutTheme<br />\n"; } $this->setLastModified(filemtime($fileNameLayoutTheme)); require($fileNameLayoutTheme); } elseif (is_file($fileNameLayoutNormal)) { if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowPage::includeLayout file:$fileNameLayoutNormal<br/>\n"; + echo "YellowPage::includeLayout file:$fileNameLayoutNormal<br />\n"; } $this->setLastModified(filemtime($fileNameLayoutNormal)); require($fileNameLayoutNormal); } else { $this->error(500, "Layout '$name' does not exist!"); - echo "Layout error<br/>\n"; + echo "Layout error<br />\n"; } } diff --git a/system/workers/edit.php b/system/workers/edit.php @@ -2,7 +2,7 @@ // Edit extension, https://github.com/annaesvensson/yellow-edit class YellowEdit { - const VERSION = "0.9.14"; + const VERSION = "0.9.15"; public $yellow; // access to API public $response; // web response public $merge; // text merge @@ -837,7 +837,7 @@ class YellowEdit { "Content-Type"=>$this->yellow->toolbox->getMimeContentType("a.html"), "Last-Modified"=>$this->yellow->toolbox->getHttpDateFormatted(time())); $statusCode = $this->yellow->sendData($page->statusCode, $page->headerData, $page->outputData); - if ($this->yellow->system->get("coreDebugMode")>=1) echo "YellowEdit::processRequestPreview file:$fileName<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=1) echo "YellowEdit::processRequestPreview file:$fileName<br />\n"; return $statusCode; } diff --git a/system/workers/generate.php b/system/workers/generate.php @@ -2,7 +2,7 @@ // Generate extension, https://github.com/annaesvensson/yellow-generate class YellowGenerate { - const VERSION = "0.9.7"; + const VERSION = "0.9.8"; public $yellow; // access to API public $files; // number of files public $errors; // number of errors @@ -160,7 +160,7 @@ class YellowGenerate { echo "\rERROR generating location '$location', ".$this->yellow->page->getStatusCode(true)."\n"; } if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowGenerate::generateStaticFile status:$statusCode location:$location<br/>\n"; + echo "YellowGenerate::generateStaticFile status:$statusCode location:$location<br />\n"; } return $statusCode; } @@ -234,7 +234,7 @@ class YellowGenerate { if (!isset($this->locationsWithArguments[$location])) { $this->locationsWithArguments[$location] = $location; if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowGenerate::analyseStaticLocations detected location:$location<br/>\n"; + echo "YellowGenerate::analyseStaticLocations detected location:$location<br />\n"; } } } else { @@ -242,7 +242,7 @@ class YellowGenerate { if (!isset($this->locationsWithPagination[$location])) { $this->locationsWithPagination[$location] = $location; if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowGenerate::analyseStaticLocations detected location:$location<br/>\n"; + echo "YellowGenerate::analyseStaticLocations detected location:$location<br />\n"; } } } diff --git a/system/workers/install.php b/system/workers/install.php @@ -2,7 +2,7 @@ // Install extension, https://github.com/annaesvensson/yellow-install class YellowInstall { - const VERSION = "0.9.8"; + const VERSION = "0.9.9"; const PRIORITY = "1"; public $yellow; // access to API @@ -316,7 +316,7 @@ class YellowInstall { public function checkServerRequirements() { if ($this->yellow->system->get("coreDebugMode")>=1) { list($name, $version, $os) = $this->yellow->toolbox->detectServerInformation(); - echo "YellowInstall::checkServerRequirements for $name $version, $os<br/>\n"; + echo "YellowInstall::checkServerRequirements for $name $version, $os<br />\n"; } if (!$this->checkServerComplete()) $this->yellow->exitFatalError("Datenstrom Yellow requires complete upload!"); if (!$this->checkServerWrite()) $this->yellow->exitFatalError("Datenstrom Yellow requires write access!"); @@ -328,7 +328,7 @@ class YellowInstall { public function checkCommandRequirements() { if ($this->yellow->system->get("coreDebugMode")>=1) { list($name, $version, $os) = $this->yellow->toolbox->detectServerInformation(); - echo "YellowInstall::checkCommandRequirements for $name $version, $os<br/>\n"; + echo "YellowInstall::checkCommandRequirements for $name $version, $os<br />\n"; } if (!$this->checkServerComplete()) $this->yellow->exitFatalError("Datenstrom Yellow requires complete upload!"); if (!$this->checkServerWrite()) $this->yellow->exitFatalError("Datenstrom Yellow requires write access!"); @@ -356,7 +356,7 @@ class YellowInstall { if (!is_file($fileName) || filesize($fileName)==0) { $complete = false; if ($this->yellow->system->get("coreDebugMode")>=1) { - echo "YellowInstall::checkServerComplete detected missing file:$fileName<br/>\n"; + echo "YellowInstall::checkServerComplete detected missing file:$fileName<br />\n"; } } } @@ -394,7 +394,7 @@ class YellowInstall { if ($statusCode!=200) { $rewrite = false; if ($this->yellow->system->get("coreDebugMode")>=1 && !$rewrite) { - echo "YellowInstall::checkServerRewrite detected failed url:$url<br/>\n"; + echo "YellowInstall::checkServerRewrite detected failed url:$url<br />\n"; } } } @@ -434,10 +434,10 @@ class YellowInstall { $this->yellow->page->error($statusCode, "Can't write file '$fileName'!"); } if ($this->yellow->system->get("coreDebugMode")>=2 && !is_string_empty($redirectUrl)) { - echo "YellowInstall::downloadExtensionsAvailable redirected to url:$redirectUrl<br/>\n"; + echo "YellowInstall::downloadExtensionsAvailable redirected to url:$redirectUrl<br />\n"; } if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowInstall::downloadExtensionsAvailable status:$statusCode url:$url<br/>\n"; + echo "YellowInstall::downloadExtensionsAvailable status:$statusCode url:$url<br />\n"; } if ($statusCode!=200) break; } @@ -543,9 +543,9 @@ class YellowInstall { $this->yellow->language->set($language); $rawData = "---\nTitle:".$this->yellow->language->getText("installTitle")."\nLanguage:$language\nNavigation:navigation\nHeader:none\nFooter:none\nSidebar:none\n---\n"; $rawData .= "<form class=\"install-form\" action=\"".$this->yellow->page->getLocation(true)."\" method=\"post\">\n"; - $rawData .= "<p><label for=\"author\">".$this->yellow->language->getText("editSignupName")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"author\" id=\"author\" value=\"\"></p>\n"; - $rawData .= "<p><label for=\"email\">".$this->yellow->language->getText("editSignupEmail")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"email\" id=\"email\" value=\"\"></p>\n"; - $rawData .= "<p><label for=\"password\">".$this->yellow->language->getText("editSignupPassword")."</label><br /><input class=\"form-control\" type=\"password\" maxlength=\"64\" name=\"password\" id=\"password\" value=\"\"></p>\n"; + $rawData .= "<p><label for=\"author\">".$this->yellow->language->getText("editSignupName")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"author\" id=\"author\" value=\"\" /></p>\n"; + $rawData .= "<p><label for=\"email\">".$this->yellow->language->getText("editSignupEmail")."</label><br /><input class=\"form-control\" type=\"text\" maxlength=\"64\" name=\"email\" id=\"email\" value=\"\" /></p>\n"; + $rawData .= "<p><label for=\"password\">".$this->yellow->language->getText("editSignupPassword")."</label><br /><input class=\"form-control\" type=\"password\" maxlength=\"64\" name=\"password\" id=\"password\" value=\"\" /></p>\n"; $rawData .= "<p>".$this->yellow->language->getText("installLanguage")."</p>\n<p>"; foreach ($languages as $language) { $checked = $language==$this->yellow->language->language ? " checked=\"checked\"" : ""; diff --git a/system/workers/update.php b/system/workers/update.php @@ -2,7 +2,7 @@ // Update extension, https://github.com/annaesvensson/yellow-update class YellowUpdate { - const VERSION = "0.9.8"; + const VERSION = "0.9.9"; const PRIORITY = "2"; public $yellow; // access to API public $extensions; // number of extensions @@ -251,7 +251,7 @@ class YellowUpdate { $statusCode = 200; $zip = new ZipArchive(); if ($zip->open($path)===true) { - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUpdate::updateExtensionArchive file:$path<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUpdate::updateExtensionArchive file:$path<br />\n"; $pathBase = ""; if (preg_match("#^(.*\/).*?$#", $zip->getNameIndex(0), $matches)) $pathBase = $matches[1]; $fileData = $zip->getFromName($pathBase.$this->yellow->system->get("updateExtensionFile")); @@ -329,7 +329,7 @@ class YellowUpdate { if ($this->yellow->system->get("coreDebugMode")>=2) { $debug = "action:".($create ? "create" : "").($update ? "update" : "").($delete ? "delete" : ""); if (!$create && !$update && !$delete) $debug = "action:none"; - echo "YellowUpdate::updateExtensionFile file:$fileName $debug<br/>\n"; + echo "YellowUpdate::updateExtensionFile file:$fileName $debug<br />\n"; } } return $statusCode; @@ -339,7 +339,7 @@ class YellowUpdate { public function updatePatchPending() { $fileName = $this->yellow->system->get("coreWorkerDirectory")."updatepatch.bin"; if (is_file($fileName)) { - if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUpdate::updatePatchPending file:$fileName<br/>\n"; + if ($this->yellow->system->get("coreDebugMode")>=2) echo "YellowUpdate::updatePatchPending file:$fileName<br />\n"; if (!$this->yellow->extension->isExisting("updatepatch")) { require_once($fileName); $this->yellow->extension->register("updatepatch", "YellowUpdatePatch"); @@ -632,7 +632,7 @@ class YellowUpdate { $this->yellow->page->error($statusCode, "Can't delete file '$fileName'!"); } if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowUpdate::removeExtensionFile file:$fileName action:delete<br/>\n"; + echo "YellowUpdate::removeExtensionFile file:$fileName action:delete<br />\n"; } } return $statusCode; @@ -894,10 +894,10 @@ class YellowUpdate { $this->yellow->page->error($statusCode, "Can't download file '$url'!"); } if ($this->yellow->system->get("coreDebugMode")>=2 && !is_string_empty($redirectUrl)) { - echo "YellowUpdate::getExtensionFile redirected to url:$redirectUrl<br/>\n"; + echo "YellowUpdate::getExtensionFile redirected to url:$redirectUrl<br />\n"; } if ($this->yellow->system->get("coreDebugMode")>=2) { - echo "YellowUpdate::getExtensionFile status:$statusCode url:$url<br/>\n"; + echo "YellowUpdate::getExtensionFile status:$statusCode url:$url<br />\n"; } return array($statusCode, $fileData); }