diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Hq.php | 20 | ||||
| -rw-r--r-- | Zotlabs/Module/Page.php | 85 | ||||
| -rw-r--r-- | Zotlabs/Widget/Hq_controls.php | 25 |
3 files changed, 69 insertions, 61 deletions
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 5001bbe62..efbfcf084 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -49,16 +49,16 @@ class Hq extends \Zotlabs\Web\Controller { $sql_extra = ''; if(! $item_hash) { - $r = q("SELECT mid FROM item - WHERE uid = %d $item_normal - AND mid = parent_mid - AND item_private IN (0, 1) - ORDER BY created DESC LIMIT 1", - intval(local_channel()) - ); - if($r[0]['mid']) { - $item_hash = $r[0]['mid']; - } + //$r = q("SELECT mid FROM item + //WHERE uid = %d $item_normal + //AND mid = parent_mid + //AND item_private IN (0, 1) + //ORDER BY created DESC LIMIT 1", + //intval(local_channel()) + //); + //if($r[0]['mid']) { + //$item_hash = $r[0]['mid']; + //} } if($item_hash) { diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php index 5fdd32825..8a698005a 100644 --- a/Zotlabs/Module/Page.php +++ b/Zotlabs/Module/Page.php @@ -9,42 +9,42 @@ class Page extends \Zotlabs\Web\Controller { function init() { // We need this to make sure the channel theme is always loaded. - + $which = argv(1); $profile = 0; profile_load($which,$profile); - - - + + + if(\App::$profile['profile_uid']) head_set_icon(\App::$profile['thumb']); - + // load the item here in the init function because we need to extract // the page layout and initialise the correct theme. - - + + $observer = \App::get_observer(); $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - - - // perm_is_allowed is denied unconditionally when 'site blocked to unauthenticated members'. + + + // perm_is_allowed is denied unconditionally when 'site blocked to unauthenticated members'. // This bypasses that restriction for sys channel (public) content - + if((! perm_is_allowed(\App::$profile['profile_uid'],$ob_hash,'view_pages')) && (! is_sys_channel(\App::$profile['profile_uid']))) { notice( t('Permission denied.') . EOL); return; } - + if(argc() < 3) { notice( t('Invalid item.') . EOL); return; } - + $channel_address = argv(1); - + // Always look first for the page name prefixed by the observer language; for instance page/nickname/de/foo // followed by page/nickname/foo if that is not found. - // If your browser language is de and you want to access the default in this case, + // If your browser language is de and you want to access the default in this case, // use page/nickname/-/foo to over-ride the language and access only the page with pagelink of 'foo' $page_name = ''; @@ -63,33 +63,33 @@ class Page extends \Zotlabs\Web\Controller { // The page link title was stored in a urlencoded format // php or the browser may/will have decoded it, so re-encode it for our search - + $page_id = urlencode($page_name); $lang_page_id = urlencode(\App::$language . '/' . $page_name); $u = q("select channel_id from channel where channel_address = '%s' limit 1", dbesc($channel_address) ); - + if(! $u) { notice( t('Channel not found.') . EOL); return; } - + if($_REQUEST['rev']) $revision = " and revision = " . intval($_REQUEST['rev']) . " "; else $revision = " order by revision desc "; - + require_once('include/security.php'); $sql_options = item_permissions_sql($u[0]['channel_id']); - $r = null; + $r = null; if(! $ignore_language) { $r = q("select item.* from item left join iconfig on item.id = iconfig.iid - where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 - and iconfig.k = 'WEBPAGE' and item_type = %d + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($lang_page_id), @@ -98,8 +98,8 @@ class Page extends \Zotlabs\Web\Controller { } if(! $r) { $r = q("select item.* from item left join iconfig on item.id = iconfig.iid - where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 - and iconfig.k = 'WEBPAGE' and item_type = %d + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), @@ -109,7 +109,7 @@ class Page extends \Zotlabs\Web\Controller { if(! $r) { // no webpage by that name, but we do allow you to load/preview a layout using this module. Try that. $r = q("select item.* from item left join iconfig on item.id = iconfig.iid - where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 and iconfig.k = 'PDL' AND item_type = %d $sql_options $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), @@ -117,17 +117,17 @@ class Page extends \Zotlabs\Web\Controller { ); } if(! $r) { - + // Check again with no permissions clause to see if it is a permissions issue - + $x = q("select item.* from item left join iconfig on item.id = iconfig.iid - where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 + where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 and iconfig.k = 'WEBPAGE' and item_type = %d $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_TYPE_WEBPAGE) ); - + if($x) { // Yes, it's there. You just aren't allowed to see it. notice( t('Permission denied.') . EOL); @@ -140,7 +140,7 @@ class Page extends \Zotlabs\Web\Controller { if($r[0]['title']) \App::$page['title'] = escape_tags($r[0]['title']); - + if($r[0]['item_type'] == ITEM_TYPE_PDL) { \App::$comanche = new \Zotlabs\Render\Comanche(); \App::$comanche->parse($r[0]['body']); @@ -151,40 +151,41 @@ class Page extends \Zotlabs\Web\Controller { dbesc($r[0]['layout_mid']), intval($u[0]['channel_id']) ); - + if($l) { \App::$comanche = new \Zotlabs\Render\Comanche(); \App::$comanche->parse($l[0]['body']); \App::$pdl = $l[0]['body']; } } - + \App::$data['webpage'] = $r; - + } - + function get() { - + $r = \App::$data['webpage']; + if(! $r) return; - + if($r[0]['item_type'] == ITEM_TYPE_PDL) { $r[0]['body'] = t('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'); $r[0]['mimetype'] = 'text/plain'; $r[0]['title'] = ''; - + } - + xchan_query($r); $r = fetch_post_tags($r,true); - + if($r[0]['mimetype'] === 'application/x-pdl') \App::$page['pdl_content'] = true; - + $o .= prepare_page($r[0]); return $o; - + } - + } diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php index 7b1fe817d..51212d145 100644 --- a/Zotlabs/Widget/Hq_controls.php +++ b/Zotlabs/Widget/Hq_controls.php @@ -19,15 +19,13 @@ class Hq_controls { if (! local_channel()) return; - $entries = [ - 'toggle_editor' => [ - 'label' => t('Toggle post editor'), - 'href' => '#', - 'class' => 'btn jot-toggle', - 'type' => 'button', - 'icon' => 'pencil', - 'extra' => 'data-toggle="button"' - ] + $entries['toggle_editor'] = [ + 'label' => t('Toggle post editor'), + 'href' => '#', + 'class' => 'btn jot-toggle', + 'type' => 'button', + 'icon' => 'pencil', + 'extra' => 'data-toggle="button"' ]; if(Apps::system_app_installed(local_channel(), 'Notes')) { @@ -41,6 +39,15 @@ class Hq_controls { ]; } + $entries['toggle_channel_activities'] = [ + 'label' => t('Channel activities'), + 'href' => '#', + 'class' => 'btn channel-activities-toggle d-none', + 'type' => 'button', + 'icon' => 'user-circle-o', + 'extra' => 'data-toggle="button"' + ]; + return replace_macros(get_markup_template('hq_controls.tpl'), [ '$entries' => $entries, |