aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Wiki.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-08 18:15:57 -0800
committerzotlabs <mike@macgirvin.com>2016-11-08 18:15:57 -0800
commit74947d1c1cb7c669ef2a167990066b34d89b5b07 (patch)
treec0c22dd1d190c23e6a93043be07d0e2ff1381701 /Zotlabs/Module/Wiki.php
parentdb3d230ad9a63ac9363fc3f3a658f8b6c3c5eab4 (diff)
downloadvolse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.tar.gz
volse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.tar.bz2
volse-hubzilla-74947d1c1cb7c669ef2a167990066b34d89b5b07.zip
deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick()
Diffstat (limited to 'Zotlabs/Module/Wiki.php')
-rw-r--r--Zotlabs/Module/Wiki.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 8cf106b33..aaa1f1e3d 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -54,7 +54,7 @@ class Wiki extends \Zotlabs\Web\Controller {
// init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1
$nick = argv(1);
- $channel = get_channel_by_nick($nick); // The channel who owns the wikis being viewed
+ $channel = channelx_by_nick($nick); // The channel who owns the wikis being viewed
if(! $channel) {
notice('Invalid channel' . EOL);
goaway('/' . argv(0));
@@ -271,7 +271,7 @@ class Wiki extends \Zotlabs\Web\Controller {
// /wiki/channel/create/wiki
if ((argc() > 3) && (argv(2) === 'create') && (argv(3) === 'wiki')) {
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
// Determine if observer has permission to create wiki
$observer_hash = get_observer_hash();
// Only the channel owner can create a wiki, at least until we create a
@@ -309,7 +309,7 @@ class Wiki extends \Zotlabs\Web\Controller {
// Delete a wiki
if ((argc() > 3) && (argv(2) === 'delete') && (argv(3) === 'wiki')) {
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
// Only the channel owner can delete a wiki, at least until we create a
// more detail permissions framework
if (local_channel() !== intval($channel['channel_id'])) {
@@ -332,7 +332,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$nick = argv(1);
$resource_id = $_POST['resource_id'];
// Determine if observer has permission to create a page
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
@@ -357,7 +357,7 @@ class Wiki extends \Zotlabs\Web\Controller {
// Fetch page list for a wiki
if ((argc() === 5) && (argv(2) === 'get') && (argv(3) === 'page') && (argv(4) === 'list')) {
$resource_id = $_POST['resource_id']; // resource_id for wiki in db
- $channel = get_channel_by_nick(argv(1));
+ $channel = channelx_by_nick(argv(1));
$observer_hash = get_observer_hash();
if (local_channel() !== intval($channel['channel_id'])) {
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
@@ -385,7 +385,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$commitMsg = 'Updated ' . $pageHtmlName;
}
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
// Determine if observer has permission to save content
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
@@ -423,7 +423,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$pageUrlName = $_POST['name'];
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
// Determine if observer has permission to read content
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
@@ -449,7 +449,7 @@ class Wiki extends \Zotlabs\Web\Controller {
}
// Determine if observer has permission to delete pages
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
@@ -484,7 +484,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$commitHash = $_POST['commitHash'];
// Determine if observer has permission to revert pages
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
@@ -509,7 +509,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$currentCommit = $_POST['currentCommit'];
// Determine if observer has permission to revert pages
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
@@ -540,7 +540,7 @@ class Wiki extends \Zotlabs\Web\Controller {
}
// Determine if observer has permission to rename pages
$nick = argv(1);
- $channel = get_channel_by_nick($nick);
+ $channel = channelx_by_nick($nick);
if (local_channel() !== intval($channel['channel_id'])) {
$observer_hash = get_observer_hash();
$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);