harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert Channel to new module

Browse Source
This commit is contained in:
redmatrix 2016-04-15 22:36:07 -07:00
parent b57f69d14d
commit 0865d0ef51
2 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
mod/channel.php → Zotlabs/Module/Channel.php
View File

@ -1,4 +1,6 @@
<?php <?php
namespace Zotlabs\Module;
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
require_once('include/items.php'); require_once('include/items.php');
@ -8,15 +10,16 @@ require_once('include/conversation.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
require_once('include/permissions.php'); require_once('include/permissions.php');
class Channel extends \Zotlabs\Web\Controller {
function channel_init(&$a) { function init() {
$which = null; $which = null;
if(argc() > 1) if(argc() > 1)
$which = argv(1); $which = argv(1);
if(! $which) { if(! $which) {
if(local_channel()) { if(local_channel()) {
$channel = App::get_channel(); $channel = \App::get_channel();
if($channel && $channel['channel_address']) if($channel && $channel['channel_address'])
$which = $channel['channel_address']; $which = $channel['channel_address'];
} }
@ -27,19 +30,19 @@ function channel_init(&$a) {
} }
$profile = 0; $profile = 0;
$channel = App::get_channel(); $channel = \App::get_channel();
if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
$which = $channel['channel_address']; $which = $channel['channel_address'];
$profile = argv(1); $profile = argv(1);
} }
App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n" ; \App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n" ;
App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ; \App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
// Not yet ready for prime time // Not yet ready for prime time
// App::$page['htmlhead'] .= '<link rel="openid.server" href="' . z_root() . '/id/' . $which .'?f=" />' . "\r\n" ; // \App::$page['htmlhead'] .= '<link rel="openid.server" href="' . z_root() . '/id/' . $which .'?f=" />' . "\r\n" ;
// App::$page['htmlhead'] .= '<link rel="openid.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ; // \App::$page['htmlhead'] .= '<link rel="openid.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ;
// Run profile_load() here to make sure the theme is set before // Run profile_load() here to make sure the theme is set before
// we start loading content // we start loading content
@ -48,13 +51,13 @@ function channel_init(&$a) {
} }
function channel_content(&$a, $update = 0, $load = false) { function get($update = 0, $load = false) {
if($load) if($load)
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
$checkjs = new Zotlabs\Web\CheckJS(); $checkjs = new \Zotlabs\Web\CheckJS();
$category = $datequery = $datequery2 = ''; $category = $datequery = $datequery2 = '';
@ -76,27 +79,27 @@ function channel_content(&$a, $update = 0, $load = false) {
if($update) { if($update) {
// Ensure we've got a profile owner if updating. // Ensure we've got a profile owner if updating.
App::$profile['profile_uid'] = App::$profile_uid = $update; \App::$profile['profile_uid'] = \App::$profile_uid = $update;
} }
else { else {
if(App::$profile['profile_uid'] == local_channel()) { if(\App::$profile['profile_uid'] == local_channel()) {
nav_set_selected('home'); nav_set_selected('home');
} }
} }
$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false); $is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
$channel = App::get_channel(); $channel = \App::get_channel();
$observer = App::get_observer(); $observer = \App::get_observer();
$ob_hash = (($observer) ? $observer['xchan_hash'] : ''); $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
$perms = get_all_perms(App::$profile['profile_uid'],$ob_hash); $perms = get_all_perms(\App::$profile['profile_uid'],$ob_hash);
if(! $perms['view_stream']) { if(! $perms['view_stream']) {
// We may want to make the target of this redirect configurable // We may want to make the target of this redirect configurable
if($perms['view_profile']) { if($perms['view_profile']) {
notice( t('Insufficient permissions. Request redirected to profile page.') . EOL); notice( t('Insufficient permissions. Request redirected to profile page.') . EOL);
goaway (z_root() . "/profile/" . App::$profile['channel_address']); goaway (z_root() . "/profile/" . \App::$profile['channel_address']);
} }
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return; return;
@ -105,9 +108,9 @@ function channel_content(&$a, $update = 0, $load = false) {
if(! $update) { if(! $update) {
$o .= profile_tabs($a, $is_owner, App::$profile['channel_address']); $o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
$o .= common_friends_visitor_widget(App::$profile['profile_uid']); $o .= common_friends_visitor_widget(\App::$profile['profile_uid']);
if($channel && $is_owner) { if($channel && $is_owner) {
$channel_acl = array( $channel_acl = array(
@ -125,15 +128,15 @@ function channel_content(&$a, $update = 0, $load = false) {
$x = array( $x = array(
'is_owner' => $is_owner, 'is_owner' => $is_owner,
'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false), 'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(\App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
'default_location' => (($is_owner) ? App::$profile['channel_location'] : ''), 'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
'nickname' => App::$profile['channel_address'], 'nickname' => \App::$profile['channel_address'],
'lockstate' => (((strlen(App::$profile['channel_allow_cid'])) || (strlen(App::$profile['channel_allow_gid'])) || (strlen(App::$profile['channel_deny_cid'])) || (strlen(App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'), 'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''), 'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
'showacl' => (($is_owner) ? 'yes' : ''), 'showacl' => (($is_owner) ? 'yes' : ''),
'bang' => '', 'bang' => '',
'visitor' => (($is_owner || $observer) ? true : false), 'visitor' => (($is_owner || $observer) ? true : false),
'profile_uid' => App::$profile['profile_uid'], 'profile_uid' => \App::$profile['profile_uid'],
'editor_autocomplete' => true, 'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true 'bbcode' => true
@ -150,18 +153,18 @@ function channel_content(&$a, $update = 0, $load = false) {
*/ */
$item_normal = item_normal(); $item_normal = item_normal();
$sql_extra = item_permissions_sql(App::$profile['profile_uid']); $sql_extra = item_permissions_sql(\App::$profile['profile_uid']);
if(get_pconfig(App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid)) if(get_pconfig(\App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid))
$page_mode = 'list'; $page_mode = 'list';
else else
$page_mode = 'client'; $page_mode = 'client';
$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " "; $abook_uids = " and abook.abook_channel = " . intval(\App::$profile['profile_uid']) . " ";
$simple_update = (($update) ? " AND item_unseen = 1 " : ''); $simple_update = (($update) ? " AND item_unseen = 1 " : '');
App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string) . '" title="oembed" />' . "\r\n"; \App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string) . '" title="oembed" />' . "\r\n";
if($update && $_SESSION['loadtime']) if($update && $_SESSION['loadtime'])
$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) "; $simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
@ -174,7 +177,7 @@ function channel_content(&$a, $update = 0, $load = false) {
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal $r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1", AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
dbesc($mid . '%'), dbesc($mid . '%'),
intval(App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])
); );
} else { } else {
$r = q("SELECT distinct parent AS `item_id`, created from item $r = q("SELECT distinct parent AS `item_id`, created from item
@ -184,7 +187,7 @@ function channel_content(&$a, $update = 0, $load = false) {
AND (abook.abook_blocked = 0 or abook.abook_flags is null) AND (abook.abook_blocked = 0 or abook.abook_flags is null)
$sql_extra $sql_extra
ORDER BY created DESC", ORDER BY created DESC",
intval(App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])
); );
$_SESSION['loadtime'] = datetime_convert(); $_SESSION['loadtime'] = datetime_convert();
} }
@ -207,15 +210,15 @@ function channel_content(&$a, $update = 0, $load = false) {
} }
$itemspage = get_pconfig(local_channel(),'system','itemspage'); $itemspage = get_pconfig(local_channel(),'system','itemspage');
App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); \App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start'])); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
if($load || ($checkjs->disabled())) { if($load || ($checkjs->disabled())) {
if ($mid) { if ($mid) {
$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal $r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d $item_normal
AND item_wall = 1 $sql_extra limit 1", AND item_wall = 1 $sql_extra limit 1",
dbesc($mid), dbesc($mid),
intval(App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])
); );
if (! $r) { if (! $r) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
@ -229,7 +232,7 @@ function channel_content(&$a, $update = 0, $load = false) {
AND (abook_blocked = 0 or abook.abook_flags is null) AND (abook_blocked = 0 or abook.abook_flags is null)
$sql_extra $sql_extra2 $sql_extra $sql_extra2
ORDER BY created DESC $pager_sql ", ORDER BY created DESC $pager_sql ",
intval(App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])
); );
} }
} }
@ -247,7 +250,7 @@ function channel_content(&$a, $update = 0, $load = false) {
WHERE `item`.`uid` = %d $item_normal WHERE `item`.`uid` = %d $item_normal
AND `item`.`parent` IN ( %s ) AND `item`.`parent` IN ( %s )
$sql_extra ", $sql_extra ",
intval(App::$profile['profile_uid']), intval(\App::$profile['profile_uid']),
dbesc($parents_str) dbesc($parents_str)
); );
@ -270,19 +273,19 @@ function channel_content(&$a, $update = 0, $load = false) {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater, // This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
// because browser prefetching might change it on us. We have to deliver it with the page. // because browser prefetching might change it on us. We have to deliver it with the page.
$maxheight = get_pconfig(App::$profile['profile_uid'],'system','channel_divmore_height'); $maxheight = get_pconfig(\App::$profile['profile_uid'],'system','channel_divmore_height');
if(! $maxheight) if(! $maxheight)
$maxheight = 400; $maxheight = 400;
$o .= '<div id="live-channel"></div>' . "\r\n"; $o .= '<div id="live-channel"></div>' . "\r\n";
$o .= "<script> var profile_uid = " . App::$profile['profile_uid'] $o .= "<script> var profile_uid = " . \App::$profile['profile_uid']
. "; var netargs = '?f='; var profile_page = " . App::$pager['page'] . "; var netargs = '?f='; var profile_page = " . \App::$pager['page']
. "; divmore_height = " . intval($maxheight) . "; </script>\r\n"; . "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( \App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
'$baseurl' => z_root(), '$baseurl' => z_root(),
'$pgtype' => 'channel', '$pgtype' => 'channel',
'$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'), '$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
'$gid' => '0', '$gid' => '0',
'$cid' => '0', '$cid' => '0',
'$cmin' => '0', '$cmin' => '0',
@ -294,7 +297,7 @@ function channel_content(&$a, $update = 0, $load = false) {
'$nouveau' => '0', '$nouveau' => '0',
'$wall' => '1', '$wall' => '1',
'$fh' => '0', '$fh' => '0',
'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1), '$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
'$search' => '', '$search' => '',
'$order' => '', '$order' => '',
'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0), '$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
@ -348,7 +351,7 @@ function channel_content(&$a, $update = 0, $load = false) {
if((! $update) || ($checkjs->disabled())) { if((! $update) || ($checkjs->disabled())) {
$o .= alt_pager($a,count($items)); $o .= alt_pager($a,count($items));
if ($mid && $items[0]['title']) if ($mid && $items[0]['title'])
App::$page['title'] = $items[0]['title'] . " - " . App::$page['title']; \App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
} }
if($mid) if($mid)
@ -356,3 +359,6 @@ function channel_content(&$a, $update = 0, $load = false) {
return $o; return $o;
} }
}

11
mod/update_channel.php → Zotlabs/Module/Update_channel.php
View File

@ -1,5 +1,7 @@
<?php <?php
namespace Zotlabs\Module;
/** /**
* Module: update_profile * Module: update_profile
* Purpose: AJAX synchronisation of profile page * Purpose: AJAX synchronisation of profile page
@ -7,9 +9,9 @@
*/ */
require_once('mod/channel.php'); class Update_channel extends \Zotlabs\Web\Controller {
function update_channel_content(&$a) { function get() {
$profile_uid = intval($_GET['p']); $profile_uid = intval($_GET['p']);
$load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0); $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0);
@ -33,7 +35,9 @@ function update_channel_content(&$a) {
* *
*/ */
$text = channel_content($a,$profile_uid,$load); $mod = new Channel();
$text = $mod->get($profile_uid,$load);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\""; $replace = "<img\${1} dst=\"\${2}\"";
@ -63,3 +67,4 @@ function update_channel_content(&$a) {
killme(); killme();
} }
}