cleanup

(cherry picked from commit 0fbd0ca416333ee5f675651be7bce5e82aad27fe)

2 files changed, 0 insertions, 84 deletions

diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
index 598cf28e4..d747e65f3 100644
--- a/Zotlabs/Daemon/Onepoll.php
+++ b/Zotlabs/Daemon/Onepoll.php
@@ -160,50 +160,6 @@ class Onepoll {
 			}
 		}
 
-		/*			if ($fetch_feed) {
-
-						if (strpos($contact['xchan_connurl'], z_root()) === 0) {
-							// local channel - save a network fetch
-							$c = channelx_by_hash($contact['xchan_hash']);
-							if ($c) {
-								$x = [
-									'success' => true,
-									'body'    => json_encode([
-										'success'  => true,
-										'messages' => zot_feed($c['channel_id'], $importer['xchan_hash'], ['mindate' => $last_update])
-									])
-								];
-							}
-						}
-						else {
-							// remote fetch
-
-							$feedurl = str_replace('/poco/', '/zotfeed/', $contact['xchan_connurl']);
-							$feedurl .= '?f=&mindate=' . urlencode($last_update) . '&zid=' . $importer['channel_address'] . '@' . App::get_hostname();
-							$recurse = 0;
-							$x       = z_fetch_url($feedurl, false, $recurse, ['session' => true]);
-						}
-
-						logger('feed_update: ' . print_r($x, true), LOGGER_DATA);
-					}
-
-					if (($x) && ($x['success'])) {
-						$total = 0;
-						logger('onepoll: feed update ' . $contact['xchan_name'] . ' ' . $feedurl);
-
-						$j = json_decode($x['body'], true);
-						if ($j['success'] && $j['messages']) {
-							foreach ($j['messages'] as $message) {
-								$results = process_delivery(['hash' => $contact['xchan_hash']], get_item_elements($message),
-									[['hash' => $importer['xchan_hash']]], false);
-								logger('onepoll: feed_update: process_delivery: ' . print_r($results, true), LOGGER_DATA);
-								$total++;
-							}
-							logger("onepoll: $total messages processed");
-						}
-					}
-		*/
-
 		// update the poco details for this connection
 		$r = q("SELECT xlink_id from xlink where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
 			intval($contact['xchan_hash']),
diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 6f29daec5..e47367036 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -120,45 +120,5 @@ class Zotfeed extends Controller {
 
 			as_return_and_die($ret, $channel);
 		}
-
-		/*
-		$result = array('success' => false);
-
-		$mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : '');
-		if(! $mindate)
-			$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
-
-		if(observer_prohibited()) {
-			$result['message'] = 'Public access denied';
-			json_return_and_die($result);
-		}
-
-		$observer = App::get_observer();
-
-		logger('observer: ' . get_observer_hash(), LOGGER_DEBUG);
-
-		$channel_address = ((argc() > 1) ? argv(1) : '');
-		if($channel_address) {
-			$r = q("select channel_id, channel_name from channel where channel_address = '%s' and channel_removed = 0 limit 1",
-				dbesc(argv(1))
-			);
-		}
-		else {
-			$x = get_sys_channel();
-			if($x)
-				$r = array($x);
-			$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
-		}
-		if(! $r) {
-			$result['message'] = 'Channel not found.';
-			json_return_and_die($result);
-		}
-
-		logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG);
-		$result['project'] = 'Hubzilla';
-		$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate));
-		$result['success'] = true;
-		json_return_and_die($result);
-		*/
 	}
 }