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

nwiki updates

Browse Source
This commit is contained in:
Hubzilla 2017-01-18 17:45:27 -08:00
parent 7f944515de
commit 6e504b7bc9
3 changed files with 267 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
Zotlabs/Lib/NativeWikiPage.php
View File

@ -20,7 +20,8 @@ class NativeWikiPage {
$sql_extra = item_permissions_sql($channel_id,$observer_hash); $sql_extra = item_permissions_sql($channel_id,$observer_hash);
$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d $sql_extra group by mid", $r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d
$sql_extra group by mid",
dbesc($resource_id), dbesc($resource_id),
intval($channel_id) intval($channel_id)
); );
@ -55,6 +56,9 @@ class NativeWikiPage {
$arr['resource_type'] = 'nwikipage'; $arr['resource_type'] = 'nwikipage';
$arr['resource_id'] = $resource_id; $arr['resource_id'] = $resource_id;
// We may wish to change this some day.
$arr['item_unpublished'] = 1;
set_iconfig($arr,'nwikipage','pagetitle',urlencode(($name) ? $name : t('(No Title)')),true); set_iconfig($arr,'nwikipage','pagetitle',urlencode(($name) ? $name : t('(No Title)')),true);
post_activity_item($arr, false, false); post_activity_item($arr, false, false);
@ -77,36 +81,45 @@ class NativeWikiPage {
$channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0); $channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0);
$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); $w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
if(! $w['path']) { if(! $w['wiki']) {
return array('message' => t('Wiki not found.'), 'success' => false); return array('message' => t('Wiki not found.'), 'success' => false);
} }
$page_path_old = $w['path'] . '/' . $pageUrlName . \Zlib\NativeWikiPage::get_file_ext($w);
if(! is_readable($page_path_old) === true) { $ic = q("select * from iconfig left join item on iconfig.iid = item.id
return array('message' => 'Cannot read wiki page: ' . $page_path_old, 'success' => false); where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
intval($channel_id),
dbesc($pageNewName)
);
if($ic) {
return [ 'success' => false, 'message' => t('Destination name already exists') ];
}
$ids = [];
$ic = q("select *, item.id as item_id from iconfig left join item on iconfig.iid = item.id
where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
intval($channel_id),
dbesc($pageUrlName)
);
if($ic) {
foreach($ic as $c) {
set_iconfig($c['item_id'],'nwikipage','pagetitle',$pageNewName);
} }
$page = [ $page = [
'rawName' => $pageNewName, 'rawName' => $pageNewName,
'htmlName' => escape_tags($pageNewName), 'htmlName' => escape_tags($pageNewName),
'urlName' => urlencode(escape_tags($pageNewName)), 'urlName' => urlencode(escape_tags($pageNewName))
'fileName' => urlencode(escape_tags($pageNewName)) . \Zlib\NativeWikiPage::get_file_ext($w)
]; ];
$page_path_new = $w['path'] . '/' . $page['fileName'] ; return [ 'success' => true, 'page' => $page ];
if(is_file($page_path_new)) {
return array('message' => 'Page already exists.', 'success' => false);
} }
// Rename the page file in the wiki repo return [ 'success' => false, 'message' => t('Page not found') ];
if(! rename($page_path_old, $page_path_new)) {
return array('message' => 'Error renaming page file.', 'success' => false);
}
else {
return array('page' => $page, 'message' => '', 'success' => true);
}
} }
@ -178,7 +191,7 @@ class NativeWikiPage {
static public function load_page($arr) { static public function load_page($arr) {
logger('arr: ' . print_r($arr,true));
$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : ''); $pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : ''); $resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : ''); $observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
@ -191,7 +204,7 @@ logger('arr: ' . print_r($arr,true));
} }
$ids = ''; $ids = '';
dbg(0);
$ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'", $ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
intval($channel_id), intval($channel_id),
dbesc($pageUrlName) dbesc($pageUrlName)
@ -217,13 +230,13 @@ dbg(0);
dbesc($resource_id), dbesc($resource_id),
intval($channel_id) intval($channel_id)
); );
dbg(0);
if($r) { if($r) {
$items = fetch_post_tags($r,true); $items = fetch_post_tags($r,true);
return $items[0]; return $items[0];
} }
} }
dbg(0);
return null; return null;
} }
@ -317,10 +330,15 @@ dbg(0);
return array('message' => t('Error reading wiki'), 'success' => false); return array('message' => t('Error reading wiki'), 'success' => false);
} }
// fetch the most recently saved revision.
$item = self::load_page($arr); $item = self::load_page($arr);
if(! $item) { if(! $item) {
return array('message' => t('Page not found'), 'success' => false); return array('message' => t('Page not found'), 'success' => false);
} }
// change just the fields we need to change to create a revision;
unset($item['id']); unset($item['id']);
unset($item['author']); unset($item['author']);
@ -328,6 +346,7 @@ dbg(0);
$item['body'] = $content; $item['body'] = $content;
$item['author_xchan'] = $observer_hash; $item['author_xchan'] = $observer_hash;
$item['revision'] = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1); $item['revision'] = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1);
$item['edited'] = datetime_convert();
if($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) { if($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) {
for($x = 0; $x < count($item['iconfig']); $x ++) { for($x = 0; $x < count($item['iconfig']); $x ++) {
@ -352,19 +371,32 @@ dbg(0);
$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); $w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
if (!$w['path']) { if(! $w['wiki']) {
return array('message' => t('Error reading wiki'), 'success' => false); return [ 'success' => false, 'message' => t('Error reading wiki') ];
} }
$page_path = $w['path'] . '/' . $pageUrlName . wiki_get_file_ext($w);
if (is_writable($page_path) === true) { $ids = [];
if(!unlink($page_path)) {
return array('message' => t('Error deleting page file'), 'success' => false); $ic = q("select * from iconfig left join item on iconfig.iid = item.id
where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
intval($channel_id),
dbesc($pageUrlName)
);
if($ic) {
foreach($ic as $c) {
$ids[] = intval($c['iid']);
} }
return array('message' => '', 'success' => true);
} }
else {
return array('message' => t('Page file not writable'), 'success' => false); if($ids) {
foreach($ids as $id) {
drop_item($id,false);
} }
return [ 'success' => true ];
}
return [ 'success' => false, 'message' => t('Nothing deleted') ];
} }
static public function revert_page($arr) { static public function revert_page($arr) {
@ -401,54 +433,41 @@ dbg(0);
static public function compare_page($arr) { static public function compare_page($arr) {
$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : ''); $pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : ''); $resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
$currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : 'HEAD'); $currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : (-1));
$compareCommit = ((array_key_exists('compareCommit',$arr)) ? $arr['compareCommit'] : null); $compareCommit = ((array_key_exists('compareCommit',$arr)) ? $arr['compareCommit'] : 0);
$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : ''); $observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
$channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0); $channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0);
if (! $compareCommit) {
return array('message' => t('No compare commit was provided'), 'success' => false);
}
$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id); $w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
if (!$w['path']) { if (!$w['wiki']) {
return array('message' => t('Error reading wiki'), 'success' => false); return array('message' => t('Error reading wiki'), 'success' => false);
} }
$page_path = $w['path'] . '/' . $pageUrlName . \Zlib\NativeWikiPage::get_file_ext($w);
if (is_readable($page_path) === true) { $x = $arr;
$reponame = ((array_key_exists('title', $w['wiki'])) ? urlencode($w['wiki']['title']) : 'repo'); $x['revision'] = (-1);
if($reponame === '') {
$reponame = 'repo'; $currpage = self::load_page($x);
} if($currpage)
$git = new GitRepo('', null, false, $w['wiki']['title'], $w['path']); $currentContent = $currpage['body'];
$compareContent = $currentContent = '';
try { $x['revision'] = $compareCommit;
foreach ($git->git->tree($currentCommit) as $object) { $comppage = self::load_page($x);
if ($object['type'] == 'blob' && $object['file'] === $pageUrlName . wiki_get_file_ext($w)) { if($comppage)
$currentContent = $git->git->cat->blob($object['hash']); $compareContent = $comppage['body'];
}
} if($currpage && $comppage) {
foreach ($git->git->tree($compareCommit) as $object) {
if ($object['type'] == 'blob' && $object['file'] === $pageUrlName . wiki_get_file_ext($w)) {
$compareContent = $git->git->cat->blob($object['hash']);
}
}
require_once('library/class.Diff.php'); require_once('library/class.Diff.php');
$diff = Diff::toTable(Diff::compare($currentContent, $compareContent)); $diff = \Diff::toTable(\Diff::compare($currentContent, $compareContent));
}
catch (\PHPGit\Exception\GitException $e) { return [ 'success' => true, 'diff' => $diff ];
return array('message' => t('GitRepo error thrown'), 'success' => false);
}
return array('diff' => $diff, 'message' => '', 'success' => true);
}
else {
return array('message' => t('Page file not writable'), 'success' => false);
} }
return [ 'success' => false, 'message' => t('Compare: object not found.') ];
} }
static public function commit($arr) { static public function commit($arr) {
logger('committing');
$commit_msg = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : t('Page updated')); $commit_msg = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : t('Page updated'));
$observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : ''); $observer_hash = ((array_key_exists('observer_hash',$arr)) ? $arr['observer_hash'] : '');
$channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0); $channel_id = ((array_key_exists('channel_id',$arr)) ? $arr['channel_id'] : 0);
@ -468,7 +487,7 @@ logger('committing');
} }
$page = self::load_page($arr); $page = self::load_page($arr);
logger('commit: page: ' . print_r($page,true));
if($page) { if($page) {
set_iconfig($page['id'],'nwikipage','commit_msg',escape_tags($commit_msg),true); set_iconfig($page['id'],'nwikipage','commit_msg',escape_tags($commit_msg),true);
return [ 'success' => true, 'page' => $page ]; return [ 'success' => true, 'page' => $page ];

246
Zotlabs/Module/Wiki.php
View File

@ -2,26 +2,30 @@
namespace Zotlabs\Module; namespace Zotlabs\Module;
use \Zotlabs\Lib as Zlib;
class Wiki extends \Zotlabs\Web\Controller { class Wiki extends \Zotlabs\Web\Controller {
private $wiki = null;
function init() { function init() {
// Determine which channel's wikis to display to the observer // Determine which channel's wikis to display to the observer
$nick = null; $nick = null;
if (argc() > 1) if (argc() > 1)
$nick = argv(1); // if the channel name is in the URL, use that $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(); $channel = \App::get_channel();
if ($channel && $channel['channel_address']) { if ($channel && $channel['channel_address']) {
$nick = $channel['channel_address']; $nick = $channel['channel_address'];
goaway(z_root() . '/wiki/' . $nick); goaway(z_root() . '/wiki/' . $nick);
} }
} }
if (!$nick) { if (! $nick) {
notice(t('You must be logged in to see this page.') . EOL); notice( t('Profile Unavailable.') . EOL);
goaway('/login'); goaway(z_root());
} }
profile_load($nick);
profile_load($nick);
} }
function get() { function get() {
@ -42,6 +46,7 @@ class Wiki extends \Zotlabs\Web\Controller {
// TODO: Combine the interface configuration into a unified object // TODO: Combine the interface configuration into a unified object
// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)
$wiki_owner = false; $wiki_owner = false;
$showNewWikiButton = false; $showNewWikiButton = false;
$pageHistory = array(); $pageHistory = array();
@ -49,12 +54,16 @@ class Wiki extends \Zotlabs\Web\Controller {
$resource_id = ''; $resource_id = '';
// init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1 // init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1
$nick = argv(1); $nick = argv(1);
$owner = channelx_by_nick($nick); // The channel who owns the wikis being viewed $owner = channelx_by_nick($nick); // The channel who owns the wikis being viewed
if(! $owner) { if(! $owner) {
notice( t('Invalid channel') . EOL); notice( t('Invalid channel') . EOL);
goaway('/' . argv(0)); goaway('/' . argv(0));
} }
$observer_hash = get_observer_hash();
// Determine if the observer is the channel owner so the ACL dialog can be populated // Determine if the observer is the channel owner so the ACL dialog can be populated
if (local_channel() === intval($owner['channel_id'])) { if (local_channel() === intval($owner['channel_id'])) {
@ -67,7 +76,9 @@ class Wiki extends \Zotlabs\Web\Controller {
'deny_cid' => $owner['channel_deny_cid'], 'deny_cid' => $owner['channel_deny_cid'],
'deny_gid' => $owner['channel_deny_gid'] 'deny_gid' => $owner['channel_deny_gid']
); );
// Initialize the ACL to the channel default permissions // Initialize the ACL to the channel default permissions
$x = array( $x = array(
'lockstate' => (( $owner['channel_allow_cid'] || 'lockstate' => (( $owner['channel_allow_cid'] ||
$owner['channel_allow_gid'] || $owner['channel_allow_gid'] ||
@ -82,7 +93,8 @@ class Wiki extends \Zotlabs\Web\Controller {
'deny_gid' => acl2json($owner_acl['deny_gid']), 'deny_gid' => acl2json($owner_acl['deny_gid']),
'bang' => '' 'bang' => ''
); );
} else { }
else {
// Not the channel owner // Not the channel owner
$owner_acl = $x = array(); $owner_acl = $x = array();
} }
@ -91,12 +103,13 @@ class Wiki extends \Zotlabs\Web\Controller {
$o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
// Download a wiki // Download a wiki
if((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) { if((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) {
$resource_id = argv(4); $resource_id = argv(4);
$w = wiki_get_wiki($resource_id); $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id);
if(!$w['path']) { if(! $w['htmlName']) {
notice(t('Error retrieving wiki') . EOL); notice(t('Error retrieving wiki') . EOL);
} }
@ -111,7 +124,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename; $zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
// Generate the zip file // 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 // Output the file for download
@ -131,10 +144,10 @@ class Wiki extends \Zotlabs\Web\Controller {
} }
switch (argc()) { switch(argc()) {
case 2: case 2:
$wikis = wiki_list($owner, get_observer_hash()); $wikis = Zlib\NativeWiki::listwikis($owner, get_observer_hash());
if ($wikis) { if($wikis) {
$o .= replace_macros(get_markup_template('wikilist.tpl'), array( $o .= replace_macros(get_markup_template('wikilist.tpl'), array(
'$header' => t('Wikis'), '$header' => t('Wikis'),
'$channel' => $owner['channel_address'], '$channel' => $owner['channel_address'],
@ -161,72 +174,78 @@ class Wiki extends \Zotlabs\Web\Controller {
return $o; return $o;
} }
break; break;
case 3: case 3:
// /wiki/channel/wiki -> No page was specified, so redirect to Home.md // /wiki/channel/wiki -> No page was specified, so redirect to Home.md
$wikiUrlName = urlencode(argv(2)); $wikiUrlName = urlencode(argv(2));
goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName.'/Home'); goaway(z_root() . '/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/Home');
case 4: case 4:
// GET /wiki/channel/wiki/page // GET /wiki/channel/wiki/page
// Fetch the wiki info and determine observer permissions // Fetch the wiki info and determine observer permissions
$wikiUrlName = urlencode(argv(2)); $wikiUrlName = urlencode(argv(2));
$pageUrlName = urlencode(argv(3)); $pageUrlName = urlencode(argv(3));
$w = wiki_exists_by_name($owner['channel_id'], $wikiUrlName); $w = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $wikiUrlName);
if(!$w['resource_id']) {
if(! $w['resource_id']) {
notice(t('Wiki not found') . EOL); notice(t('Wiki not found') . EOL);
goaway('/'.argv(0).'/'.argv(1)); goaway(z_root() . '/' . argv(0) . '/' . argv(1));
return; //not reached
} }
$resource_id = $w['resource_id']; $resource_id = $w['resource_id'];
if (!$wiki_owner) { if(! $wiki_owner) {
// Check for observer permissions // Check for observer permissions
$observer_hash = get_observer_hash(); $observer_hash = get_observer_hash();
$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']) { if(! $perms['read']) {
notice(t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
goaway('/'.argv(0).'/'.argv(1)); goaway(z_root() . '/' . argv(0) . '/' . argv(1));
return; //not reached return; //not reached
} }
if($perms['write']) { $wiki_editor = (($perms['write']) ? true : false);
$wiki_editor = true;
} else {
$wiki_editor = false;
} }
} else { else {
$wiki_editor = true; $wiki_editor = true;
} }
$wikiheaderName = urldecode($wikiUrlName); $wikiheaderName = urldecode($wikiUrlName);
$wikiheaderPage = urldecode($pageUrlName); $wikiheaderPage = urldecode($pageUrlName);
$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page')); $renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
$p = wiki_get_page_content(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); $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']) { if(! $p['success']) {
notice(t('Error retrieving page content') . EOL); notice( t('Error retrieving page content') . EOL);
goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName); goaway(z_root() . '/' . argv(0) . '/' . argv(1) );
return; //not reached
} }
$mimeType = $p['mimeType']; $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"'); $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"');
// Render the Markdown-formatted page content in HTML // Render the Markdown-formatted page content in HTML
if($mimeType == 'text/bbcode') { 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 { else {
require_once('library/markdown.php'); require_once('library/markdown.php');
$html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); $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; $showPageControls = $wiki_editor;
break; break;
default: // Strip the extraneous URL components default: // Strip the extraneous URL components
goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName); goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName);
return; //not reached
} }
$wikiModalID = random_string(3); $wikiModalID = random_string(3);
@ -238,6 +257,8 @@ class Wiki extends \Zotlabs\Web\Controller {
'$cancel' => t('Cancel') '$cancel' => t('Cancel')
)); ));
$placeholder = t('Short description of your changes (optional)');
$o .= replace_macros(get_markup_template('wiki.tpl'),array( $o .= replace_macros(get_markup_template('wiki.tpl'),array(
'$wikiheaderName' => $wikiheaderName, '$wikiheaderName' => $wikiheaderName,
'$wikiheaderPage' => $wikiheaderPage, '$wikiheaderPage' => $wikiheaderPage,
@ -252,7 +273,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'$content' => $content, '$content' => $content,
'$renderedContent' => $renderedContent, '$renderedContent' => $renderedContent,
'$pageRename' => array('pageRename', t('New page name'), '', ''), '$pageRename' => array('pageRename', t('New page name'), '', ''),
'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'), '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="' . $placeholder . '"'),
'$wikiModal' => $wikiModal, '$wikiModal' => $wikiModal,
'$wikiModalID' => $wikiModalID, '$wikiModalID' => $wikiModalID,
'$commit' => 'HEAD', '$commit' => 'HEAD',
@ -293,19 +314,20 @@ class Wiki extends \Zotlabs\Web\Controller {
if((argc() > 2) && (argv(2) === 'preview')) { if((argc() > 2) && (argv(2) === 'preview')) {
$content = $_POST['content']; $content = $_POST['content'];
$resource_id = $_POST['resource_id']; $resource_id = $_POST['resource_id'];
$w = wiki_get_wiki($resource_id); $w = Zlib\NativeWiki::get_wiki($owner,$observer_hash,$resource_id);
$wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName'];
$wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName'];
$mimeType = $w['mimeType']; $mimeType = $w['mimeType'];
if($mimeType == 'text/bbcode') { 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 { else {
require_once('library/markdown.php'); require_once('library/markdown.php');
$content = wiki_bbcode($content); $content = Zlib\NativeWikiPage::bbcode($content);
$html = wiki_generate_toc(zidify_text(purify_html(Markdown($content)))); $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown($content))));
$html = wiki_convert_links($html,$wikiURL); $html = Zlib\NativeWikiPage::convert_links($html,$wikiURL);
} }
json_return_and_die(array('html' => $html, 'success' => true)); json_return_and_die(array('html' => $html, 'success' => true));
} }
@ -336,17 +358,18 @@ class Wiki extends \Zotlabs\Web\Controller {
// Get ACL for permissions // Get ACL for permissions
$acl = new \Zotlabs\Access\AccessList($owner); $acl = new \Zotlabs\Access\AccessList($owner);
$acl->set_from_array($_POST); $acl->set_from_array($_POST);
$r = wiki_create_wiki($owner, $observer_hash, $wiki, $acl); $r = Zlib\NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl);
if ($r['success']) { if($r['success']) {
$homePage = wiki_create_page('Home', $r['item']['resource_id']); $homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id']);
if(!$homePage['success']) { if(! $homePage['success']) {
notice( t('Wiki created, but error creating Home page.')); 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']); goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName'] . '/' . $homePage['page']['urlName']);
} else { }
notice(t('Error creating wiki')); else {
goaway('/wiki'); notice( t('Error creating wiki'));
goaway(z_root() . '/wiki');
} }
} }
@ -357,15 +380,16 @@ class Wiki extends \Zotlabs\Web\Controller {
// more detail permissions framework // more detail permissions framework
if (local_channel() !== intval($owner['channel_id'])) { if (local_channel() !== intval($owner['channel_id'])) {
logger('Wiki delete permission denied.'); 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']; $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']) { if ($deleted['success']) {
json_return_and_die(array('message' => '', 'success' => true)); json_return_and_die(array('message' => '', 'success' => true));
} else { }
logger('Error deleting wiki: ' . $resource_id); else {
json_return_and_die(array('message' => 'Error deleting wiki', 'success' => false)); 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 // Determine if observer has permission to create a page
$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['write']) { if(! $perms['write']) {
logger('Wiki write permission denied. ' . EOL); logger('Wiki write permission denied. ' . EOL);
json_return_and_die(array('success' => false)); json_return_and_die(array('success' => false));
} }
$name = $_POST['name']; //Get new page name $name = $_POST['pageName']; //Get new page name
if(urlencode(escape_tags($_POST['name'])) === '') { if(urlencode(escape_tags($_POST['pageName'])) === '') {
json_return_and_die(array('message' => 'Error creating page. Invalid name.', 'success' => false)); json_return_and_die(array('message' => 'Error creating page. Invalid name.', 'success' => false));
} }
$page = wiki_create_page($name, $resource_id); $page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id);
if ($page['success']) {
if($page['success']) {
$ob = \App::get_observer(); $ob = \App::get_observer();
$commit = wiki_git_commit(array( $commit = Zlib\NativeWikiPage::commit(array(
'commit_msg' => t('New page created'), 'commit_msg' => t('New page created'),
'resource_id' => $resource_id, 'resource_id' => $resource_id,
'observer' => $ob, 'channel_id' => $owner['channel_id'],
'files' => array($page['page']['fileName']) 'observer_hash' => $observer_hash,
'pageUrlName' => $name
)); ));
if($commit['success']) { if($commit['success']) {
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) . '/' . $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 {
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'); logger('Error creating page');
json_return_and_die(array('message' => 'Error creating page.', 'success' => false)); json_return_and_die(array('message' => 'Error creating page.', 'success' => false));
} }
} }
// Fetch page list for a wiki // 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 $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']) { if(!$perms['read']) {
logger('Wiki read permission denied.' . EOL); logger('Wiki read permission denied.' . EOL);
json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false)); 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 // Determine if observer has permission to save content
$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['write']) { if(! $perms['write']) {
logger('Wiki write permission denied. ' . EOL); logger('Wiki write permission denied. ' . EOL);
json_return_and_die(array('success' => false)); 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']) { if($saved['success']) {
$ob = \App::get_observer(); $ob = \App::get_observer();
$commit = wiki_git_commit(array( $commit = Zlib\NativeWikiPage::commit(array(
'commit_msg' => $commitMsg, 'commit_msg' => $commitMsg,
'pageUrlName' => $pageUrlName,
'resource_id' => $resource_id, 'resource_id' => $resource_id,
'observer' => $ob, 'channel_id' => $owner['channel_id'],
'files' => array($saved['fileName']) 'observer_hash' => $observer_hash,
'revision' => (-1)
)); ));
if($commit['success']) { if($commit['success']) {
json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); 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)); 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)); 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 // Determine if observer has permission to read content
$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']) { if(! $perms['read']) {
logger('Wiki read permission denied.' . EOL); logger('Wiki read permission denied.' . EOL);
json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false)); json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false));
} }
@ -488,23 +523,25 @@ class Wiki extends \Zotlabs\Web\Controller {
// Delete a page // Delete a page
if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) { if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) {
$resource_id = $_POST['resource_id']; $resource_id = $_POST['resource_id'];
$pageUrlName = $_POST['name']; $pageUrlName = $_POST['name'];
if ($pageUrlName === 'Home') { 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 // Determine if observer has permission to delete 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['write']) { if(! $perms['write']) {
logger('Wiki write permission denied. ' . EOL); logger('Wiki write permission denied. ' . EOL);
json_return_and_die(array('success' => false)); 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']) { if($deleted['success']) {
$ob = \App::get_observer(); $ob = \App::get_observer();
$commit = wiki_git_commit(array( $commit = Zlib\NativeWikiPage::git_commit(array(
'commit_msg' => 'Deleted ' . $pageUrlName, 'commit_msg' => 'Deleted ' . $pageUrlName,
'resource_id' => $resource_id, 'resource_id' => $resource_id,
'observer' => $ob, 'observer' => $ob,
@ -512,28 +549,32 @@ class Wiki extends \Zotlabs\Web\Controller {
)); ));
if($commit['success']) { if($commit['success']) {
json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true)); 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)); 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)); json_return_and_die(array('message' => 'Error deleting page', 'success' => false));
} }
} }
// Revert a page // Revert a page
if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) { if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) {
logger('revert was called: ' . print_r($_POST,true));
$resource_id = $_POST['resource_id']; $resource_id = $_POST['resource_id'];
$pageUrlName = $_POST['name']; $pageUrlName = $_POST['name'];
$commitHash = $_POST['commitHash']; $commitHash = $_POST['commitHash'];
// Determine if observer has permission to revert pages // 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['write']) { if(! $perms['write']) {
logger('Wiki write permission denied.' . EOL); logger('Wiki write permission denied.' . EOL);
json_return_and_die(array('success' => false)); 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']) { if($reverted['success']) {
json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true)); json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));
} else { } else {
@ -549,15 +590,15 @@ class Wiki extends \Zotlabs\Web\Controller {
$currentCommit = $_POST['currentCommit']; $currentCommit = $_POST['currentCommit'];
// Determine if observer has permission to revert pages // 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']) { if(!$perms['read']) {
logger('Wiki read permission denied.' . EOL); logger('Wiki read permission denied.' . EOL);
json_return_and_die(array('success' => false)); 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']) { if($compare['success']) {
$diffHTML = '<table class="text-center" width="100%"><tr><td class="lead" width="50%">Current Revision</td><td class="lead" width="50%">Selected Revision</td></tr></table>' . $compare['diff']; $diffHTML = '<table class="text-center" width="100%"><tr><td class="lead" width="50%">' . t('Current Revision') . '</td><td class="lead" width="50%">' . t('Selected Revision') . '</td></tr></table>' . $compare['diff'];
json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true)); json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true));
} else { } else {
json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false)); json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false));
@ -577,13 +618,13 @@ class Wiki extends \Zotlabs\Web\Controller {
} }
// Determine if observer has permission to rename pages // Determine if observer has permission to rename pages
$perms = wiki_get_permissions($resource_id, intval($owner['channel_id']), $observer_hash); $perms = Zlib\NativeWikiPage::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
if(!$perms['write']) { if(! $perms['write']) {
logger('Wiki write permission denied. ' . EOL); logger('Wiki write permission denied. ' . EOL);
json_return_and_die(array('success' => false)); 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']) { if($renamed['success']) {
$ob = \App::get_observer(); $ob = \App::get_observer();
$commit = wiki_git_commit(array( $commit = wiki_git_commit(array(
@ -593,18 +634,21 @@ class Wiki extends \Zotlabs\Web\Controller {
'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']), 'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']),
'all' => true 'all' => true
)); ));
if($commit['success']) { if($commit['success']) {
json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true)); 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)); 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)); json_return_and_die(array('message' => 'Error renaming page', 'success' => false));
} }
} }
//notice( t('You must be authenticated.')); //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));
} }
} }

1
boot.php
View File

@ -53,6 +53,7 @@ define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1187 ); define ( 'DB_UPDATE_VERSION', 1187 );
define ( 'PROJECT_BASE', __DIR__ );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.