From de3345f5f39f080e00c2572b48a53d85c7f65b5c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 17:07:55 -0700 Subject: This isn't optimal, but on the short term we'll clone the page editor to use as a block editor, and probably a layout editor as well. Eventually, these should all probably just be switches onto a single editor instance. Decided to put the layout_mid into the item table directory rather than re-use resource_id, so that we can still have pages attached to different resources like photos and events and stuff. The block editor is far from finished, at this point I've only cloned it and changed the name and type of item it looks for. --- mod/blocks.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 mod/blocks.php (limited to 'mod/blocks.php') diff --git a/mod/blocks.php b/mod/blocks.php new file mode 100644 index 000000000..f3010f60f --- /dev/null +++ b/mod/blocks.php @@ -0,0 +1,82 @@ + 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + profile_load($a,$which,0); + + + // 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 + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $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, + 'is_owner' => true, + 'nickname' => $a->profile['channel_address'], + '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' => intval($owner), + ); + + $o .= status_editor($a,$x); + + //Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. +//TODO - this should be replaced with pagelist_widget + +$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", + intval($owner) +); + + $pages = null; + + if($r) { + $pages = array(); + foreach($r as $rr) { + $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); + } + } + + +//Build the base URL for edit links + $url = z_root() . "/editblock/" . $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' => $which, + '$view' => t('View'), + '$preview' => '1', + + )); + + +} -- cgit v1.2.3 From cbab62c95efdd3ab306736a430698313b6b2a320 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 18:22:31 -0700 Subject: add layouts and editlayout and rework the page logic in mod/item --- mod/blocks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/blocks.php') diff --git a/mod/blocks.php b/mod/blocks.php index f3010f60f..bb1b68e8b 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -37,7 +37,7 @@ function webpages_content(&$a) { // 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, + 'webpage' => ITEM_BUILDBLOCK, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), -- cgit v1.2.3 From 8b7757e033c4483da24700722c186057bb431164 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 01:38:17 -0700 Subject: webpage content-type -- needs cleaning up and a security check once all the important bits are in place. --- mod/blocks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/blocks.php') diff --git a/mod/blocks.php b/mod/blocks.php index bb1b68e8b..29117eae8 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -1,6 +1,6 @@ 1) $which = argv(1); -- cgit v1.2.3 From ab1c9dc9c9ecc1f382b6c7512b014c11f08b6e5e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 19:55:26 -0700 Subject: add design tool menu to appropriate pages --- mod/blocks.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'mod/blocks.php') diff --git a/mod/blocks.php b/mod/blocks.php index 29117eae8..170d37256 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -2,6 +2,8 @@ function blocks_content(&$a) { + + if(argc() > 1) $which = argv(1); else { @@ -21,6 +23,16 @@ function blocks_content(&$a) { $owner = intval($r[0]['channel_id']); } + // Block design features from visitors + + if((! local_user()) || (local_user() != $owner)) { + notice( t('Permission denied.') . EOL); + return; + } + + + + // Get the observer, check their permissions $observer = $a->get_observer(); @@ -33,6 +45,12 @@ function blocks_content(&$a) { return; } + if(local_user() && local_user() == $owner) { + $a->set_widget('design',design_tools()); + } + + + // 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'); @@ -43,6 +61,7 @@ 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', + 'mimetype' => 'choose', 'profile_uid' => intval($owner), ); -- cgit v1.2.3