mikuli.cz

commit e2f01b6ff53ebe1563a73bb13369a67b5806d25b
parent 0cb194ce374f0fac966b6c4bcbeaaf3b772a3731
Author: markseu <mark2011@mayberg.se>
Date:   Thu, 10 Jun 2021 21:59:50 +0200

Refactored extensions

Diffstat:
M
system/extensions/core.php
 | 
10
+++++-----
M
system/extensions/edit.js
 | 
2
+-
M
system/extensions/edit.php
 | 
6
+++---
M
system/extensions/update-current.ini
 | 
8
++++----

4 files changed, 13 insertions(+), 13 deletions(-)
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.44";
+    const VERSION = "0.8.45";
     const RELEASE = "0.8.17";
     public $page;           // current page
     public $content;        // content files
@@ -501,12 +501,12 @@ class YellowPage {
             if (!$this->isExisting("titleHeader")) $this->set("titleHeader", $titleHeader);
             if ($this->get("status")=="unlisted") $this->visible = false;
             if ($this->get("status")=="shared") $this->available = false;
-            $this->set("pageRead", $this->yellow->lookup->normaliseUrl(
+            $this->set("pageReadUrl", $this->yellow->lookup->normaliseUrl(
                 $this->yellow->system->get("coreServerScheme"),
                 $this->yellow->system->get("coreServerAddress"),
                 $this->yellow->system->get("coreServerBase"),
                 $this->location));
-            $this->set("pageEdit", $this->yellow->lookup->normaliseUrl(
+            $this->set("pageEditUrl", $this->yellow->lookup->normaliseUrl(
                 $this->yellow->system->get("coreServerScheme"),
                 $this->yellow->system->get("coreServerAddress"),
                 $this->yellow->system->get("coreServerBase"),
@@ -550,8 +550,8 @@ class YellowPage {
                 if (method_exists($value["object"], "onParseContentRaw")) {
                     $this->parser = $value["object"];
                     $this->parserData = $this->getContent(true, $sizeMax);
-                    $this->parserData = preg_replace("/@pageRead/i", $this->get("pageRead"), $this->parserData);
-                    $this->parserData = preg_replace("/@pageEdit/i", $this->get("pageEdit"), $this->parserData);
+                    $this->parserData = preg_replace("/@pageReadUrl/i", $this->get("pageReadUrl"), $this->parserData);
+                    $this->parserData = preg_replace("/@pageEditUrl/i", $this->get("pageEditUrl"), $this->parserData);
                     $this->parserData = $this->parser->onParseContentRaw($this, $this->parserData);
                     foreach ($this->yellow->extension->data as $key=>$value) {
                         if (method_exists($value["object"], "onParseContentHtml")) {
diff --git a/system/extensions/edit.js b/system/extensions/edit.js
@@ -693,7 +693,7 @@ yellow.edit = {
     // Process close
     processClose: function() {
         this.hidePane(this.paneId);
-        if (yellow.page.action=="login") window.open(yellow.page.pageRead, "_self");
+        if (yellow.page.action=="login") window.open(yellow.page.pageReadUrl, "_self");
     },
     
     // Create popup
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -2,7 +2,7 @@
 // Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 
 class YellowEdit {
-    const VERSION = "0.8.48";
+    const VERSION = "0.8.49";
     public $yellow;         // access to API
     public $response;       // web response
     public $merge;          // text merge
@@ -1205,8 +1205,8 @@ class YellowEditResponse {
             $data["base"] = $this->yellow->page->base;
             $data["location"] = $this->yellow->page->location;
         }
-        $data["pageRead"] = $this->yellow->page->get("pageRead");
-        $data["pageEdit"] = $this->yellow->page->get("pageEdit");
+        $data["pageReadUrl"] = $this->yellow->page->get("pageReadUrl");
+        $data["pageEditUrl"] = $this->yellow->page->get("pageEditUrl");
         if ($this->action!="none") $data = array_merge($data, $this->getRequestData());
         $data["action"] = $this->action;
         $data["status"] = $this->status;
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -21,11 +21,11 @@ Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.43
+Version: 0.8.45
 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: 2021-05-11 22:13:51
+Published: 2021-06-10 21:53:13
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update
@@ -37,11 +37,11 @@ system/layouts/navigation.html: navigation.html, create, update, careful
 system/layouts/pagination.html: default.html, create, update, careful
 
 Extension: Edit
-Version: 0.8.48
+Version: 0.8.49
 Description: Edit your website in a web browser.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/edit.zip
-Published: 2021-06-09 18:23:40
+Published: 2021-06-10 21:53:49
 Developer: Datenstrom
 Tag: feature
 system/extensions/edit.php: edit.php, create, update