From 028935a318e5848542faa551f3d39bbe8b365447 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 14 Dec 2016 11:55:52 +0100 Subject: wiki: do not show revert buttons if we do not have write perms and minor cleanup --- Zotlabs/Module/Wiki.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 01a1bdc41..06a4d0f24 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -222,11 +222,7 @@ class Wiki extends \Zotlabs\Web\Controller { $html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); $renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName); } - $hide_editor = false; $showPageControls = $wiki_editor; - $showNewWikiButton = $wiki_owner; - $showNewPageButton = $wiki_editor; - $pageHistory = wiki_page_history(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); break; default: // Strip the extraneous URL components goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName); @@ -238,7 +234,7 @@ class Wiki extends \Zotlabs\Web\Controller { $wikiModal = replace_macros(get_markup_template('generic_modal.tpl'), array( '$id' => $wikiModalID, '$title' => t('Revision Comparison'), - '$ok' => t('Revert'), + '$ok' => (($showPageControls) ? t('Revert') : ''), '$cancel' => t('Cancel') )); @@ -246,13 +242,10 @@ class Wiki extends \Zotlabs\Web\Controller { '$wikiheaderName' => $wikiheaderName, '$wikiheaderPage' => $wikiheaderPage, '$renamePage' => $renamePage, - '$hideEditor' => $hide_editor, // True will completely hide the content section and is used for the case of no wiki selected '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'), '$showPageControls' => $showPageControls, '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$tools_label' => 'Page Tools', - '$showNewWikiButton'=> $showNewWikiButton, - '$showNewPageButton'=> $showNewPageButton, '$channel' => $owner['channel_address'], '$resource_id' => $resource_id, '$page' => $pageUrlName, @@ -268,7 +261,6 @@ class Wiki extends \Zotlabs\Web\Controller { '$renderedContent' => $renderedContent, '$pageRename' => array('pageRename', t('New page name'), '', ''), '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'), - '$pageHistory' => $pageHistory['history'], '$wikiModal' => $wikiModal, '$wikiModalID' => $wikiModalID, '$commit' => 'HEAD', @@ -495,8 +487,9 @@ class Wiki extends \Zotlabs\Web\Controller { } $historyHTML = widget_wiki_page_history(array( - 'resource_id' => $resource_id, - 'pageUrlName' => $pageUrlName + 'resource_id' => $resource_id, + 'pageUrlName' => $pageUrlName, + 'permsWrite' => $perms['write'] )); json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true)); } -- cgit v1.2.3 From 2a2a4b96c70bbbb32367f4f56a4f4e176bbb80d5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 15 Dec 2016 10:56:16 +0100 Subject: more wiki cleanup --- Zotlabs/Module/Wiki.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 06a4d0f24..7b0ec9d83 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -242,20 +242,12 @@ class Wiki extends \Zotlabs\Web\Controller { '$wikiheaderName' => $wikiheaderName, '$wikiheaderPage' => $wikiheaderPage, '$renamePage' => $renamePage, - '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'), '$showPageControls' => $showPageControls, '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$tools_label' => 'Page Tools', '$channel' => $owner['channel_address'], '$resource_id' => $resource_id, '$page' => $pageUrlName, - '$lockstate' => $x['lockstate'], - '$acl' => $x['acl'], - '$allow_cid' => $x['allow_cid'], - '$allow_gid' => $x['allow_gid'], - '$deny_cid' => $x['deny_cid'], - '$deny_gid' => $x['deny_gid'], - '$bang' => $x['bang'], '$mimeType' => $mimeType, '$content' => $content, '$renderedContent' => $renderedContent, @@ -270,7 +262,7 @@ class Wiki extends \Zotlabs\Web\Controller { '$embedPhotosModalOK' => t('OK'), '$modalchooseimages' => t('Choose images to embed'), '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album...'), + '$modaldiffalbum' => t('Choose a different album'), '$modalerrorlist' => t('Error getting album list'), '$modalerrorlink' => t('Error getting photo link'), '$modalerroralbum' => t('Error getting album'), -- cgit v1.2.3 From 231b70b987bb76a27cc8c4a36b128b4fef2178ce Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 19 Dec 2016 16:06:49 -0800 Subject: call zidify_links() when formatting bbcode for internal consumption --- Zotlabs/Module/Wiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 7b0ec9d83..95f7c8704 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -215,7 +215,7 @@ class Wiki extends \Zotlabs\Web\Controller { $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = wiki_convert_links(bbcode($content),argv(0).'/'.argv(1).'/'.$wikiUrlName); + $renderedContent = wiki_convert_links(zidify_links(smilies(bbcode($content))),argv(0).'/'.argv(1).'/'.$wikiUrlName); } else { require_once('library/markdown.php'); @@ -299,7 +299,7 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = wiki_convert_links(bbcode($content),$wikiURL); + $html = wiki_convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); } else { require_once('library/markdown.php'); -- cgit v1.2.3 From 6e504b7bc992bebabedfc22f4e9b80dd29761800 Mon Sep 17 00:00:00 2001 From: Hubzilla Date: Wed, 18 Jan 2017 17:45:27 -0800 Subject: nwiki updates --- Zotlabs/Module/Wiki.php | 296 +++++++++++++++++++++++++++--------------------- 1 file changed, 170 insertions(+), 126 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 95f7c8704..60a1fb665 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -2,26 +2,30 @@ namespace Zotlabs\Module; +use \Zotlabs\Lib as Zlib; + class Wiki extends \Zotlabs\Web\Controller { + private $wiki = null; + function init() { // Determine which channel's wikis to display to the observer $nick = null; if (argc() > 1) $nick = argv(1); // if the channel name is in the URL, use that - if (!$nick && local_channel()) { // if no channel name was provided, assume the current logged in channel + if (! $nick && local_channel()) { // if no channel name was provided, assume the current logged in channel $channel = \App::get_channel(); if ($channel && $channel['channel_address']) { $nick = $channel['channel_address']; goaway(z_root() . '/wiki/' . $nick); } } - if (!$nick) { - notice(t('You must be logged in to see this page.') . EOL); - goaway('/login'); + if (! $nick) { + notice( t('Profile Unavailable.') . EOL); + goaway(z_root()); } - profile_load($nick); + profile_load($nick); } function get() { @@ -42,6 +46,7 @@ class Wiki extends \Zotlabs\Web\Controller { // TODO: Combine the interface configuration into a unified object // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) + $wiki_owner = false; $showNewWikiButton = false; $pageHistory = array(); @@ -49,12 +54,16 @@ class Wiki extends \Zotlabs\Web\Controller { $resource_id = ''; // init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1 + $nick = argv(1); $owner = channelx_by_nick($nick); // The channel who owns the wikis being viewed if(! $owner) { notice( t('Invalid channel') . EOL); goaway('/' . argv(0)); } + + $observer_hash = get_observer_hash(); + // Determine if the observer is the channel owner so the ACL dialog can be populated if (local_channel() === intval($owner['channel_id'])) { @@ -62,12 +71,14 @@ class Wiki extends \Zotlabs\Web\Controller { // Obtain the default permission settings of the channel $owner_acl = array( - 'allow_cid' => $owner['channel_allow_cid'], - 'allow_gid' => $owner['channel_allow_gid'], - 'deny_cid' => $owner['channel_deny_cid'], - 'deny_gid' => $owner['channel_deny_gid'] + 'allow_cid' => $owner['channel_allow_cid'], + 'allow_gid' => $owner['channel_allow_gid'], + 'deny_cid' => $owner['channel_deny_cid'], + 'deny_gid' => $owner['channel_deny_gid'] ); + // Initialize the ACL to the channel default permissions + $x = array( 'lockstate' => (( $owner['channel_allow_cid'] || $owner['channel_allow_gid'] || @@ -78,11 +89,12 @@ class Wiki extends \Zotlabs\Web\Controller { 'acl' => populate_acl($owner_acl), 'allow_cid' => acl2json($owner_acl['allow_cid']), 'allow_gid' => acl2json($owner_acl['allow_gid']), - 'deny_cid' => acl2json($owner_acl['deny_cid']), - 'deny_gid' => acl2json($owner_acl['deny_gid']), + 'deny_cid' => acl2json($owner_acl['deny_cid']), + 'deny_gid' => acl2json($owner_acl['deny_gid']), 'bang' => '' ); - } else { + } + else { // Not the channel owner $owner_acl = $x = array(); } @@ -91,12 +103,13 @@ class Wiki extends \Zotlabs\Web\Controller { $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); // Download a wiki + if((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) { $resource_id = argv(4); - $w = wiki_get_wiki($resource_id); - if(!$w['path']) { + $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id); + if(! $w['htmlName']) { notice(t('Error retrieving wiki') . EOL); } @@ -111,7 +124,7 @@ class Wiki extends \Zotlabs\Web\Controller { $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename; // Generate the zip file - \Zotlabs\Lib\ExtendedZip::zipTree($w['path'], $zip_filepath, \ZipArchive::CREATE); + ZLib\ExtendedZip::zipTree($w['path'], $zip_filepath, \ZipArchive::CREATE); // Output the file for download @@ -131,10 +144,10 @@ class Wiki extends \Zotlabs\Web\Controller { } - switch (argc()) { + switch(argc()) { case 2: - $wikis = wiki_list($owner, get_observer_hash()); - if ($wikis) { + $wikis = Zlib\NativeWiki::listwikis($owner, get_observer_hash()); + if($wikis) { $o .= replace_macros(get_markup_template('wikilist.tpl'), array( '$header' => t('Wikis'), '$channel' => $owner['channel_address'], @@ -161,72 +174,78 @@ class Wiki extends \Zotlabs\Web\Controller { return $o; } - break; + case 3: + // /wiki/channel/wiki -> No page was specified, so redirect to Home.md + $wikiUrlName = urlencode(argv(2)); - goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName.'/Home'); + goaway(z_root() . '/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/Home'); + case 4: + // GET /wiki/channel/wiki/page // Fetch the wiki info and determine observer permissions + $wikiUrlName = urlencode(argv(2)); $pageUrlName = urlencode(argv(3)); - $w = wiki_exists_by_name($owner['channel_id'], $wikiUrlName); - if(!$w['resource_id']) { + $w = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $wikiUrlName); + + if(! $w['resource_id']) { notice(t('Wiki not found') . EOL); - goaway('/'.argv(0).'/'.argv(1)); - return; //not reached + goaway(z_root() . '/' . argv(0) . '/' . argv(1)); } + $resource_id = $w['resource_id']; - if (!$wiki_owner) { + if(! $wiki_owner) { // Check for observer permissions $observer_hash = get_observer_hash(); - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['read']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['read']) { notice(t('Permission denied.') . EOL); - goaway('/'.argv(0).'/'.argv(1)); + goaway(z_root() . '/' . argv(0) . '/' . argv(1)); return; //not reached } - if($perms['write']) { - $wiki_editor = true; - } else { - $wiki_editor = false; - } - } else { + $wiki_editor = (($perms['write']) ? true : false); + } + else { $wiki_editor = true; } + $wikiheaderName = urldecode($wikiUrlName); $wikiheaderPage = urldecode($pageUrlName); + $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); - $p = wiki_get_page_content(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); - if(!$p['success']) { - notice(t('Error retrieving page content') . EOL); - goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName); - return; //not reached + $p = Zlib\NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); + if(! $p['success']) { + notice( t('Error retrieving page content') . EOL); + goaway(z_root() . '/' . argv(0) . '/' . argv(1) ); } $mimeType = $p['mimeType']; - $rawContent = (($p['mimeType'] == 'text/bbcode') ? htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT) : htmlspecialchars_decode($p['content'],ENT_COMPAT)); + $rawContent = (($p['mimeType'] == 'text/bbcode') + ? htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT) + : htmlspecialchars_decode($p['content'],ENT_COMPAT) + ); $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = wiki_convert_links(zidify_links(smilies(bbcode($content))),argv(0).'/'.argv(1).'/'.$wikiUrlName); + $renderedContent = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))), argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } else { require_once('library/markdown.php'); $html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); - $renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName); + $renderedContent = wiki_convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; break; default: // Strip the extraneous URL components goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName); - return; //not reached } $wikiModalID = random_string(3); @@ -237,6 +256,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$ok' => (($showPageControls) ? t('Revert') : ''), '$cancel' => t('Cancel') )); + + $placeholder = t('Short description of your changes (optional)'); $o .= replace_macros(get_markup_template('wiki.tpl'),array( '$wikiheaderName' => $wikiheaderName, @@ -252,7 +273,7 @@ class Wiki extends \Zotlabs\Web\Controller { '$content' => $content, '$renderedContent' => $renderedContent, '$pageRename' => array('pageRename', t('New page name'), '', ''), - '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'), + '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="' . $placeholder . '"'), '$wikiModal' => $wikiModal, '$wikiModalID' => $wikiModalID, '$commit' => 'HEAD', @@ -293,19 +314,20 @@ class Wiki extends \Zotlabs\Web\Controller { if((argc() > 2) && (argv(2) === 'preview')) { $content = $_POST['content']; $resource_id = $_POST['resource_id']; - $w = wiki_get_wiki($resource_id); - $wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName']; + $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id); + + $wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName']; $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = wiki_convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); + $html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); } else { require_once('library/markdown.php'); - $content = wiki_bbcode($content); - $html = wiki_generate_toc(zidify_text(purify_html(Markdown($content)))); - $html = wiki_convert_links($html,$wikiURL); + $content = Zlib\NativeWikiPage::bbcode($content); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown($content)))); + $html = Zlib\NativeWikiPage::convert_links($html,$wikiURL); } json_return_and_die(array('html' => $html, 'success' => true)); } @@ -336,17 +358,18 @@ class Wiki extends \Zotlabs\Web\Controller { // Get ACL for permissions $acl = new \Zotlabs\Access\AccessList($owner); $acl->set_from_array($_POST); - $r = wiki_create_wiki($owner, $observer_hash, $wiki, $acl); - if ($r['success']) { - $homePage = wiki_create_page('Home', $r['item']['resource_id']); - if(!$homePage['success']) { + $r = Zlib\NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl); + if($r['success']) { + $homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id']); + if(! $homePage['success']) { notice( t('Wiki created, but error creating Home page.')); - goaway('/wiki/'.$nick.'/'.$wiki['urlName']); + goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName']); } - goaway('/wiki/'.$nick.'/'.$wiki['urlName'].'/'.$homePage['page']['urlName']); - } else { - notice(t('Error creating wiki')); - goaway('/wiki'); + goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName'] . '/' . $homePage['page']['urlName']); + } + else { + notice( t('Error creating wiki')); + goaway(z_root() . '/wiki'); } } @@ -357,15 +380,16 @@ class Wiki extends \Zotlabs\Web\Controller { // more detail permissions framework if (local_channel() !== intval($owner['channel_id'])) { logger('Wiki delete permission denied.'); - json_return_and_die(array('message' => 'Wiki delete permission denied.', 'success' => false)); + json_return_and_die(array('message' => t('Wiki delete permission denied.'), 'success' => false)); } $resource_id = $_POST['resource_id']; - $deleted = wiki_delete_wiki($resource_id); + $deleted = Zlib\NativeWiki::delete_wiki($owner['channel_id'],$observer_hash,$resource_id); if ($deleted['success']) { json_return_and_die(array('message' => '', 'success' => true)); - } else { - logger('Error deleting wiki: ' . $resource_id); - json_return_and_die(array('message' => 'Error deleting wiki', 'success' => false)); + } + else { + logger('Error deleting wiki: ' . $resource_id . ' ' . $deleted['message']); + json_return_and_die(array('message' => t('Error deleting wiki'), 'success' => false)); } } @@ -377,41 +401,46 @@ class Wiki extends \Zotlabs\Web\Controller { // Determine if observer has permission to create a page - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['write']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['write']) { logger('Wiki write permission denied. ' . EOL); json_return_and_die(array('success' => false)); } - $name = $_POST['name']; //Get new page name - if(urlencode(escape_tags($_POST['name'])) === '') { + $name = $_POST['pageName']; //Get new page name + if(urlencode(escape_tags($_POST['pageName'])) === '') { json_return_and_die(array('message' => 'Error creating page. Invalid name.', 'success' => false)); } - $page = wiki_create_page($name, $resource_id); - if ($page['success']) { + $page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id); + + if($page['success']) { $ob = \App::get_observer(); - $commit = wiki_git_commit(array( - 'commit_msg' => t('New page created'), - 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => array($page['page']['fileName']) - )); + $commit = Zlib\NativeWikiPage::commit(array( + 'commit_msg' => t('New page created'), + 'resource_id' => $resource_id, + 'channel_id' => $owner['channel_id'], + 'observer_hash' => $observer_hash, + 'pageUrlName' => $name + )); + if($commit['success']) { - json_return_and_die(array('url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.$page['page']['urlName'], 'success' => true)); - } else { - json_return_and_die(array('message' => 'Error making git commit','url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.urlencode($page['page']['urlName']),'success' => false)); + json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . $page['page']['urlName'], 'success' => true)); + } + else { + json_return_and_die(array('message' => 'Error making git commit','url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . urlencode($page['page']['urlName']),'success' => false)); } - } else { + } + else { logger('Error creating page'); json_return_and_die(array('message' => 'Error creating page.', 'success' => false)); } } // Fetch page list for a wiki - if ((argc() === 5) && (argv(2) === 'get') && (argv(3) === 'page') && (argv(4) === 'list')) { + if((argc() === 5) && (argv(2) === 'get') && (argv(3) === 'page') && (argv(4) === 'list')) { $resource_id = $_POST['resource_id']; // resource_id for wiki in db - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); if(!$perms['read']) { logger('Wiki read permission denied.' . EOL); json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false)); @@ -437,27 +466,33 @@ class Wiki extends \Zotlabs\Web\Controller { } // Determine if observer has permission to save content - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['write']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['write']) { logger('Wiki write permission denied. ' . EOL); json_return_and_die(array('success' => false)); } - $saved = wiki_save_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'content' => $content)); + $saved = Zlib\NativeWikiPage::save_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'content' => $content)); + if($saved['success']) { $ob = \App::get_observer(); - $commit = wiki_git_commit(array( - 'commit_msg' => $commitMsg, - 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => array($saved['fileName']) - )); + $commit = Zlib\NativeWikiPage::commit(array( + 'commit_msg' => $commitMsg, + 'pageUrlName' => $pageUrlName, + 'resource_id' => $resource_id, + 'channel_id' => $owner['channel_id'], + 'observer_hash' => $observer_hash, + 'revision' => (-1) + )); + if($commit['success']) { json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); - } else { + } + else { json_return_and_die(array('message' => 'Error making git commit','success' => false)); } - } else { + } + else { json_return_and_die(array('message' => 'Error saving page', 'success' => false)); } } @@ -472,8 +507,8 @@ class Wiki extends \Zotlabs\Web\Controller { // Determine if observer has permission to read content - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['read']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['read']) { logger('Wiki read permission denied.' . EOL); json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false)); } @@ -481,59 +516,65 @@ class Wiki extends \Zotlabs\Web\Controller { $historyHTML = widget_wiki_page_history(array( 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, - 'permsWrite' => $perms['write'] + 'permsWrite' => $perms['write'] )); json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true)); } // Delete a page if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) { + $resource_id = $_POST['resource_id']; $pageUrlName = $_POST['name']; + if ($pageUrlName === 'Home') { - json_return_and_die(array('message' => 'Cannot delete Home','success' => false)); + json_return_and_die(array('message' => t('Cannot delete Home'),'success' => false)); } // Determine if observer has permission to delete pages - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['write']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['write']) { logger('Wiki write permission denied. ' . EOL); json_return_and_die(array('success' => false)); } - $deleted = wiki_delete_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); + $deleted = Zlib\NativeWikiPage::delete_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); if($deleted['success']) { $ob = \App::get_observer(); - $commit = wiki_git_commit(array( - 'commit_msg' => 'Deleted ' . $pageUrlName, - 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => null - )); + $commit = Zlib\NativeWikiPage::git_commit(array( + 'commit_msg' => 'Deleted ' . $pageUrlName, + 'resource_id' => $resource_id, + 'observer' => $ob, + 'files' => null + )); if($commit['success']) { json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); - } else { + } + else { json_return_and_die(array('message' => 'Error making git commit','success' => false)); } - } else { + } + else { json_return_and_die(array('message' => 'Error deleting page', 'success' => false)); } } // Revert a page if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) { + +logger('revert was called: ' . print_r($_POST,true)); $resource_id = $_POST['resource_id']; $pageUrlName = $_POST['name']; $commitHash = $_POST['commitHash']; // Determine if observer has permission to revert pages - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['write']) { + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['write']) { logger('Wiki write permission denied.' . EOL); json_return_and_die(array('success' => false)); } - $reverted = wiki_revert_page(array('commitHash' => $commitHash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); + $reverted = Zlib\NativeWikiPage::revert_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'commitHash' => $commitHash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); if($reverted['success']) { json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true)); } else { @@ -549,15 +590,15 @@ class Wiki extends \Zotlabs\Web\Controller { $currentCommit = $_POST['currentCommit']; // Determine if observer has permission to revert pages - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); if(!$perms['read']) { logger('Wiki read permission denied.' . EOL); json_return_and_die(array('success' => false)); } - $compare = wiki_compare_page(array('currentCommit' => $currentCommit, 'compareCommit' => $compareCommit, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); + $compare = Zlib\NativeWikiPage::compare_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'currentCommit' => $currentCommit, 'compareCommit' => $compareCommit, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); if($compare['success']) { - $diffHTML = '
Current RevisionSelected Revision
' . $compare['diff']; + $diffHTML = '
' . t('Current Revision') . '' . t('Selected Revision') . '
' . $compare['diff']; json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true)); } else { json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false)); @@ -577,34 +618,37 @@ class Wiki extends \Zotlabs\Web\Controller { } // Determine if observer has permission to rename pages - $perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); - if(!$perms['write']) { + $perms = Zlib\NativeWikiPage::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + if(! $perms['write']) { logger('Wiki write permission denied. ' . EOL); json_return_and_die(array('success' => false)); } - $renamed = wiki_rename_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'pageNewName' => $pageNewName)); + $renamed = Zlib\NativeWikiPage::rename_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'pageNewName' => $pageNewName)); if($renamed['success']) { $ob = \App::get_observer(); $commit = wiki_git_commit(array( - 'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], - 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']), - 'all' => true - )); + 'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], + 'resource_id' => $resource_id, + 'observer' => $ob, + 'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']), + 'all' => true + )); + if($commit['success']) { json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true)); - } else { + } + else { json_return_and_die(array('message' => 'Error making git commit','success' => false)); } - } else { + } + else { json_return_and_die(array('message' => 'Error renaming page', 'success' => false)); } } //notice( t('You must be authenticated.')); - json_return_and_die(array('message' => 'You must be authenticated.', 'success' => false)); + json_return_and_die(array('message' => t('You must be authenticated.'), 'success' => false)); } } -- cgit v1.2.3 From d4e58e94f6777f0a7ab5733d889f29bdb9366b14 Mon Sep 17 00:00:00 2001 From: Hubzilla Date: Wed, 18 Jan 2017 18:18:37 -0800 Subject: native wiki updates --- Zotlabs/Module/Wiki.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 60a1fb665..9adcc91b0 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -39,7 +39,6 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - require_once('include/wiki.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); require_once('include/bbcode.php'); @@ -239,8 +238,8 @@ class Wiki extends \Zotlabs\Web\Controller { } else { require_once('library/markdown.php'); - $html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); - $renderedContent = wiki_convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown(Zlib\NativeWikiPage::bbcode(json_decode($content)))))); + $renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; break; @@ -296,7 +295,7 @@ class Wiki extends \Zotlabs\Web\Controller { } function post() { - require_once('include/wiki.php'); + require_once('include/bbcode.php'); $nick = argv(1); -- cgit v1.2.3 From 4295b1945e08b7e93286b4e51c3ba26a3828f80b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 19 Jan 2017 10:02:26 +0100 Subject: we need channel_id here not the whole channel --- Zotlabs/Module/Wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 9adcc91b0..20a5eb35f 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -313,7 +313,7 @@ class Wiki extends \Zotlabs\Web\Controller { if((argc() > 2) && (argv(2) === 'preview')) { $content = $_POST['content']; $resource_id = $_POST['resource_id']; - $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id); + $w = Zlib\NativeWiki::get_wiki($owner['channel_id'],$observer_hash,$resource_id); $wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName']; -- cgit v1.2.3 From bb233a98727a787f1ad77714564e437544192fce Mon Sep 17 00:00:00 2001 From: Hubzilla Date: Fri, 20 Jan 2017 15:42:15 -0800 Subject: add bbcode language conditionals to wiki --- Zotlabs/Module/Wiki.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 20a5eb35f..746ad9b4f 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -4,6 +4,11 @@ namespace Zotlabs\Module; use \Zotlabs\Lib as Zlib; +require_once('include/acl_selectors.php'); +require_once('include/conversation.php'); +require_once('include/bbcode.php'); + + class Wiki extends \Zotlabs\Web\Controller { private $wiki = null; @@ -39,9 +44,6 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - require_once('include/acl_selectors.php'); - require_once('include/conversation.php'); - require_once('include/bbcode.php'); // TODO: Combine the interface configuration into a unified object // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) -- cgit v1.2.3 From 17f1d39fcf973ac35f14a36faa2b92867fbb11e9 Mon Sep 17 00:00:00 2001 From: Hubzilla Date: Sun, 22 Jan 2017 18:48:45 -0800 Subject: basic support for clone syncing of wikis and wiki pages --- Zotlabs/Module/Wiki.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 746ad9b4f..2ab7379c4 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -104,7 +104,7 @@ class Wiki extends \Zotlabs\Web\Controller { $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); // Download a wiki - +/* if((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) { $resource_id = argv(4); @@ -144,7 +144,7 @@ class Wiki extends \Zotlabs\Web\Controller { killme(); } - +*/ switch(argc()) { case 2: $wikis = Zlib\NativeWiki::listwikis($owner, get_observer_hash()); @@ -361,6 +361,7 @@ class Wiki extends \Zotlabs\Web\Controller { $acl->set_from_array($_POST); $r = Zlib\NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl); if($r['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$r['item_id']); $homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id']); if(! $homePage['success']) { notice( t('Wiki created, but error creating Home page.')); @@ -386,6 +387,7 @@ class Wiki extends \Zotlabs\Web\Controller { $resource_id = $_POST['resource_id']; $deleted = Zlib\NativeWiki::delete_wiki($owner['channel_id'],$observer_hash,$resource_id); if ($deleted['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$deleted['item_id']); json_return_and_die(array('message' => '', 'success' => true)); } else { @@ -425,11 +427,14 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($commit['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . $page['page']['urlName'], 'success' => true)); } else { json_return_and_die(array('message' => 'Error making git commit','url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . urlencode($page['page']['urlName']),'success' => false)); } + + } else { logger('Error creating page'); @@ -487,6 +492,7 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($commit['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); } else { @@ -549,6 +555,7 @@ class Wiki extends \Zotlabs\Web\Controller { 'files' => null )); if($commit['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); } else { @@ -563,7 +570,6 @@ class Wiki extends \Zotlabs\Web\Controller { // Revert a page if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) { -logger('revert was called: ' . print_r($_POST,true)); $resource_id = $_POST['resource_id']; $pageUrlName = $_POST['name']; $commitHash = $_POST['commitHash']; @@ -637,6 +643,7 @@ logger('revert was called: ' . print_r($_POST,true)); )); if($commit['success']) { + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true)); } else { -- cgit v1.2.3 From 9e70d54300e93353cfa3660a0a562a7a4dc66b8e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 24 Jan 2017 20:14:58 -0800 Subject: always sync parent wiki when syncing pages, just in case the original wiki creation wasn't synced. --- Zotlabs/Module/Wiki.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 2ab7379c4..222c10155 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -361,7 +361,7 @@ class Wiki extends \Zotlabs\Web\Controller { $acl->set_from_array($_POST); $r = Zlib\NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl); if($r['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$r['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$r['item_id'],$r['item']['resource_id']); $homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id']); if(! $homePage['success']) { notice( t('Wiki created, but error creating Home page.')); @@ -387,7 +387,7 @@ class Wiki extends \Zotlabs\Web\Controller { $resource_id = $_POST['resource_id']; $deleted = Zlib\NativeWiki::delete_wiki($owner['channel_id'],$observer_hash,$resource_id); if ($deleted['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$deleted['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$deleted['item_id'],$resource_id); json_return_and_die(array('message' => '', 'success' => true)); } else { @@ -427,7 +427,7 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($commit['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . $page['page']['urlName'], 'success' => true)); } else { @@ -492,7 +492,7 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($commit['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); } else { @@ -555,7 +555,7 @@ class Wiki extends \Zotlabs\Web\Controller { 'files' => null )); if($commit['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); } else { @@ -643,7 +643,7 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($commit['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id']); + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true)); } else { -- cgit v1.2.3 From 1db57c498d0edceac705ba027790cfa9d4e04c6d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 25 Jan 2017 19:41:47 +0100 Subject: fixes for wiki create/delete page --- Zotlabs/Module/Wiki.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 222c10155..d694a28ae 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -416,7 +416,7 @@ class Wiki extends \Zotlabs\Web\Controller { } $page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id); - if($page['success']) { + if($page['item_id']) { $ob = \App::get_observer(); $commit = Zlib\NativeWikiPage::commit(array( 'commit_msg' => t('New page created'), @@ -547,20 +547,8 @@ class Wiki extends \Zotlabs\Web\Controller { $deleted = Zlib\NativeWikiPage::delete_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); if($deleted['success']) { - $ob = \App::get_observer(); - $commit = Zlib\NativeWikiPage::git_commit(array( - 'commit_msg' => 'Deleted ' . $pageUrlName, - 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => null - )); - if($commit['success']) { - Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); - json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); - } - else { - json_return_and_die(array('message' => 'Error making git commit','success' => false)); - } + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); + json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); } else { json_return_and_die(array('message' => 'Error deleting page', 'success' => false)); -- cgit v1.2.3 From 45dbd31d286838254cd1ae60e4ebb39c112526be Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 25 Jan 2017 12:21:52 -0800 Subject: only allow wiki owner to delete pages --- Zotlabs/Module/Wiki.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d694a28ae..75a620c37 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -538,6 +538,12 @@ class Wiki extends \Zotlabs\Web\Controller { json_return_and_die(array('message' => t('Cannot delete Home'),'success' => false)); } // Determine if observer has permission to delete pages + // currently just allow page owner + + if((! local_channel()) || (local_channel() != $owner['channel_id'])) { + logger('Wiki write permission denied. ' . EOL); + json_return_and_die(array('success' => false)); + } $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); if(! $perms['write']) { -- cgit v1.2.3 From 02e8058c5069506952e4c9979b7dfe02b5dc5480 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Jan 2017 10:46:44 +0100 Subject: fix renaming of wiki pages --- Zotlabs/Module/Wiki.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 75a620c37..d075c02aa 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -619,23 +619,23 @@ class Wiki extends \Zotlabs\Web\Controller { } // Determine if observer has permission to rename pages - $perms = Zlib\NativeWikiPage::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); + $perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); if(! $perms['write']) { logger('Wiki write permission denied. ' . EOL); json_return_and_die(array('success' => false)); } $renamed = Zlib\NativeWikiPage::rename_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'pageNewName' => $pageNewName)); + if($renamed['success']) { $ob = \App::get_observer(); - $commit = wiki_git_commit(array( + $commit = Zlib\NativeWikiPage::commit(array( + 'channel_id' => $owner['channel_id'], 'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], 'resource_id' => $resource_id, - 'observer' => $ob, - 'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']), - 'all' => true + 'observer_hash' => $ob['xchan_hash'], + 'pageUrlName' => $pageNewName )); - if($commit['success']) { Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true)); -- cgit v1.2.3 From 54826808cf8d2ee7fdf80d6be1283fca47ec1c35 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 26 Jan 2017 12:23:59 +0100 Subject: minor cleanup --- Zotlabs/Module/Wiki.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d075c02aa..2ba4df209 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -417,7 +417,6 @@ class Wiki extends \Zotlabs\Web\Controller { $page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id); if($page['item_id']) { - $ob = \App::get_observer(); $commit = Zlib\NativeWikiPage::commit(array( 'commit_msg' => t('New page created'), 'resource_id' => $resource_id, @@ -481,7 +480,6 @@ class Wiki extends \Zotlabs\Web\Controller { $saved = Zlib\NativeWikiPage::save_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'content' => $content)); if($saved['success']) { - $ob = \App::get_observer(); $commit = Zlib\NativeWikiPage::commit(array( 'commit_msg' => $commitMsg, 'pageUrlName' => $pageUrlName, @@ -628,12 +626,11 @@ class Wiki extends \Zotlabs\Web\Controller { $renamed = Zlib\NativeWikiPage::rename_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'pageNewName' => $pageNewName)); if($renamed['success']) { - $ob = \App::get_observer(); $commit = Zlib\NativeWikiPage::commit(array( 'channel_id' => $owner['channel_id'], 'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], 'resource_id' => $resource_id, - 'observer_hash' => $ob['xchan_hash'], + 'observer_hash' => $observer_hash, 'pageUrlName' => $pageNewName )); if($commit['success']) { -- cgit v1.2.3 From 22839e48d013abdc46b609cd50b45b3bce6626f9 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 26 Jan 2017 15:16:41 -0800 Subject: better handling of html special chars in wiki and wikipage names --- Zotlabs/Module/Wiki.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 2ba4df209..5397deebe 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -189,8 +189,8 @@ class Wiki extends \Zotlabs\Web\Controller { // GET /wiki/channel/wiki/page // Fetch the wiki info and determine observer permissions - $wikiUrlName = urlencode(argv(2)); - $pageUrlName = urlencode(argv(3)); + $wikiUrlName = urldecode(argv(2)); + $pageUrlName = urldecode(argv(3)); $w = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $wikiUrlName); @@ -345,11 +345,11 @@ class Wiki extends \Zotlabs\Web\Controller { } $wiki = array(); // Generate new wiki info from input name - $wiki['postVisible'] = ((intval($_POST['postVisible']) === 0) ? 0 : 1); - $wiki['rawName'] = $_POST['wikiName']; - $wiki['htmlName'] = escape_tags($_POST['wikiName']); - $wiki['urlName'] = urlencode($_POST['wikiName']); - $wiki['mimeType'] = $_POST['mimeType']; + $wiki['postVisible'] = ((intval($_POST['postVisible'])) ? 1 : 0); + $wiki['rawName'] = $_POST['wikiName']; + $wiki['htmlName'] = escape_tags($_POST['wikiName']); + $wiki['urlName'] = urlencode(urlencode($_POST['wikiName'])); + $wiki['mimeType'] = $_POST['mimeType']; if($wiki['urlName'] === '') { notice( t('Error creating wiki. Invalid name.') . EOL); @@ -367,6 +367,7 @@ class Wiki extends \Zotlabs\Web\Controller { notice( t('Wiki created, but error creating Home page.')); goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName']); } + Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$homePage['item_id'],$r['item']['resource_id']); goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName'] . '/' . $homePage['page']['urlName']); } else { @@ -427,10 +428,10 @@ class Wiki extends \Zotlabs\Web\Controller { if($commit['success']) { Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$commit['item_id'],$resource_id); - json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . $page['page']['urlName'], 'success' => true)); + json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . urlencode($page['wiki']['urlName']) . '/' . urlencode($page['page']['urlName']), 'success' => true)); } else { - json_return_and_die(array('message' => 'Error making git commit','url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . urlencode($page['page']['urlName']),'success' => false)); + json_return_and_die(array('message' => 'Error making git commit','url' => '/' . argv(0) . '/' . argv(1) . '/' . urlencode($page['wiki']['urlName']) . '/' . urlencode($page['page']['urlName']),'success' => false)); } -- cgit v1.2.3 From 94290102b6e1b29b29c58318670da797394550c1 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 1 Feb 2017 18:05:02 -0800 Subject: tested extensible permissions by adding wiki permissions. Discovered a couple of issues that needed attention in the process. --- Zotlabs/Module/Wiki.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 5397deebe..d42c26681 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -45,6 +45,11 @@ class Wiki extends \Zotlabs\Web\Controller { } + if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'view_wiki')) { + notice( t('Permission denied.') . EOL); + return; + } + // TODO: Combine the interface configuration into a unified object // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) @@ -309,7 +314,11 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - + if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'write_wiki')) { + notice( t('Permission denied.') . EOL); + return; + } + // /wiki/channel/preview // Render mardown-formatted text in HTML for preview if((argc() > 2) && (argv(2) === 'preview')) { -- cgit v1.2.3 From 573846707ceade4d00a4dfe3184d9f8004a3112b Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 19 Feb 2017 16:50:41 -0800 Subject: fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work: - if there is no preceding / character, we look for the file within all the appropriate theme directories. - otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir - files beginning with // are considered to be schemeless URLs. Therefore 'foo.css' means find the best theme-able representation of foo.css. '/library/foo.css' means only use the version of foo.css that is in /library. --- Zotlabs/Module/Wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d42c26681..d0856f4d6 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -296,7 +296,7 @@ class Wiki extends \Zotlabs\Web\Controller { )); if($p['mimeType'] != 'text/bbcode') - head_add_js('library/ace/ace.js'); // Ace Code Editor + head_add_js('/library/ace/ace.js'); // Ace Code Editor return $o; } -- cgit v1.2.3 From cbc0e5b93427104a8cdc848f53da970114c8042e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 21 Feb 2017 14:52:42 +0100 Subject: do not lock out channels with only read perms from all post actions. we check read/write permissions for each command later in the process --- Zotlabs/Module/Wiki.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index d0856f4d6..32b484eea 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -314,11 +314,6 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'write_wiki')) { - notice( t('Permission denied.') . EOL); - return; - } - // /wiki/channel/preview // Render mardown-formatted text in HTML for preview if((argc() > 2) && (argv(2) === 'preview')) { -- cgit v1.2.3 From 69e145a630cdb5a11252b9043b8c8486fae7e54d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 27 Feb 2017 13:52:08 +0100 Subject: fix js issue in markdown mimetype wikis if content contains quotes --- Zotlabs/Module/Wiki.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Zotlabs/Module/Wiki.php') diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 32b484eea..15806ffc3 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -234,10 +234,8 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $p['mimeType']; - $rawContent = (($p['mimeType'] == 'text/bbcode') - ? htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT) - : htmlspecialchars_decode($p['content'],ENT_COMPAT) - ); + $rawContent = htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT); + $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { @@ -245,7 +243,7 @@ class Wiki extends \Zotlabs\Web\Controller { } else { require_once('library/markdown.php'); - $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown(Zlib\NativeWikiPage::bbcode(json_decode($content)))))); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown(Zlib\NativeWikiPage::bbcode($content))))); $renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; -- cgit v1.2.3