harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some more wiki issues

Browse Source 
(cherry picked from commit d29caa099a)
This commit is contained in:
Mario Vavti 2018-10-10 08:39:28 +00:00 committed by Mario
parent 0daa462207
commit c7644ad29d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/NativeWiki.php
View File

@ -252,7 +252,7 @@ class NativeWiki {
AND item_deleted = 0 $sql_extra limit 1", AND item_deleted = 0 $sql_extra limit 1",
dbesc(NWIKI_ITEM_RESOURCE_TYPE), dbesc(NWIKI_ITEM_RESOURCE_TYPE),
//dbesc(urldecode($urlName)), //dbesc(urldecode($urlName)),
dbesc($urlName), dbesc(self::name_decode($urlName)),
intval($uid) intval($uid)
); );

2
Zotlabs/Lib/NativeWikiPage.php
View File

@ -157,7 +157,7 @@ class NativeWikiPage {
'rawName' => $pageNewName, 'rawName' => $pageNewName,
'htmlName' => escape_tags($pageNewName), 'htmlName' => escape_tags($pageNewName),
//'urlName' => urlencode(escape_tags($pageNewName)) //'urlName' => urlencode(escape_tags($pageNewName))
Zlib\NativeWiki::name_encode($pageNewName) 'urlName' => Zlib\NativeWiki::name_encode($pageNewName)
]; ];
return [ 'success' => true, 'page' => $page ]; return [ 'success' => true, 'page' => $page ];

6
Zotlabs/Module/Wiki.php
View File

@ -293,9 +293,9 @@ class Wiki extends Controller {
} }
//$wikiheaderName = urldecode($wikiUrlName); //$wikiheaderName = urldecode($wikiUrlName);
$wikiheaderName = $wikiUrlName; $wikiheaderName = NativeWiki::name_decode($wikiUrlName);
//$wikiheaderPage = urldecode($pageUrlName); //$wikiheaderPage = urldecode($pageUrlName);
$wikiheaderPage = $pageUrlName; $wikiheaderPage = NativeWiki::name_decode($pageUrlName);
$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
$sharePage = t('Share'); $sharePage = t('Share');
@ -812,7 +812,7 @@ class Wiki extends Controller {
if ($pageUrlName === 'Home') { if ($pageUrlName === 'Home') {
json_return_and_die(array('message' => 'Cannot rename Home','success' => false)); 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)); json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false));
} }
// Determine if observer has permission to rename pages // Determine if observer has permission to rename pages

6
view/tpl/wiki.tpl
View File

@ -98,8 +98,8 @@
<script> <script>
window.wiki_resource_id = '{{$resource_id}}'; window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}'; window.wiki_page_name = '{{$page|escape:"javascript"}}';
window.wiki_page_content = '{{$content|escape:'javascript'}}'; window.wiki_page_content = '{{$content|escape:"javascript"}}';
window.wiki_page_commit = '{{$commit}}'; window.wiki_page_commit = '{{$commit}}';
window.saved = true; window.saved = true;
@ -122,7 +122,7 @@
if (data.success) { if (data.success) {
$('#rename-page-form-wrapper').hide(); $('#rename-page-form-wrapper').hide();
window.console.log('data: ' + JSON.stringify(data)); window.console.log('data: ' + JSON.stringify(data));
window.wiki_page_name = data.name.urlName; window.wiki_page_name = data.name.htmlName;
$('#wiki-header-page').html(data.name.htmlName); $('#wiki-header-page').html(data.name.htmlName);
wiki_refresh_page_list(); wiki_refresh_page_list();
} else { } else {