Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

1 files changed, 1 insertions, 41 deletions

diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 2566924aa..e47367036 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -19,7 +19,7 @@ class Zotfeed extends Controller {
 				killme();
 			}
 
-			$channel = ((argv(1)) ? channelx_by_nick(argv(1)) : get_sys_channel());
+			$channel = channelx_by_nick(argv(1));
 			if (!$channel) {
 				killme();
 			}
@@ -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);
-		*/
 	}
 }