mikuli.cz

commit 75c618b87ccf8ed3099ffe9dfe334e0ece3f79ec
parent a185d0f9487732eccbabae221cf860782e2a7c5a
Author: markseu <mark2011@mayberg.se>
Date:   Fri, 13 Nov 2020 21:54:47 +0100

Updated edit extension, thanks Steffen

Diffstat:
M
system/extensions/edit.php
 | 
17
+++++++++--------
M
system/extensions/update-current.ini
 | 
4
++--

2 files changed, 11 insertions(+), 10 deletions(-)
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.38";
+    const VERSION = "0.8.39";
     public $yellow;         // access to API
     public $response;       // web response
     public $merge;          // text merge
@@ -992,7 +992,6 @@ 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
@@ -1002,6 +1001,7 @@ class YellowEditResponse {
     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 $active;             // response is active? (boolean)
     public $language;           // response language
     public $action;             // response action
     public $status;             // response status
@@ -1009,6 +1009,7 @@ class YellowEditResponse {
     public function __construct($yellow) {
         $this->yellow = $yellow;
         $this->extension = $yellow->extension->get("edit");
+        $this->userEmail = "";
     }
     
     // Process page data
@@ -1672,9 +1673,9 @@ class YellowEditResponse {
             substrb($pageOther->rawData, 0, $pageOther->metaDataOffsetBytes);
     }
     
-    // Check if active
-    public function isActive() {
-        return $this->active;
+    // Check if login with restriction
+    public function isLoginRestriction() {
+        return $this->yellow->system->get("editLoginRestriction");
     }
     
     // Check if user is logged in
@@ -1689,9 +1690,9 @@ class YellowEditResponse {
         return in_array($action, $tokens) && (empty($location) || substru($location, 0, strlenu($userHome))==$userHome);
     }
     
-    // Check if login with restriction
-    public function isLoginRestriction() {
-        return $this->yellow->system->get("editLoginRestriction");
+    // Check if page within current HTTP request
+    public function isActive() {
+        return $this->active;
     }
 }
     
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -31,11 +31,11 @@ Tag: feature
 system/extensions/core.php: core.php, create, update
 
 Extension: Edit
-Version: 0.8.38
+Version: 0.8.39
 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: 2020-11-04 15:53:00
+Published: 2020-11-13 21:47:13
 Developer: Datenstrom
 Tag: feature
 system/extensions/edit.php: edit.php, create, update