commit 19e7150c282f27a0eccadc1ba5dfac47bfdaa14d
parent 1cafb710145dcc27ebfb31dee4661b680cc58c9e
Author: markseu <mark2011@mayberg.se>
Date: Fri, 24 Jul 2020 10:18:18 +0200
Updated extensions, summer cleanup
Diffstat:
16 files changed, 119 insertions(+), 148 deletions(-)
diff --git a/system/extensions/bundle.php b/system/extensions/bundle.php
@@ -1,12 +1,10 @@
<?php
-// Bundle extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/bundle
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Bundle extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/bundle
class YellowBundle {
const VERSION = "0.8.13";
const TYPE = "feature";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
@@ -1926,14 +1924,12 @@ class Converter implements ConverterInterface {
}
}
-// Minify extensions
-// Copyright (c) 2013-2019 Datenstrom
+// Bundle extensions, Copyright Datenstrom, License GPLv2
class MinifyCss extends CSS { }
class MinifyJavaScript extends JS {
- // Use hardcoded keywords and operators
public function __construct() {
$this->keywordsReserved = array("do", "if", "in", "for", "let", "new", "try", "var", "case", "else", "enum", "eval", "null", "this", "true", "void", "with", "break", "catch", "class", "const", "false", "super", "throw", "while", "yield", "delete", "export", "import", "public", "return", "static", "switch", "typeof", "default", "extends", "finally", "package", "private", "continue", "debugger", "function", "arguments", "interface", "protected", "implements", "instanceof", "abstract", "boolean", "byte", "char", "double", "final", "float", "goto", "int", "long", "native", "short", "synchronized", "throws", "transient", "volatile");
$this->keywordsBefore = array("do", "in", "let", "new", "var", "case", "else", "enum", "void", "with", "class", "const", "yield", "delete", "export", "import", "public", "static", "typeof", "extends", "package", "private", "function", "protected", "implements", "instanceof");
diff --git a/system/extensions/command.php b/system/extensions/command.php
@@ -1,18 +1,16 @@
<?php
-// Command extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/command
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Command extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/command
class YellowCommand {
const VERSION = "0.8.17";
const TYPE = "feature";
const PRIORITY = "3";
- public $yellow; //access to API
- public $files; //number of files
- public $links; //number of links
- public $errors; //number of errors
- public $locationsArguments; //locations with location arguments detected
- public $locationsArgumentsPagination; //locations with pagination arguments detected
+ public $yellow; // access to API
+ public $files; // number of files
+ public $links; // number of links
+ public $errors; // number of errors
+ public $locationsArguments; // locations with location arguments detected
+ public $locationsArgumentsPagination; // locations with pagination arguments detected
// Handle initialisation
public function onLoad($yellow) {
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -1,19 +1,17 @@
<?php
-// Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/core
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
class YellowCore {
const VERSION = "0.8.13";
const TYPE = "feature";
- public $page; //current page
- public $content; //content files from file system
- public $media; //media files from file system
- public $system; //system settings
- public $text; //text settings
- public $lookup; //location and file lookup
- public $toolbox; //toolbox with helpers
- public $extensions; //features and themes
+ public $page; // current page
+ public $content; // content files from file system
+ public $media; // media files from file system
+ public $system; // system settings
+ public $text; // text settings
+ public $lookup; // location and file lookup
+ public $toolbox; // toolbox with helpers
+ public $extensions; // features and themes
public function __construct() {
$this->checkRequirements();
@@ -86,7 +84,7 @@ class YellowCore {
ini_set("display_errors", 1);
error_reporting(E_ALL);
}
- error_reporting(E_ALL ^ E_NOTICE); //TODO: remove later, for backwards compatibility
+ error_reporting(E_ALL ^ E_NOTICE); // TODO: remove later, for backwards compatibility
}
// Handle initialisation
@@ -333,7 +331,7 @@ class YellowCore {
return array_pad($this->lookup->layoutArguments, $sizeMin, null);
}
- public function getLayoutArgs($sizeMin = 9) { //TODO: remove later, for backwards compatibility
+ public function getLayoutArgs($sizeMin = 9) { // TODO: remove later, for backwards compatibility
return $this->getLayoutArguments($sizeMin);
}
@@ -386,27 +384,27 @@ class YellowCore {
}
class YellowPage {
- public $yellow; //access to API
- public $scheme; //server scheme
- public $address; //server address
- public $base; //base location
- public $location; //page location
- public $fileName; //content file name
- public $rawData; //raw data of page
- public $metaDataOffsetBytes; //meta data offset
- public $metaData; //meta data
- public $pageCollection; //page collection
- public $pageRelations; //page relations
- public $headerData; //response header
- public $outputData; //response output
- public $parser; //content parser
- public $parserData; //content data of page
- public $available; //page is available? (boolean)
- public $visible; //page is visible location? (boolean)
- public $active; //page is active location? (boolean)
- public $cacheable; //page is cacheable? (boolean)
- public $lastModified; //last modification date
- public $statusCode; //status code
+ public $yellow; // access to API
+ public $scheme; // server scheme
+ public $address; // server address
+ public $base; // base location
+ public $location; // page location
+ public $fileName; // content file name
+ public $rawData; // raw data of page
+ public $metaDataOffsetBytes; // meta data offset
+ public $metaData; // meta data
+ public $pageCollection; // page collection
+ public $pageRelations; // page relations
+ public $headerData; // response header
+ public $outputData; // response output
+ public $parser; // content parser
+ public $parserData; // content data of page
+ public $available; // page is available? (boolean)
+ public $visible; // page is visible location? (boolean)
+ public $active; // page is active location? (boolean)
+ public $cacheable; // page is cacheable? (boolean)
+ public $lastModified; // last modification date
+ public $statusCode; // status code
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -956,10 +954,10 @@ class YellowDataCollection extends ArrayObject {
}
class YellowPageCollection extends ArrayObject {
- public $yellow; //access to API
- public $filterValue; //current page filter value
- public $paginationNumber; //current page number in pagination
- public $paginationCount; //highest page number in pagination
+ public $yellow; // access to API
+ public $filterValue; // current page filter value
+ public $paginationNumber; // current page number in pagination
+ public $paginationCount; // highest page number in pagination
public function __construct($yellow) {
parent::__construct(array());
@@ -1195,8 +1193,8 @@ class YellowPageCollection extends ArrayObject {
}
class YellowContent {
- public $yellow; //access to API
- public $pages; //scanned pages
+ public $yellow; // access to API
+ public $pages; // scanned pages
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1400,8 +1398,8 @@ class YellowContent {
}
class YellowMedia {
- public $yellow; //access to API
- public $files; //scanned files
+ public $yellow; // access to API
+ public $files; // scanned files
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1514,10 +1512,10 @@ class YellowMedia {
}
class YellowSystem {
- public $yellow; //access to API
- public $modified; //settings modification date
- public $settings; //settings
- public $settingsDefaults; //settings defaults
+ public $yellow; // access to API
+ public $modified; // settings modification date
+ public $settings; // settings
+ public $settingsDefaults; // settings defaults
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1621,10 +1619,10 @@ class YellowSystem {
}
class YellowText {
- public $yellow; //access to API
- public $modified; //text modification date
- public $text; //text
- public $language; //current language
+ public $yellow; // access to API
+ public $modified; // text modification date
+ public $text; // text
+ public $language; // current language
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1791,10 +1789,10 @@ class YellowText {
}
class YellowLookup {
- public $yellow; //access to API
- public $requestHandler; //request handler name
- public $commandHandler; //command handler name
- public $layoutArguments; //layout arguments
+ public $yellow; // access to API
+ public $requestHandler; // request handler name
+ public $commandHandler; // command handler name
+ public $layoutArguments; // layout arguments
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -3129,7 +3127,7 @@ class YellowToolbox {
return $this->getServer("HTTP_IF_MODIFIED_SINCE")==$lastModifiedFormatted;
}
- //TODO: remove later, for backwards compatibility
+ // TODO: remove later, for backwards compatibility
public function getLocationArgs() { return $this->getLocationArguments(); }
public function getLocationArgsNew($key, $value) { return $this->getLocationArgumentsNew($key, $value); }
public function getLocationArgsCleanUrl() { return $this->getLocationArgumentsCleanUrl(); }
@@ -3141,9 +3139,9 @@ class YellowToolbox {
}
class YellowExtensions {
- public $yellow; //access to API
- public $modified; //extension modification date
- public $extensions; //registered extensions
+ public $yellow; // access to API
+ public $modified; // extension modification date
+ public $extensions; // registered extensions
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -3167,7 +3165,7 @@ class YellowExtensions {
foreach ($this->extensions as $key=>$value) {
if (method_exists($this->extensions[$key]["obj"], "onLoad")) $this->extensions[$key]["obj"]->onLoad($this->yellow);
}
- $this->yellow->system->set("mediaLocation", "/media/"); //TODO: remove later, for backwards compatibility
+ $this->yellow->system->set("mediaLocation", "/media/"); // TODO: remove later, for backwards compatibility
$this->yellow->system->set("downloadLocation", "/media/downloads/");
$this->yellow->system->set("imageLocation", "/media/images/");
$this->yellow->system->set("extensionLocation", "/media/extensions/");
diff --git a/system/extensions/edit.css b/system/extensions/edit.css
@@ -1,6 +1,4 @@
-/* Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/edit */
-/* Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se */
-/* This file may be used and distributed under the terms of the public license. */
+/* Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit */
.yellow-bar {
position: relative;
diff --git a/system/extensions/edit.js b/system/extensions/edit.js
@@ -1,6 +1,4 @@
-// Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/edit
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
var yellow = {
onLoad: function(e) { yellow.edit.load(e); },
@@ -16,11 +14,11 @@ var yellow = {
};
yellow.edit = {
- paneId: 0, //visible pane ID
- paneAction: 0, //current pane action
- paneStatus: 0, //current pane status
- popupId: 0, //visible popup ID
- intervalId: 0, //timer interval ID
+ paneId: 0, // visible pane ID
+ paneAction: 0, // current pane action
+ paneStatus: 0, // current pane status
+ popupId: 0, // visible popup ID
+ intervalId: 0, // timer interval ID
// Handle initialisation
load: function(e) {
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -1,15 +1,13 @@
<?php
-// Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/edit
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
class YellowEdit {
const VERSION = "0.8.29";
const TYPE = "feature";
- public $yellow; //access to API
- public $response; //web response
- public $users; //user accounts
- public $merge; //text merge
+ public $yellow; // access to API
+ public $response; // web response
+ public $users; // user accounts
+ public $merge; // text merge
// Handle initialisation
public function onLoad($yellow) {
@@ -979,21 +977,21 @@ class YellowEdit {
}
class YellowEditResponse {
- public $yellow; //access to API
- public $extension; //access to extension
- public $active; //location is active? (boolean)
- public $userEmail; //user email
- public $userFailedError; //error of failed authentication
- public $userFailedEmail; //email of failed authentication
- public $userFailedExpire; //expiration time of failed authentication
- public $rawDataSource; //raw data of page for comparison
- public $rawDataEdit; //raw data of page for editing
- public $rawDataOutput; //raw data of dynamic output
- public $rawDataReadonly; //raw data is read only? (boolean)
- public $rawDataEndOfLine; //end of line format for raw data
- public $language; //response language
- public $action; //response action
- public $status; //response status
+ public $yellow; // access to API
+ public $extension; // access to extension
+ public $active; // location is active? (boolean)
+ public $userEmail; // user email
+ public $userFailedError; // error of failed authentication
+ public $userFailedEmail; // email of failed authentication
+ public $userFailedExpire; // expiration time of failed authentication
+ public $rawDataSource; // raw data of page for comparison
+ public $rawDataEdit; // raw data of page for editing
+ public $rawDataOutput; // raw data of dynamic output
+ public $rawDataReadonly; // raw data is read only? (boolean)
+ public $rawDataEndOfLine; // end of line format for raw data
+ public $language; // response language
+ public $action; // response action
+ public $status; // response status
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1601,8 +1599,8 @@ class YellowEditResponse {
}
class YellowEditUsers {
- public $yellow; //access to API
- public $users; //registered users
+ public $yellow; // access to API
+ public $users; // registered users
public function __construct($yellow) {
$this->yellow = $yellow;
@@ -1823,8 +1821,8 @@ class YellowEditUsers {
}
class YellowEditMerge {
- public $yellow; //access to API
- const ADD = "+"; //merge types
+ public $yellow; // access to API
+ const ADD = "+"; // merge types
const MODIFY = "*";
const REMOVE = "-";
const SAME = " ";
diff --git a/system/extensions/image.php b/system/extensions/image.php
@@ -1,12 +1,10 @@
<?php
-// Image extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/image
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Image extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/image
class YellowImage {
const VERSION = "0.8.8";
const TYPE = "feature";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
diff --git a/system/extensions/install-blog.zip b/system/extensions/install-blog.zip
Binary files differ.
diff --git a/system/extensions/install-languages.zip b/system/extensions/install-languages.zip
Binary files differ.
diff --git a/system/extensions/install-wiki.zip b/system/extensions/install-wiki.zip
Binary files differ.
diff --git a/system/extensions/install.php b/system/extensions/install.php
@@ -1,13 +1,11 @@
<?php
// Install extension, https://github.com/datenstrom/yellow
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
class YellowInstall {
const VERSION = "0.8.27";
const TYPE = "feature";
const PRIORITY = "1";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
diff --git a/system/extensions/markdown.php b/system/extensions/markdown.php
@@ -1,12 +1,10 @@
<?php
-// Markdown extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/markdown
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Markdown extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/markdown
class YellowMarkdown {
const VERSION = "0.8.14";
const TYPE = "feature";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
@@ -3831,14 +3829,13 @@ class MarkdownExtraParser extends MarkdownParser {
}
}
-// Datenstrom Yellow Markdown parser
-// Copyright (c) 2013-2020 Datenstrom
+// Markdown parser, Copyright Datenstrom, License GPLv2
class YellowMarkdownParser extends MarkdownExtraParser {
- public $yellow; //access to API
- public $page; //access to page
- public $idAttributes; //id attributes
- public $noticeLevel; //recursive level
+ public $yellow; // access to API
+ public $page; // access to page
+ public $idAttributes; // id attributes
+ public $noticeLevel; // recursive level
public function __construct($yellow, $page) {
$this->yellow = $yellow;
diff --git a/system/extensions/meta.php b/system/extensions/meta.php
@@ -1,12 +1,10 @@
<?php
-// Meta extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/meta
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Meta extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/meta
class YellowMeta {
const VERSION = "0.8.12";
const TYPE = "feature";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
diff --git a/system/extensions/stockholm.php b/system/extensions/stockholm.php
@@ -1,12 +1,10 @@
<?php
-// Stockholm extension, https://github.com/datenstrom/yellow-extensions/tree/master/themes/stockholm
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Stockholm extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/stockholm
class YellowStockholm {
const VERSION = "0.8.8";
const TYPE = "theme";
- public $yellow; //access to API
+ public $yellow; // access to API
// Handle initialisation
public function onLoad($yellow) {
diff --git a/system/extensions/update.php b/system/extensions/update.php
@@ -1,14 +1,12 @@
<?php
-// Update extension, https://github.com/datenstrom/yellow-extensions/tree/master/features/update
-// Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se
-// This file may be used and distributed under the terms of the public license.
+// Update extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/update
class YellowUpdate {
const VERSION = "0.8.23";
const TYPE = "feature";
const PRIORITY = "2";
- public $yellow; //access to API
- public $updates; //number of updates
+ public $yellow; // access to API
+ public $updates; // number of updates
// Handle initialisation
public function onLoad($yellow) {
@@ -58,7 +56,7 @@ class YellowUpdate {
// Handle update
public function onUpdate($action) {
- if ($action=="update") { //TODO: remove later, converts old content settings
+ if ($action=="update") { // TODO: remove later, converts old content settings
if ($this->yellow->system->isExisting("multiLanguageMode")) {
$coreMultiLanguageMode = $this->yellow->system->get("multiLanguageMode");
$fileName = $this->yellow->system->get("coreSettingDirectory").$this->yellow->system->get("coreSystemFile");
@@ -90,7 +88,7 @@ class YellowUpdate {
}
}
}
- if ($action=="update") { //TODO: remove later, converts old layout files
+ if ($action=="update") { // TODO: remove later, converts old layout files
if ($this->yellow->system->isExisting("coreLayoutDir")) {
$path = $this->yellow->system->get("coreLayoutDir");
foreach ($this->yellow->toolbox->getDirectoryEntriesRecursive($path, "/^.*\.html$/", true, false) as $entry) {
@@ -110,7 +108,7 @@ class YellowUpdate {
}
}
}
- if ($action=="update") { //TODO: remove later, converts old commandline
+ if ($action=="update") { // TODO: remove later, converts old commandline
if ($this->yellow->system->isExisting("coreStaticDir")) {
$fileName = "yellow.php";
$fileData = $fileDataNew = $this->yellow->toolbox->readFile($fileName);
diff --git a/system/resources/stockholm.css b/system/resources/stockholm.css
@@ -1,6 +1,4 @@
-/* Stockholm extension, https://github.com/datenstrom/yellow-extensions/tree/master/themes/stockholm */
-/* Copyright (c) 2013-2020 Datenstrom, https://datenstrom.se */
-/* This file may be used and distributed under the terms of the public license. */
+/* Stockholm extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/stockholm */
html, body, div, form, pre, span, tr, th, td, img {
margin: 0;
