From 67a9dd84975d4689a1046074f368cc0543100324 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:20:00 +0200 Subject: Update NativeWikiPage.php --- Zotlabs/Lib/NativeWikiPage.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 919c51276..f129217c5 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -556,7 +556,10 @@ class NativeWikiPage { '$pageHistory' => $pageHistory['history'], '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') + '$msg_label' => t('Message','wiki_history'), + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } @@ -692,4 +695,4 @@ class NativeWikiPage { return $o; } -} +} \ No newline at end of file -- cgit v1.2.3 From e78a4d61d85bac570a63086ec1af68eee3c9c9b0 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 25 Aug 2018 21:25:26 +0200 Subject: Update NativeWikiPage.php --- Zotlabs/Lib/NativeWikiPage.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index f129217c5..d4875bbaf 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -557,9 +557,9 @@ class NativeWikiPage { '$permsWrite' => $arr['permsWrite'], '$name_lbl' => t('Name'), '$msg_label' => t('Message','wiki_history'), - '$date_lbl' => t('Date'), - '$revert_btn' => t('Revert'), - '$compare_btn' => t('Compare') + '$date_lbl' => t('Date'), + '$revert_btn' => t('Revert'), + '$compare_btn' => t('Compare') )); } @@ -695,4 +695,4 @@ class NativeWikiPage { return $o; } -} \ No newline at end of file +} -- cgit v1.2.3 From bf878dc4461ea28f71055d59496b21a1685ef63e Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Sun, 7 Oct 2018 23:08:47 +0000 Subject: Implement custom escaping (cherry picked from commit 93a310582f044d35f0a3583671053595fefdbedb) --- Zotlabs/Lib/NativeWikiPage.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index d4875bbaf..d0f522ec1 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -44,7 +44,8 @@ class NativeWikiPage { $pages[] = [ 'resource_id' => $resource_id, 'title' => escape_tags($title), - 'url' => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))), + //'url' => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))), + 'url' => Zlib\NativeWiki::name_encode($title), 'link_id' => 'id_' . substr($resource_id, 0, 10) . '_' . $page_item['id'] ]; } @@ -98,7 +99,8 @@ class NativeWikiPage { $page = [ 'rawName' => $name, 'htmlName' => escape_tags($name), - 'urlName' => urlencode($name), + //'urlName' => urlencode($name), + Zlib\NativeWiki::name_encode($name) ]; @@ -154,7 +156,8 @@ class NativeWikiPage { $page = [ 'rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), - 'urlName' => urlencode(escape_tags($pageNewName)) + //'urlName' => urlencode(escape_tags($pageNewName)) + Zlib\NativeWiki::name_encode($pageNewName) ]; return [ 'success' => true, 'page' => $page ]; @@ -527,7 +530,8 @@ class NativeWikiPage { $pages = $pageURLs = array(); foreach ($match[1] as $m) { // TODO: Why do we need to double urlencode for this to work? - $pageURLs[] = urlencode(urlencode(escape_tags($m))); + //$pageURLs[] = urlencode(urlencode(escape_tags($m))); + $pageURLs[] = Zlib\NativeWiki::name_encode(escape_tags($m)); $pages[] = $m; } $idx = 0; -- cgit v1.2.3 From d8f79f48e9b4859383eaeea35da6d32045f55ae1 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Mon, 8 Oct 2018 17:22:39 +0000 Subject: Rework Wiki encoding scheme. (cherry picked from commit 709665846e66f093109730691b31d9e094d02088) --- Zotlabs/Lib/NativeWikiPage.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index d0f522ec1..ebdcb4740 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -100,7 +100,7 @@ class NativeWikiPage { 'rawName' => $name, 'htmlName' => escape_tags($name), //'urlName' => urlencode($name), - Zlib\NativeWiki::name_encode($name) + 'urlName' => Zlib\NativeWiki::name_encode($name) ]; @@ -368,7 +368,6 @@ class NativeWikiPage { unset($item['id']); unset($item['author']); - $item['parent'] = 0; $item['body'] = $content; $item['author_xchan'] = $observer_hash; -- cgit v1.2.3 From c7644ad29dfdfd237125d3c8815ae62b8457b80a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 10 Oct 2018 08:39:28 +0000 Subject: fix some more wiki issues (cherry picked from commit d29caa099af2d132978e634a454a29d5c85c23fe) --- Zotlabs/Lib/NativeWikiPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index ebdcb4740..8d21fac5e 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -157,7 +157,7 @@ class NativeWikiPage { 'rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), //'urlName' => urlencode(escape_tags($pageNewName)) - Zlib\NativeWiki::name_encode($pageNewName) + 'urlName' => Zlib\NativeWiki::name_encode($pageNewName) ]; return [ 'success' => true, 'page' => $page ]; -- cgit v1.2.3 From 4d86a199f0d10a49d0d0cc4da7f19b6d4bde1ba6 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Thu, 11 Oct 2018 02:46:00 +0000 Subject: Add wiki_preprocess hook and documentation (cherry picked from commit bad4ea6e65a45ac2523a9a7c2ec624ad2535b652) --- Zotlabs/Lib/NativeWikiPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Lib/NativeWikiPage.php') diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index 8d21fac5e..dddd26af3 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -619,7 +619,7 @@ class NativeWikiPage { $s = str_replace('[observer.webname]', '', $s); $s = str_replace('[observer.photo]', '', $s); } - + return $s; } -- cgit v1.2.3