X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fnetwork.php;h=23e03d03b0b724e133359050cdfff3fee13c383b;hb=9cd9ad647d0a81d29ee3091b99776ee63a27e622;hp=0002743ab0dff1d8714dba5cee9e919d29a187d3;hpb=24b5396b1d1e0c63b6dcc4d6d0ab7b73fb9d4cd8;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index 0002743ab0..23e03d03b0 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -48,8 +48,6 @@ function network_init(App $a)
 		return;
 	}
 
-	Hook::add('head', __FILE__, 'network_infinite_scroll_head');
-
 	$is_a_date_query = false;
 
 	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
@@ -287,10 +285,17 @@ function network_content(App $a, $update = 0, $parent = 0)
 	$arr = ['query' => DI::args()->getQueryString()];
 	Hook::callAll('network_content_init', $arr);
 
+	if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll') && ($_GET['mode'] ?? '') != 'minimal') {
+		$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+		$o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+	} else {
+		$o = '';
+	}
+
 	if (!empty($_GET['file'])) {
-		$o = networkFlatView($a, $update);
+		$o .= networkFlatView($a, $update);
 	} else {
-		$o = networkThreadedView($a, $update, $parent);
+		$o .= networkThreadedView($a, $update, $parent);
 	}
 
 	if (!$update && ($o === '')) {
@@ -499,24 +504,24 @@ function networkThreadedView(App $a, $update, $parent)
 		$o .= status_editor($a, $x);
 	}
 
-	$condition1 = ['uid' => local_user()];
-	$condition2 = [];
+	$conditionFields = ['uid' => local_user()];
+	$conditionStrings = [];
 
 	if ($star) {
-		$condition1['starred'] = true;
+		$conditionFields['starred'] = true;
 	}
 	if ($conv) {
-		$condition1['mention'] = true;
+		$conditionFields['mention'] = true;
 	}
 	if ($nets) {
-		$condition1['network'] = $nets;
+		$conditionFields['network'] = $nets;
 	}
 
 	if ($datequery) {
-		$condition2 = DBA::mergeConditions($condition2, ["`received` <= ? ", DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get())]);
+		$conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` <= ? ", DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get())]);
 	}
 	if ($datequery2) {
-		$condition2 = DBA::mergeConditions($condition2, ["`received` >= ? ", DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get())]);
+		$conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` >= ? ", DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get())]);
 	}
 
 	if ($gid) {
@@ -530,7 +535,7 @@ function networkThreadedView(App $a, $update, $parent)
 			// NOTREACHED
 		}
 
