From 0865d0ef51363764e3a40ba1f146b0cbae70f299 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 15 Apr 2016 22:36:07 -0700
Subject: Convert Channel to new module

---
 Zotlabs/Module/Channel.php        | 364 ++++++++++++++++++++++++++++++++++++++
 Zotlabs/Module/Update_channel.php |  70 ++++++++
 mod/channel.php                   | 358 -------------------------------------
 mod/update_channel.php            |  65 -------
 4 files changed, 434 insertions(+), 423 deletions(-)
 create mode 100644 Zotlabs/Module/Channel.php
 create mode 100644 Zotlabs/Module/Update_channel.php
 delete mode 100644 mod/channel.php
 delete mode 100644 mod/update_channel.php

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
new file mode 100644
index 000000000..cae561266
--- /dev/null
+++ b/Zotlabs/Module/Channel.php
@@ -0,0 +1,364 @@
+<?php
+namespace Zotlabs\Module;
+
+
+require_once('include/contact_widgets.php');
+require_once('include/items.php');
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+require_once('include/permissions.php');
+
+class Channel extends \Zotlabs\Web\Controller {
+
+function init() {
+
+	$which = null;
+	if(argc() > 1)
+		$which = argv(1);
+	if(! $which) {
+		if(local_channel()) {
+			$channel = \App::get_channel();
+			if($channel && $channel['channel_address'])
+			$which = $channel['channel_address'];
+		}
+	}
+	if(! $which) {
+		notice( t('You must be logged in to see this page.') . EOL );
+		return;
+	}
+
+	$profile = 0;
+	$channel = \App::get_channel();
+
+	if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
+		$which = $channel['channel_address'];
+		$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('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
+
+// 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.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ;
+
+	// Run profile_load() here to make sure the theme is set before
+	// we start loading content
+
+	profile_load($a,$which,$profile);
+
+}
+
+function get($update = 0, $load = false) {
+
+
+	if($load)
+		$_SESSION['loadtime'] = datetime_convert();
+
+	$checkjs = new \Zotlabs\Web\CheckJS();
+
+	$category = $datequery = $datequery2 = '';
+
+	$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
+
+	$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
+	$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
+
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
+			return login();
+	}
+
+	$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
+	$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
+
+	$groups = array();
+
+	$o = '';
+
+	if($update) {
+		// Ensure we've got a profile owner if updating.
+		\App::$profile['profile_uid'] = \App::$profile_uid = $update;
+	}
+	else {
+		if(\App::$profile['profile_uid'] == local_channel()) {
+			nav_set_selected('home');
+		}
+	}
+
+	$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
+
+	$channel = \App::get_channel();
+	$observer = \App::get_observer();
+	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
+
+	$perms = get_all_perms(\App::$profile['profile_uid'],$ob_hash);
+
+	if(! $perms['view_stream']) {
+			// We may want to make the target of this redirect configurable
+			if($perms['view_profile']) {
+				notice( t('Insufficient permissions.  Request redirected to profile page.') . EOL);
+				goaway (z_root() . "/profile/" . \App::$profile['channel_address']);
+			}
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+
+	if(! $update) {
+
+		$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+		$o .= common_friends_visitor_widget(\App::$profile['profile_uid']);
+
+		if($channel && $is_owner) {
+			$channel_acl = array(
+				'allow_cid' => $channel['channel_allow_cid'], 
+				'allow_gid' => $channel['channel_allow_gid'], 
+				'deny_cid' => $channel['channel_deny_cid'], 
+				'deny_gid' => $channel['channel_deny_gid']
+			);
+		}
+		else
+			$channel_acl = array(); 
+
+
+		if($perms['post_wall']) {
+
+			$x = array(
+				'is_owner' => $is_owner,
+				'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'] : ''),
+				'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'),
+				'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
+				'showacl' => (($is_owner) ? 'yes' : ''),
+				'bang' => '',
+				'visitor' => (($is_owner || $observer) ? true : false),
+				'profile_uid' => \App::$profile['profile_uid'],
+				'editor_autocomplete' => true,
+				'bbco_autocomplete' => 'bbcode',
+				'bbcode' => true
+        	);
+
+        	$o .= status_editor($a,$x);
+		}
+
+	}
+
+
+	/**
+	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
+	 */
+
+	$item_normal = item_normal();
+	$sql_extra = item_permissions_sql(\App::$profile['profile_uid']);
+
+	if(get_pconfig(\App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid))
+		$page_mode = 'list';
+	else
+		$page_mode = 'client';
+
+	$abook_uids = " and abook.abook_channel = " . intval(\App::$profile['profile_uid']) . " ";
+
+	$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";
+		
+	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']) . "' ) ";
+	if($load)
+		$simple_update = '';
+
+	if(($update) && (! $load)) {
+
+		if ($mid) {
+			$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",
+				dbesc($mid . '%'),
+				intval(\App::$profile['profile_uid'])
+			);
+		} else {
+			$r = q("SELECT distinct parent AS `item_id`, created from item
+				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
+				WHERE uid = %d $item_normal
+				AND item_wall = 1 $simple_update
+				AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+				$sql_extra
+				ORDER BY created DESC",
+				intval(\App::$profile['profile_uid'])
+			);
+			$_SESSION['loadtime'] = datetime_convert();
+		}
+
+	}
+	else {
+
+		if(x($category)) {
+		        $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
+		}
+		if(x($hashtags)) {
+		        $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+		}
+
+		if($datequery) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
+		}
+		if($datequery2) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
+		}
+
+		$itemspage = get_pconfig(local_channel(),'system','itemspage');
+		\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
+
+		if($load || ($checkjs->disabled())) {
+			if ($mid) {
+				$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",
+					dbesc($mid),
+					intval(\App::$profile['profile_uid'])
+				);
+				if (! $r) {
+					notice( t('Permission denied.') . EOL);
+				}
+
+			} else {
+				$r = q("SELECT distinct id AS item_id, created FROM item 
+					left join abook on item.author_xchan = abook.abook_xchan
+					WHERE uid = %d $item_normal
+					AND item_wall = 1 and item_thread_top = 1
+					AND (abook_blocked = 0 or abook.abook_flags is null)
+					$sql_extra $sql_extra2
+					ORDER BY created DESC $pager_sql ",
+					intval(\App::$profile['profile_uid'])
+				);
+			}
+		}
+		else {
+			$r = array();
+		}
+	}
+
+	if($r) {
+
+		$parents_str = ids_to_querystr($r,'item_id');
+ 
+		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
+			FROM `item`
+			WHERE `item`.`uid` = %d $item_normal
+			AND `item`.`parent` IN ( %s )
+			$sql_extra ",
+			intval(\App::$profile['profile_uid']),
+			dbesc($parents_str)
+		);
+
+		xchan_query($items);
+		$items = fetch_post_tags($items, true);
+		$items = conv_sort($items,'created');
+
+		if ($load && $mid && (! count($items))) {
+			// This will happen if we don't have sufficient permissions
+			// to view the parent item (or the item itself if it is toplevel)
+			notice( t('Permission denied.') . EOL);
+		}
+
+	} else {
+		$items = array();
+	}
+
+	if((! $update) && (! $load)) {
+
+		// 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.
+
+		$maxheight = get_pconfig(\App::$profile['profile_uid'],'system','channel_divmore_height');
+		if(! $maxheight)
+			$maxheight = 400;
+
+		$o .= '<div id="live-channel"></div>' . "\r\n";
+		$o .= "<script> var profile_uid = " . \App::$profile['profile_uid'] 
+			. "; var netargs = '?f='; var profile_page = " . \App::$pager['page']
+			. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
+
+		\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
+			'$baseurl' => z_root(),
+			'$pgtype' => 'channel',
+			'$uid' => ((\App::$profile['profile_uid']) ? \App::$profile['profile_uid'] : '0'),
+			'$gid' => '0',
+			'$cid' => '0',
+			'$cmin' => '0',
+			'$cmax' => '0',
+			'$star' => '0',
+			'$liked' => '0',
+			'$conv' => '0',
+			'$spam' => '0',
+			'$nouveau' => '0',
+			'$wall' => '1',
+			'$fh' => '0',
+			'$page' => ((\App::$pager['page'] != 1) ? \App::$pager['page'] : 1),
+			'$search' => '',
+			'$order' => '',
+			'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
+			'$file' => '',
+			'$cats' => (($category) ? $category : ''),
+			'$tags' => (($hashtags) ? $hashtags : ''),
+			'$mid' => $mid,
+			'$verb' => '',
+			'$dend' => $datequery,
+			'$dbegin' => $datequery2
+		));
+
+
+	}
+
+	$update_unseen = '';
+
+	if($page_mode === 'list') {
+
+		/**
+		 * in "list mode", only mark the parent item and any like activities as "seen". 
+		 * We won't distinguish between comment likes and post likes. The important thing
+		 * is that the number of unseen comments will be accurate. The SQL to separate the
+		 * comment likes could also get somewhat hairy. 
+		 */
+
+		if($parents_str) {
+			$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
+			$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
+		}
+	}
+	else {
+		if($parents_str) {
+			$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
+		}
+	}
+
+	if($is_owner && $update_unseen) {
+		$r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
+			intval(local_channel())
+		);
+	}
+
+
+	if($checkjs->disabled()) {
+		$o .= conversation($a,$items,'channel',$update,'traditional');
+	} else {
+		$o .= conversation($a,$items,'channel',$update,$page_mode);
+	}
+
+	if((! $update) || ($checkjs->disabled())) {
+		$o .= alt_pager($a,count($items));
+		if ($mid && $items[0]['title'])
+			\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
+	}
+
+	if($mid) 
+		$o .= '<div id="content-complete"></div>';
+
+	return $o;
+}
+
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Module/Update_channel.php b/Zotlabs/Module/Update_channel.php
new file mode 100644
index 000000000..b1b2d5103
--- /dev/null
+++ b/Zotlabs/Module/Update_channel.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Zotlabs\Module;
+
+/**
+ * Module: update_profile
+ * Purpose: AJAX synchronisation of profile page
+ *
+ */
+
+
+class Update_channel extends \Zotlabs\Web\Controller {
+
+function get() {
+
+	$profile_uid = intval($_GET['p']);
+	$load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0);
+
+	header("Content-type: text/html");
+	echo "<!DOCTYPE html><html><body>\r\n";
+
+	/**
+	 * We can remove this hack once Internet Explorer recognises HTML5 natively
+	 */
+
+	echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
+
+	/**
+	 *
+	 * Grab the page inner contents by calling the content function from the profile module directly, 
+	 * but move any image src attributes to another attribute name. This is because 
+	 * some browsers will prefetch all the images for the page even if we don't need them.
+	 * The only ones we need to fetch are those for new page additions, which we'll discover
+	 * on the client side and then swap the image back.
+	 *
+	 */
+
+	$mod = new Channel();
+
+	$text = $mod->get($profile_uid,$load);
+
+	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+	$replace = "<img\${1} dst=\"\${2}\"";
+//	$text = preg_replace($pattern, $replace, $text);
+
+/*
+	if(! $load) {
+		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+		$text = preg_replace($pattern, $replace, $text);
+    	$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+    	$text = preg_replace($pattern, $replace, $text);
+	}
+*/
+
+	/**
+	 * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
+	 */
+
+	echo str_replace("\t",'       ',$text);
+	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
+	echo "</body></html>\r\n";
+	killme();
+
+}
+}
\ No newline at end of file
diff --git a/mod/channel.php b/mod/channel.php
deleted file mode 100644
index 9bc7332dc..000000000
--- a/mod/channel.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-
-require_once('include/contact_widgets.php');
-require_once('include/items.php');
-require_once("include/bbcode.php");
-require_once('include/security.php');
-require_once('include/conversation.php');
-require_once('include/acl_selectors.php');
-require_once('include/permissions.php');
-
-
-function channel_init(&$a) {
-
-	$which = null;
-	if(argc() > 1)
-		$which = argv(1);
-	if(! $which) {
-		if(local_channel()) {
-			$channel = App::get_channel();
-			if($channel && $channel['channel_address'])
-			$which = $channel['channel_address'];
-		}
-	}
-	if(! $which) {
-		notice( t('You must be logged in to see this page.') . EOL );
-		return;
-	}
-
-	$profile = 0;
-	$channel = App::get_channel();
-
-	if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) {
-		$which = $channel['channel_address'];
-		$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('Only posts') . '" href="' . z_root() . '/feed/' . $which . '?top=1" />' . "\r\n" ;
-
-// 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.delegate" href="' . z_root() . '/channel/' . $which .'" />' . "\r\n" ;
-
-	// Run profile_load() here to make sure the theme is set before
-	// we start loading content
-
-	profile_load($a,$which,$profile);
-
-}
-
-function channel_content(&$a, $update = 0, $load = false) {
-
-
-	if($load)
-		$_SESSION['loadtime'] = datetime_convert();
-
-	$checkjs = new Zotlabs\Web\CheckJS();
-
-	$category = $datequery = $datequery2 = '';
-
-	$mid = ((x($_REQUEST,'mid')) ? $_REQUEST['mid'] : '');
-
-	$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-	$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
-
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
-			return login();
-	}
-
-	$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
-	$hashtags = ((x($_REQUEST,'tag')) ? $_REQUEST['tag'] : '');
-
-	$groups = array();
-
-	$o = '';
-
-	if($update) {
-		// Ensure we've got a profile owner if updating.
-		App::$profile['profile_uid'] = App::$profile_uid = $update;
-	}
-	else {
-		if(App::$profile['profile_uid'] == local_channel()) {
-			nav_set_selected('home');
-		}
-	}
-
-	$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
-
-	$channel = App::get_channel();
-	$observer = App::get_observer();
-	$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-	$perms = get_all_perms(App::$profile['profile_uid'],$ob_hash);
-
-	if(! $perms['view_stream']) {
-			// We may want to make the target of this redirect configurable
-			if($perms['view_profile']) {
-				notice( t('Insufficient permissions.  Request redirected to profile page.') . EOL);
-				goaway (z_root() . "/profile/" . App::$profile['channel_address']);
-			}
-		notice( t('Permission denied.') . EOL);
-		return;
-	}
-
-
-	if(! $update) {
-
-		$o .= profile_tabs($a, $is_owner, App::$profile['channel_address']);
-
-		$o .= common_friends_visitor_widget(App::$profile['profile_uid']);
-
-		if($channel && $is_owner) {
-			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'], 
-				'allow_gid' => $channel['channel_allow_gid'], 
-				'deny_cid' => $channel['channel_deny_cid'], 
-				'deny_gid' => $channel['channel_deny_gid']
-			);
-		}
-		else
-			$channel_acl = array(); 
-
-
-		if($perms['post_wall']) {
-
-			$x = array(
-				'is_owner' => $is_owner,
-				'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'] : ''),
-				'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'),
-				'acl' => (($is_owner) ? populate_acl($channel_acl,true,((App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
-				'showacl' => (($is_owner) ? 'yes' : ''),
-				'bang' => '',
-				'visitor' => (($is_owner || $observer) ? true : false),
-				'profile_uid' => App::$profile['profile_uid'],
-				'editor_autocomplete' => true,
-				'bbco_autocomplete' => 'bbcode',
-				'bbcode' => true
-        	);
-
-        	$o .= status_editor($a,$x);
-		}
-
-	}
-
-
-	/**
-	 * Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
-	 */
-
-	$item_normal = item_normal();
-	$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-	if(get_pconfig(App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid))
-		$page_mode = 'list';
-	else
-		$page_mode = 'client';
-
-	$abook_uids = " and abook.abook_channel = " . intval(App::$profile['profile_uid']) . " ";
-
-	$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";
-		
-	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']) . "' ) ";
-	if($load)
-		$simple_update = '';
-
-	if(($update) && (! $load)) {
-
-		if ($mid) {
-			$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",
-				dbesc($mid . '%'),
-				intval(App::$profile['profile_uid'])
-			);
-		} else {
-			$r = q("SELECT distinct parent AS `item_id`, created from item
-				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
-				WHERE uid = %d $item_normal
-				AND item_wall = 1 $simple_update
-				AND (abook.abook_blocked = 0 or abook.abook_flags is null)
-				$sql_extra
-				ORDER BY created DESC",
-				intval(App::$profile['profile_uid'])
-			);
-			$_SESSION['loadtime'] = datetime_convert();
-		}
-
-	}
-	else {
-
-		if(x($category)) {
-		        $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
-		}
-		if(x($hashtags)) {
-		        $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
-		}
-
-		if($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-		}
-		if($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-		}
-
-		$itemspage = get_pconfig(local_channel(),'system','itemspage');
-		App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
-		$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
-
-		if($load || ($checkjs->disabled())) {
-			if ($mid) {
-				$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",
-					dbesc($mid),
-					intval(App::$profile['profile_uid'])
-				);
-				if (! $r) {
-					notice( t('Permission denied.') . EOL);
-				}
-
-			} else {
-				$r = q("SELECT distinct id AS item_id, created FROM item 
-					left join abook on item.author_xchan = abook.abook_xchan
-					WHERE uid = %d $item_normal
-					AND item_wall = 1 and item_thread_top = 1
-					AND (abook_blocked = 0 or abook.abook_flags is null)
-					$sql_extra $sql_extra2
-					ORDER BY created DESC $pager_sql ",
-					intval(App::$profile['profile_uid'])
-				);
-			}
-		}
-		else {
-			$r = array();
-		}
-	}
-
-	if($r) {
-
-		$parents_str = ids_to_querystr($r,'item_id');
- 
-		$items = q("SELECT `item`.*, `item`.`id` AS `item_id` 
-			FROM `item`
-			WHERE `item`.`uid` = %d $item_normal
-			AND `item`.`parent` IN ( %s )
-			$sql_extra ",
-			intval(App::$profile['profile_uid']),
-			dbesc($parents_str)
-		);
-
-		xchan_query($items);
-		$items = fetch_post_tags($items, true);
-		$items = conv_sort($items,'created');
-
-		if ($load && $mid && (! count($items))) {
-			// This will happen if we don't have sufficient permissions
-			// to view the parent item (or the item itself if it is toplevel)
-			notice( t('Permission denied.') . EOL);
-		}
-
-	} else {
-		$items = array();
-	}
-
-	if((! $update) && (! $load)) {
-
-		// 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.
-
-		$maxheight = get_pconfig(App::$profile['profile_uid'],'system','channel_divmore_height');
-		if(! $maxheight)
-			$maxheight = 400;
-
-		$o .= '<div id="live-channel"></div>' . "\r\n";
-		$o .= "<script> var profile_uid = " . App::$profile['profile_uid'] 
-			. "; var netargs = '?f='; var profile_page = " . App::$pager['page']
-			. "; divmore_height = " . intval($maxheight) . "; </script>\r\n";
-
-		App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
-			'$baseurl' => z_root(),
-			'$pgtype' => 'channel',
-			'$uid' => ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : '0'),
-			'$gid' => '0',
-			'$cid' => '0',
-			'$cmin' => '0',
-			'$cmax' => '0',
-			'$star' => '0',
-			'$liked' => '0',
-			'$conv' => '0',
-			'$spam' => '0',
-			'$nouveau' => '0',
-			'$wall' => '1',
-			'$fh' => '0',
-			'$page' => ((App::$pager['page'] != 1) ? App::$pager['page'] : 1),
-			'$search' => '',
-			'$order' => '',
-			'$list' => ((x($_REQUEST,'list')) ? intval($_REQUEST['list']) : 0),
-			'$file' => '',
-			'$cats' => (($category) ? $category : ''),
-			'$tags' => (($hashtags) ? $hashtags : ''),
-			'$mid' => $mid,
-			'$verb' => '',
-			'$dend' => $datequery,
-			'$dbegin' => $datequery2
-		));
-
-
-	}
-
-	$update_unseen = '';
-
-	if($page_mode === 'list') {
-
-		/**
-		 * in "list mode", only mark the parent item and any like activities as "seen". 
-		 * We won't distinguish between comment likes and post likes. The important thing
-		 * is that the number of unseen comments will be accurate. The SQL to separate the
-		 * comment likes could also get somewhat hairy. 
-		 */
-
-		if($parents_str) {
-			$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
-			$update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) ";
-		}
-	}
-	else {
-		if($parents_str) {
-			$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
-		}
-	}
-
-	if($is_owner && $update_unseen) {
-		$r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
-			intval(local_channel())
-		);
-	}
-
-
-	if($checkjs->disabled()) {
-		$o .= conversation($a,$items,'channel',$update,'traditional');
-	} else {
-		$o .= conversation($a,$items,'channel',$update,$page_mode);
-	}
-
-	if((! $update) || ($checkjs->disabled())) {
-		$o .= alt_pager($a,count($items));
-		if ($mid && $items[0]['title'])
-			App::$page['title'] = $items[0]['title'] . " - " . App::$page['title'];
-	}
-
-	if($mid) 
-		$o .= '<div id="content-complete"></div>';
-
-	return $o;
-}
diff --git a/mod/update_channel.php b/mod/update_channel.php
deleted file mode 100644
index 63a3735ea..000000000
--- a/mod/update_channel.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Module: update_profile
- * Purpose: AJAX synchronisation of profile page
- *
- */
-
-
-require_once('mod/channel.php');
-
-function update_channel_content(&$a) {
-
-	$profile_uid = intval($_GET['p']);
-	$load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0);
-
-	header("Content-type: text/html");
-	echo "<!DOCTYPE html><html><body>\r\n";
-
-	/**
-	 * We can remove this hack once Internet Explorer recognises HTML5 natively
-	 */
-
-	echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
-
-	/**
-	 *
-	 * Grab the page inner contents by calling the content function from the profile module directly, 
-	 * but move any image src attributes to another attribute name. This is because 
-	 * some browsers will prefetch all the images for the page even if we don't need them.
-	 * The only ones we need to fetch are those for new page additions, which we'll discover
-	 * on the client side and then swap the image back.
-	 *
-	 */
-
-	$text = channel_content($a,$profile_uid,$load);
-
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-//	$text = preg_replace($pattern, $replace, $text);
-
-/*
-	if(! $load) {
-		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
-		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
-		$text = preg_replace($pattern, $replace, $text);
-		$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
-		$text = preg_replace($pattern, $replace, $text);
-		$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
-		$text = preg_replace($pattern, $replace, $text);
-    	$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
-    	$text = preg_replace($pattern, $replace, $text);
-	}
-*/
-
-	/**
-	 * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
-	 */
-
-	echo str_replace("\t",'       ',$text);
-	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
-	echo "</body></html>\r\n";
-	killme();
-
-}
\ No newline at end of file
-- 
cgit v1.2.3