diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 10 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 65f40748c..cdabbc3e9 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -252,7 +252,7 @@ class NativeWiki { AND item_deleted = 0 $sql_extra limit 1", dbesc(NWIKI_ITEM_RESOURCE_TYPE), //dbesc(urldecode($urlName)), - dbesc($urlName), + dbesc(self::name_decode($urlName)), intval($uid) ); diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index ebdcb4740..dddd26af3 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 ]; @@ -619,7 +619,7 @@ class NativeWikiPage { $s = str_replace('[observer.webname]', '', $s); $s = str_replace('[observer.photo]', '', $s); } - + return $s; } diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index ead7eea6a..05d6e85cd 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -293,9 +293,9 @@ class Wiki extends Controller { } //$wikiheaderName = urldecode($wikiUrlName); - $wikiheaderName = $wikiUrlName; + $wikiheaderName = NativeWiki::name_decode($wikiUrlName); //$wikiheaderPage = urldecode($pageUrlName); - $wikiheaderPage = $pageUrlName; + $wikiheaderPage = NativeWiki::name_decode($pageUrlName); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); $sharePage = t('Share'); @@ -331,6 +331,10 @@ class Wiki extends Controller { $sampleContent = t('New page'); $content = (($p['content'] == '') ? $sampleContent : $p['content']); + + $hookinfo = ['content' => $content, 'mimetype' => $mimeType]; + call_hooks('wiki_preprocess',$hookinfo); + $content = $hookinfo['content']; // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { @@ -812,7 +816,7 @@ class Wiki extends Controller { if ($pageUrlName === 'Home') { json_return_and_die(array('message' => 'Cannot rename Home','success' => false)); } - if(NativeWiki::encode_name(escape_tags($pageNewName)) === '') { + if(NativeWiki::name_encode(escape_tags($pageNewName)) === '') { json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false)); } // Determine if observer has permission to rename pages diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 1d20f5822..77634777a 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -93,7 +93,7 @@ class Finger { $headers = []; $headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname(); $headers['X-Zot-Nonce'] = random_string(); - $headers['Host'] = $parsed['host']; + $headers['Host'] = $parsed_host; $xhead = \Zotlabs\Web\HTTPSig::create_sig('',$headers,$channel['channel_prvkey'], 'acct:' . $channel['channel_address'] . '@' . \App::get_hostname(),false); |