-		$condition2 = DBA::mergeConditions($condition2, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", $gid]);
+		$conditionStrings = DBA::mergeConditions($conditionStrings, ["`contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", $gid]);
 
 		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
 			'$title' => DI::l10n()->t('Group: %s', $group['name'])
@@ -538,7 +543,7 @@ function networkThreadedView(App $a, $update, $parent)
 	} elseif ($cid) {
 		$contact = Contact::getById($cid);
 		if (DBA::isResult($contact)) {
-			$condition1['contact-id'] = $cid;
+			$conditionFields['contact-id'] = $cid;
 
 			$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [
 				'contacts' => [ModuleContact::getContactTemplateVars($contact)],
@@ -575,22 +580,22 @@ function networkThreadedView(App $a, $update, $parent)
 	switch ($order_mode) {
 		case 'received':
 			if ($last_received != '') {
-				$condition2 = DBA::mergeConditions($condition2, ["`received` < ?", $last_received]);
+				$conditionStrings = DBA::mergeConditions($conditionStrings, ["`received` < ?", $last_received]);
 			}
 			break;
 		case 'commented':
 			if ($last_commented != '') {
-				$condition2 = DBA::mergeConditions($condition2, ["`commented` < ?", $last_commented]);
+				$conditionStrings = DBA::mergeConditions($conditionStrings, ["`commented` < ?", $last_commented]);
 			}
 			break;
 		case 'created':
 			if ($last_created != '') {
-				$condition2 = DBA::mergeConditions($condition2, ["`created` < ?", $last_created]);
+				$conditionStrings = DBA::mergeConditions($conditionStrings, ["`created` < ?", $last_created]);
 			}
 			break;
 		case 'uriid':
 			if ($last_uriid > 0) {
-				$condition2 = DBA::mergeConditions($condition2, ["`uri-id` < ?", $last_uriid]);
+				$conditionStrings = DBA::mergeConditions($conditionStrings, ["`uri-id` < ?", $last_uriid]);
 			}
 			break;
 	}
@@ -599,24 +604,23 @@ function networkThreadedView(App $a, $update, $parent)
 	if ($update) {
 		if (!empty($parent)) {
 			// Load only a single thread
-			$condition1['id'] = $parent;
+			$conditionFields['parent'] = $parent;
 		} elseif ($order === 'post') {
 			// Only load new toplevel posts
-			$condition1['unseen'] = true;
-			$condition1['gravity'] = GRAVITY_PARENT;
+			$conditionFields['unseen'] = true;
+			$conditionFields['gravity'] = GRAVITY_PARENT;
 		} else {
 			// Load all unseen items
-			$condition1['unseen'] = true;
+			$conditionFields['unseen'] = true;
 		}
 
-		$condition = DBA::mergeConditions($condition1, $condition2);
 		$params = ['order' => [$order_mode => true], 'limit' => 100];
-		$r = DBA::selectToArray('network-item-view', [], $condition, $params);
+		$table = 'network-item-view';
 	} else {
-		$condition = DBA::mergeConditions($condition1, $condition2);
 		$params = ['order' => [$order_mode => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-		$r = DBA::selectToArray('network-thread-view', [], $condition, $params);
+		$table = 'network-thread-view';
 	}
+	$r = DBA::selectToArray($table, [], DBA::mergeConditions($conditionFields, $conditionStrings), $params);
 
 	return $o . network_display_post($a, $pager, (!$gid && !$cid && !$star), $update, $ordering, $r);
 }
@@ -629,16 +633,14 @@ function network_display_post($a, $pager, $mark_all, $update, $ordering, $items)
 		$parents_arr = [];
 
 		foreach ($items as $item) {
-			if (!in_array($item['item_id'], $parents_arr) && ($item['item_id'] > 0)) {
-				$parents_arr[] = $item['item_id'];
+			if (!in_array($item['parent'], $parents_arr) && ($item['parent'] > 0)) {
+				$parents_arr[] = $item['parent'];
 			}
 		}
 		$parents_str = implode(', ', $parents_arr);
 	}
 
-	$query_string = DI::args()->getQueryString();
-
-	$pager->setQueryString($query_string);
+	$pager->setQueryString(DI::args()->getQueryString());
 
 	// We aren't going to try and figure out at the item, group, and page
 	// level which items you've seen and which you haven't. If you're looking
@@ -735,34 +737,3 @@ function network_tabs(App $a)
 
 	// --- end item filter tabs
 }
-
-/**
- * Network hook into the HTML head to enable infinite scroll.
- *
- * Since the HTML head is built after the module content has been generated, we need to retrieve the base query string
- * of the page to make the correct asynchronous call. This is obtained through the Pager that was instantiated in
- * networkThreadedView or networkFlatView.
- *
- * @param App     $a
- * @param  string $htmlhead The head tag HTML string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @global Pager  $pager
- */
-function network_infinite_scroll_head(App $a, &$htmlhead)
-{
-	/// @TODO this will have to be converted to a static property of the converted Module\Network class
-	/**
-	 * @var $pager Pager
-	 */
-	global $pager;
-
-	if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')
-		&& ($_GET['mode'] ?? '') != 'minimal'
-	) {
-		$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
-		$htmlhead .= Renderer::replaceMacros($tpl, [
-			'$pageno'     => $pager->getPage(),
-			'$reload_uri' => $pager->getBaseQueryString()
-		]);
-	}
-}