From d353c2813aefffc40952ce90fe84f20bd6463993 Mon Sep 17 00:00:00 2001
From: Bruno Meilick <b@bnomei.com>
Date: Sun, 27 Aug 2017 16:35:11 +0200
Subject: [PATCH] switched page and site method

https://github.com/getkirby/kirby/issues/600
Signed-off-by: Bruno Meilick <b@bnomei.com>
---
 kirby-opener.php | 30 +++++++++++++++---------------
 package.json     |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/kirby-opener.php b/kirby-opener.php
index bb75512..ccf7445 100644
--- a/kirby-opener.php
+++ b/kirby-opener.php
@@ -34,21 +34,6 @@ public function version() {
   METHODS
  ***************************************/
 
-$kirby->set('site::method', 'openerSecret', 
-  function($site) {
-    return sha1(KirbyOpener::getSalt().date('Ymd'));
-});
-
-$kirby->set('pages::method', 'openerSecret', 
-  function($pages) {
-    return sha1(KirbyOpener::getSalt().date('Ymd'));
-});
-
-$kirby->set('pages::method', 'openerDiruriEncodedGetPage', 
-  function($pages, $diruriencoded) {
-    return page(str_replace('__DS__', DS, urldecode($diruriencoded)));
-});
-
 $kirby->set('page::method', 'openerSecret', 
   function($page) {
     return sha1(KirbyOpener::getSalt().$page->url().date('Ymd'));
@@ -64,6 +49,21 @@ function($page, $diruriencoded) {
     return $page->openerDiruriEncoded() == $diruriencoded;
 });
 
+$kirby->set('pages::method', 'openerSecret', 
+  function($pages) {
+    return sha1(KirbyOpener::getSalt().date('Ymd'));
+});
+
+$kirby->set('pages::method', 'openerDiruriEncodedGetPage', 
+  function($pages, $diruriencoded) {
+    return page(str_replace('__DS__', DS, urldecode($diruriencoded)));
+});
+
+$kirby->set('site::method', 'openerSecret', 
+  function($site) {
+    return sha1(KirbyOpener::getSalt().date('Ymd'));
+});
+
 /****************************************
   FIELDS
  ***************************************/
diff --git a/package.json b/package.json
index 9daefca..c257c8d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kirby-opener",
   "description": "Kirby Opener is a Kirby CMS Panel Field button that allows you to use placeholders to create dynamic urls which are called with and without ajax response or start downloads.",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "author": "Bruno Meilick",
   "type": "kirby-plugin",
   "license": "Commercial"