diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-09 22:00:21 -0400 |
| commit | 0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be (patch) | |
| tree | 2e4f069d66885c5ca5b77154e9dd5a43ec004ff5 /Zotlabs/Module/Webpages.php | |
| parent | 9c8cf7d43372aeea4d8a450e7cb17d7a24b64d5f (diff) | |
| parent | ea1173f8f632151d02c71fe6004c6a64d014e80a (diff) | |
| download | volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.gz volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.tar.bz2 volse-hubzilla-0b8a7f1bd03edb2bb18eb050fcb0b482d0e231be.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'Zotlabs/Module/Webpages.php')
| -rw-r--r-- | Zotlabs/Module/Webpages.php | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index 84d58058e..d8adb55b2 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -4,6 +4,7 @@ namespace Zotlabs\Module; require_once('include/identity.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); +require_once('include/PermissionDescription.php'); class Webpages extends \Zotlabs\Web\Controller { @@ -76,13 +77,7 @@ class Webpages extends \Zotlabs\Web\Controller { $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); - if(! $mimetype) { - $mimetype = 'choose'; - } - $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); - if(! $layout) - $layout = 'choose'; // 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 owner's. @@ -106,18 +101,21 @@ class Webpages extends \Zotlabs\Web\Controller { $o = profile_tabs($a, $is_owner, \App::$profile['channel_address']); $x = array( - 'webpage' => ITEM_TYPE_WEBPAGE, - 'is_owner' => true, - 'nickname' => \App::$profile['channel_address'], - 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'bang' => '', - 'acl' => (($is_owner) ? populate_acl($channel_acl,false) : ''), - 'showacl' => (($is_owner) ? true : false), - 'visitor' => true, + 'webpage' => ITEM_TYPE_WEBPAGE, + 'is_owner' => true, + 'nickname' => \App::$profile['channel_address'], + 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'acl' => (($is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_pages')) : ''), + 'showacl' => (($is_owner) ? true : false), + 'visitor' => true, + 'hide_location' => true, + 'hide_voting' => true, 'profile_uid' => intval($owner), - 'mimetype' => $mimetype, - 'layout' => $layout, - 'expanded' => true, + 'mimetype' => $mimetype, + 'mimeselect' => true, + 'layout' => $layout, + 'layoutselect' => true, + 'expanded' => true, 'novoting'=> true, 'bbco_autocomplete' => 'bbcode', 'bbcode' => true |