aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-14 20:56:49 -0700
committerfriendica <info@friendica.com>2013-08-14 20:56:49 -0700
commit7d0b1506a8b4e476cdabb33b6cc945b4f4113fff (patch)
tree45ff2b6d3bef287b2ccd98ec35a5ec43b5f70972 /mod
parentac541a7d3246e1c5c60ae752326c1b9ba5ccd78f (diff)
parent608e04c65eb2433a1cece9b5798f8577b611a288 (diff)
downloadvolse-hubzilla-7d0b1506a8b4e476cdabb33b6cc945b4f4113fff.tar.gz
volse-hubzilla-7d0b1506a8b4e476cdabb33b6cc945b4f4113fff.tar.bz2
volse-hubzilla-7d0b1506a8b4e476cdabb33b6cc945b4f4113fff.zip
Merge pull request #96 from beardy-unixer/master
Webpages
Diffstat (limited to 'mod')
-rw-r--r--mod/editwebpage.php12
-rw-r--r--mod/page.php11
-rw-r--r--mod/webpages.php36
3 files changed, 40 insertions, 19 deletions
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 46c6b8817..f89be67c4 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -1,7 +1,8 @@
<?php
-require_once('acl_selectors.php');
+// What is this here for? I think it's cruft, but comment out for now in case it's here for a reason
+// require_once('acl_selectors.php');
function editwebpage_content(&$a) {
@@ -59,9 +60,8 @@ function editwebpage_content(&$a) {
- // All of the following is straight from editpost - but we'll need richer editing options for webpages eventually, so we may as well have it's own mod now.
-
$plaintext = true;
+// You may or may not be a local user. This won't work,
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
@@ -91,11 +91,9 @@ function editwebpage_content(&$a) {
//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-//FIXME A return path with $_SESSION doesn't work for observer (at least, not here it doesn't). It'll WSoD instead of loading a sensible page. So, send folk
-//back to the channel address until somebody figures out how to fix it - we can't send them back to webpages, because that could leak private pages they can't see
-//when ACL is done.
+//FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list.
- $rp = 'channel' . '/' . $which;
+ $rp = '/webpages/' . $which;
$o .= replace_macros($tpl,array(
'$return_path' => $rp,
diff --git a/mod/page.php b/mod/page.php
index 51b292f37..4b2b95b6a 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -2,6 +2,8 @@
require_once('include/items.php');
require_once('include/conversation.php');
+require_once('include/page_widgets.php');
+
function page_init(&$a) {
// We need this to make sure the channel theme is always loaded.
$which = argv(1);
@@ -32,7 +34,6 @@ function page_content(&$a) {
return;
}
-
if(argc() < 3) {
notice( t('Invalid item.') . EOL);
return;
@@ -63,6 +64,14 @@ function page_content(&$a) {
return;
}
+// Use of widgets should be determined by Comanchie, but we don't have it yet, so...
+ if ($perms['write_pages']) {
+ $chan = $a->channel['channel_id'];
+ $who = $channel_address;
+ $which = $r[0]['id'];
+ $o .= writepages_widget($who,$which);
+ }
+
xchan_query($r);
$r = fetch_post_tags($r,true);
$a->profile = array('profile_uid' => $u[0]['channel_id']);
diff --git a/mod/webpages.php b/mod/webpages.php
index f2026ea0b..fb133eccf 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -1,6 +1,6 @@
<?php
-function webpages_init(&$a) {
+function webpages_content(&$a) {
if(argc() > 1)
$which = argv(1);
@@ -20,16 +20,29 @@ function webpages_init(&$a) {
profile_load($a,$which,$profile);
-}
-function webpages_content(&$a) {
+// Figure out who the page owner is.
+ $r = q("select channel_id from channel where channel_address = '%s'",
+ dbesc($which)
+ );
+ if($r) {
+ $owner = intval($r[0]['channel_id']);
+ }
+
+// Get the observer, check their permissions
-// We can do better, but since editing only works for local users and all posts are webpages, return anyone else for now.
+ $observer = $a->get_observer();
+ $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-if (!local_user()) return;
+ $perms = get_all_perms($owner,$ob_hash);
+ if(! $perms['write_pages']) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
+// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels.
require_once ('include/conversation.php');
$x = array(
'webpage' => 1,
@@ -38,16 +51,16 @@ require_once ('include/conversation.php');
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'bang' => (($group || $cid) ? '!' : ''),
'visitor' => 'block',
- 'profile_uid' => local_user()
+ 'profile_uid' => intval($owner),
);
$o .= status_editor($a,$x);
//Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link.
-// FIXME - we should sort these results, but it's not obvious what order yet. Alphabetical? Created order?
+//TODO - this should be replaced with pagelist_widget
-$r = q("select * from item_id where uid = %d and service = 'WEBPAGE'",
- intval(local_user())
+$r = q("select * from item_id where uid = %d and service = 'WEBPAGE' order by sid asc",
+ intval($owner)
);
$pages = null;
@@ -61,14 +74,15 @@ $r = q("select * from item_id where uid = %d and service = 'WEBPAGE'",
//Build the base URL for edit links
- $url = z_root() . "/editwebpage/" . $a->profile['channel_address'];
+ $url = z_root() . "/editwebpage/" . $which;
// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM).
return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
'$baseurl' => $url,
'$edit' => t('Edit'),
'$pages' => $pages,
- '$channel' => $a->profile['channel_address'],
+ '$channel' => $which,
'$view' => t('View'),
+ '$preview' => '1',
));