X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=16fde6c351970c0bdad12e468362f2afdc8e2367;hb=aedbb0d627606ff7eb7302e2881c31059b6cc1d9;hp=d4e371c152a678a19a07f308a638a95a4d4b4876;hpb=800694e9b36bc261a671a80b7ca787f27564a7ac;p=friendica.git

diff --git a/mod/network.php b/mod/network.php
index d4e371c152..16fde6c351 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,7 +1,22 @@
 <?php
-
 /**
- * @file mod/network.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
@@ -12,9 +27,7 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -24,8 +37,8 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\Post\Category;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
 use Friendica\Module\Security\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -34,7 +47,7 @@ use Friendica\Util\Strings;
 function network_init(App $a)
 {
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -45,8 +58,8 @@ function network_init(App $a)
 	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
 
 	$cid = 0;
-	if (!empty($_GET['cid'])) {
-		$cid = $_GET['cid'];
+	if (!empty($_GET['contactid'])) {
+		$cid = $_GET['contactid'];
 		$_GET['nets'] = '';
 		$group_id = 0;
 	}
@@ -200,7 +213,7 @@ function network_query_get_sel_group(App $a)
 }
 
 /**
- * @brief Sets the pager data and returns SQL
+ * Sets the pager data and returns SQL
  *
  * @param App     $a      The global App
  * @param Pager   $pager
@@ -215,14 +228,12 @@ function networkPager(App $a, Pager $pager, $update)
 		return ' LIMIT 100';
 	}
 
-	//  check if we serve a mobile device and get the user settings
-	//  accordingly
 	if (DI::mode()->isMobile()) {
-		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network');
-		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+			DI::config()->get('system', 'itemspage_network_mobile'));
 	} else {
-		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network');
-		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		$itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+			DI::config()->get('system', 'itemspage_network'));
 	}
 
 	//  now that we have the user settings, see if the theme forces
@@ -237,7 +248,7 @@ function networkPager(App $a, Pager $pager, $update)
 }
 
 /**
- * @brief Sets items as seen
+ * Sets items as seen
  *
  * @param array $condition The array with the SQL condition
  * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -256,7 +267,7 @@ function networkSetSeen($condition)
 }
 
 /**
- * @brief Create the conversation HTML
+ * Create the conversation HTML
  *
  * @param App     $a      The global App
  * @param array   $items  Items of the conversation
@@ -278,7 +289,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
 		$items = [];
 	}
 
-	$o = conversation($a, $items, $pager, $mode, $update, false, $ordering, local_user());
+	$o = conversation($a, $items, $mode, $update, false, $ordering, local_user());
 
 	if (!$update) {
 		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
@@ -315,7 +326,7 @@ function network_content(App $a, $update = 0, $parent = 0)
 }
 
 /**
- * @brief Get the network content in flat view
+ * Get the network content in flat view
  *
  * @param App     $a      The global App
  * @param integer $update Used for the automatic reloading
@@ -358,35 +369,35 @@ function networkFlatView(App $a, $update = 0)
 
 		$o .= status_editor($a, $x);
 
-		if (!Config::get('theme', 'hide_eventlist')) {
+		if (!DI::config()->get('theme', 'hide_eventlist')) {
 			$o .= Profile::getBirthdays();
 			$o .= Profile::getEventsReminderHTML();
 		}
 	}
 
-	$pager = new Pager(DI::args()->getQueryString());
+	$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
 	networkPager($a, $pager, $update);
 
-	$item_params = ['order' => ['id' => true]];
 
 	if (strlen($file)) {
-		$term_condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?",
-			$file, Term::OBJECT_TYPE_POST, Term::FILE, local_user()];
-		$term_params = ['order' => ['tid' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
-		$result = DBA::select('term', ['oid'], $term_condition, $term_params);
+		$item_params = ['order' => ['uri-id' => true]];
+		$term_condition = ['name' => $file, 'type' => Category::FILE, 'uid' => local_user()];
+		$term_params = ['order' => ['uri-id' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+		$result = DBA::select('category-view', ['uri-id'], $term_condition, $term_params);
 
 		$posts = [];
 		while ($term = DBA::fetch($result)) {
-			$posts[] = $term['oid'];
+			$posts[] = $term['uri-id'];
 		}
 		DBA::close($result);
 
 		if (count($posts) == 0) {
 			return '';
 		}
-		$item_condition = ['uid' => local_user(), 'id' => $posts];
+		$item_condition = ['uid' => local_user(), 'uri-id' => $posts];
 	} else {
+		$item_params = ['order' => ['id' => true]];
 		$item_condition = ['uid' => local_user()];
 		$item_params['limit'] = [$pager->getStart(), $pager->getItemsPerPage()];
 
@@ -401,7 +412,7 @@ function networkFlatView(App $a, $update = 0)
 }
 
 /**
- * @brief Get the network content in threaded view
+ * Get the network content in threaded view
  *
  * @param  App     $a      The global App
  * @param  integer $update Used for the automatic reloading
@@ -455,12 +466,12 @@ function networkThreadedView(App $a, $update, $parent)
 
 	$o = '';
 
-	$cid   = intval($_GET['cid']   ?? 0);
-	$star  = intval($_GET['star']  ?? 0);
-	$bmark = intval($_GET['bmark'] ?? 0);
-	$conv  = intval($_GET['conv']  ?? 0);
+	$cid   = intval($_GET['contactid'] ?? 0);
+	$star  = intval($_GET['star']      ?? 0);
+	$bmark = intval($_GET['bmark']     ?? 0);
+	$conv  = intval($_GET['conv']      ?? 0);
 	$order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'activity');
-	$nets  =        $_GET['nets']  ?? '';
+	$nets  =        $_GET['nets']      ?? '';
 
 	$allowedCids = [];
 	if ($cid) {
@@ -490,13 +501,6 @@ function networkThreadedView(App $a, $update, $parent)
 		$tabs = network_tabs($a);
 		$o .= $tabs;
 
-		if ($gid && ($t = Contact::getOStatusCountByGroupId($gid)) && !DI::pConfig()->get(local_user(), 'system', 'nowarn_insecure')) {
-			notice(L10n::tt("Warning: This group contains %s member from a network that doesn't allow non public messages.",
-				"Warning: This group contains %s members from a network that doesn't allow non public messages.",
-				$t) . EOL);
-			notice(L10n::t("Messages in this group won't be send to these receivers.").EOL);
-		}
-
 		Nav::setSelected('network');
 
 		$content = '';
@@ -561,7 +565,7 @@ function networkThreadedView(App $a, $update, $parent)
 			if ($update) {
 				exit();
 			}
-			notice(L10n::t('No such group') . EOL);
+			notice(DI::l10n()->t('No such group') . EOL);
 			DI::baseUrl()->redirect('network/0');
 			// NOTREACHED
 		}
@@ -582,11 +586,11 @@ function networkThreadedView(App $a, $update, $parent)
 			$sql_extra3 .= " OR (`thread`.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '" . Strings::protectSprintf('%<' . intval($gid) . '>%') . "' AND `temp1`.`private`))";
 		} else {
 			$sql_extra3 .= " AND false ";
-			info(L10n::t('Group is empty'));
+			info(DI::l10n()->t('Group is empty'));
 		}
 
 		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('section_title.tpl'), [
-			'$title' => L10n::t('Group: %s', $group['name'])
+			'$title' => DI::l10n()->t('Group: %s', $group['name'])
 		]) . $o;
 	} elseif ($cid) {
 		$fields = ['id', 'name', 'network', 'writable', 'nurl',
@@ -610,18 +614,14 @@ function networkThreadedView(App $a, $update, $parent)
 				'contacts' => $entries,
 				'id' => 'network',
 			]) . $o;
-
-			if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !DI::pConfig()->get(local_user(),'system','nowarn_insecure')) {
-				notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL);
-			}
 		} else {
-			notice(L10n::t('Invalid contact.') . EOL);
+			notice(DI::l10n()->t('Invalid contact.') . EOL);
 			DI::baseUrl()->redirect('network');
 			// NOTREACHED
 		}
 	}
 
-	if (!$gid && !$cid && !$update && !Config::get('theme', 'hide_eventlist')) {
+	if (!$gid && !$cid && !$update && !DI::config()->get('theme', 'hide_eventlist')) {
 		$o .= Profile::getBirthdays();
 		$o .= Profile::getEventsReminderHTML();
 	}
@@ -656,7 +656,7 @@ function networkThreadedView(App $a, $update, $parent)
 		$sql_range = '';
 	}
 
-	$pager = new Pager(DI::args()->getQueryString());
+	$pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
 	$pager_sql = networkPager($a, $pager, $update);
 
@@ -704,12 +704,12 @@ function networkThreadedView(App $a, $update, $parent)
 		} else {
 			// Load all unseen items
 			$sql_extra4 = "`item`.`unseen`";
-			if (Config::get("system", "like_no_comment")) {
+			if (DI::config()->get("system", "like_no_comment")) {
 				$sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
 			}
 			if ($order === 'post') {
 				// Only show toplevel posts when updating posts in this order mode
-				$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
+				$sql_extra4 .= " AND `item`.`gravity` = " . GRAVITY_PARENT;
 			}
 		}
 
@@ -786,15 +786,21 @@ function networkThreadedView(App $a, $update, $parent)
 			$top_limit = DateTimeFormat::utcNow();
 		}
 
+		// Handle bad performance situations when the distance between top and bottom is too high
+		// See issue https://github.com/friendica/friendica/issues/8619
+		if (strtotime($top_limit) - strtotime($bottom_limit) > 86400) {
+			// Set the bottom limit to one day in the past at maximum
+			$bottom_limit = DateTimeFormat::utc(date('c', strtotime($top_limit) - 86400));
+		}
+
 		$items = DBA::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
-			STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
-				(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
-			ON `item`.`id` = `term`.`oid`
+			STRAIGHT_JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` IN
+				(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `uid` = 0) AS `tag-search`
+			ON `item`.`uri-id` = `tag-search`.`uri-id`
 			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
 			WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? AND `item`.`gravity` = ?
 				AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets,
-			local_user(), TERM_OBJ_POST, TERM_HASHTAG,
-			$top_limit, $bottom_limit, GRAVITY_PARENT);
+			local_user(), $top_limit, $bottom_limit, GRAVITY_PARENT);
 
 		$data = DBA::toArray($items);
 
@@ -871,7 +877,7 @@ function networkThreadedView(App $a, $update, $parent)
 }
 
 /**
- * @brief Get the network tabs menu
+ * Get the network tabs menu
  *
  * @param App $a The global App
  * @return string Html of the networktab
@@ -881,7 +887,7 @@ function network_tabs(App $a)
 {
 	// item filter tabs
 	/// @TODO fix this logic, reduce duplication
-	/// $a->page['content'] .= '<div class="tabs-wrapper">';
+	/// DI::page()['content'] .= '<div class="tabs-wrapper">';
 	list($no_active, $all_active, $post_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
 
 	// if no tabs are selected, defaults to activitys
@@ -892,45 +898,45 @@ function network_tabs(App $a)
 	$cmd = DI::args()->getCommand();
 
 	$def_param = [];
-	if (!empty($_GET['cid'])) {
-		$def_param['cid'] = $_GET['cid'];
+	if (!empty($_GET['contactid'])) {
+		$def_param['contactid'] = $_GET['contactid'];
 	}
 
 	// tabs
 	$tabs = [
 		[
-			'label'	=> L10n::t('Latest Activity'),
+			'label'	=> DI::l10n()->t('Latest Activity'),
 			'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'activity'])),
 			'sel'	=> $all_active,
-			'title'	=> L10n::t('Sort by latest activity'),
+			'title'	=> DI::l10n()->t('Sort by latest activity'),
 			'id'	=> 'activity-order-tab',
 			'accesskey' => 'e',
 		],
 		[
-			'label'	=> L10n::t('Latest Posts'),
+			'label'	=> DI::l10n()->t('Latest Posts'),
 			'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['order' => 'post'])),
 			'sel'	=> $post_active,
-			'title'	=> L10n::t('Sort by post received date'),
+			'title'	=> DI::l10n()->t('Sort by post received date'),
 			'id'	=> 'post-order-tab',
 			'accesskey' => 't',
 		],
 	];
 
 	$tabs[] = [
-		'label'	=> L10n::t('Personal'),
+		'label'	=> DI::l10n()->t('Personal'),
 		'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['conv' => true])),
 		'sel'	=> $conv_active,
-		'title'	=> L10n::t('Posts that mention or involve you'),
+		'title'	=> DI::l10n()->t('Posts that mention or involve you'),
 		'id'	=> 'personal-tab',
 		'accesskey' => 'r',
 	];
 
 	if (Feature::isEnabled(local_user(), 'new_tab')) {
 		$tabs[] = [
-			'label'	=> L10n::t('New'),
+			'label'	=> DI::l10n()->t('New'),
 			'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['new' => true])),
 			'sel'	=> $new_active,
-			'title'	=> L10n::t('Activity Stream - by date'),
+			'title'	=> DI::l10n()->t('Activity Stream - by date'),
 			'id'	=> 'activitiy-by-date-tab',
 			'accesskey' => 'w',
 		];
@@ -938,20 +944,20 @@ function network_tabs(App $a)
 
 	if (Feature::isEnabled(local_user(), 'link_tab')) {
 		$tabs[] = [
-			'label'	=> L10n::t('Shared Links'),
+			'label'	=> DI::l10n()->t('Shared Links'),
 			'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['bmark' => true])),
 			'sel'	=> $bookmarked_active,
-			'title'	=> L10n::t('Interesting Links'),
+			'title'	=> DI::l10n()->t('Interesting Links'),
 			'id'	=> 'shared-links-tab',
 			'accesskey' => 'b',
 		];
 	}
 
 	$tabs[] = [
-		'label'	=> L10n::t('Starred'),
+		'label'	=> DI::l10n()->t('Starred'),
 		'url'	=> $cmd . '?' . http_build_query(array_merge($def_param, ['star' => true])),
 		'sel'	=> $starred_active,
-		'title'	=> L10n::t('Favourite Posts'),
+		'title'	=> DI::l10n()->t('Favourite Posts'),
 		'id'	=> 'starred-posts-tab',
 		'accesskey' => 'm',
 	];