X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=4b755e18ce6ebc58eb5b09b210029175e53b9c64;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=138873be575d3a30810497df94583690f2a42cb4;hpb=e96dbbe7f7bd4b18930cf3e2f62b8d58e02e86fb;p=friendica.git

diff --git a/mod/community.php b/mod/community.php
index 138873be57..4b755e18ce 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -5,28 +5,35 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 
-function community_init(App $a) {
+function community_init(App $a)
+{
 	if (!local_user()) {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
 }
 
-function community_content(App $a, $update = 0) {
+function community_content(App $a, $update = 0)
+{
 	$o = '';
 
-	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 		notice(t('Public access denied.') . EOL);
 		return;
 	}
 
-	$page_style = Config::get('system','community_page_style');
+	$page_style = Config::get('system', 'community_page_style');
 
 	if ($a->argc > 1) {
 		$content = $a->argv[1];
 	} else {
-		// When only the global community is allowed, we use this as default
-		$content = $page_style == CP_GLOBAL_COMMUNITY ? 'global' : 'local';
+		if (!empty(Config::get('system','singleuser'))) {
+			// On single user systems only the global page does make sense
+			$content = 'global';
+		} else {
+			// When only the global community is allowed, we use this as default
+			$content = $page_style == CP_GLOBAL_COMMUNITY ? 'global' : 'local';
+		}
 	}
 
 	if (!in_array($content, ['local', 'global'])) {
@@ -57,16 +64,59 @@ function community_content(App $a, $update = 0) {
 	require_once 'include/conversation.php';
 
 	if (!$update) {
+		$tabs = [];
+
+		if ((local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(Config::get('system','singleuser'))) {
+			$tabs[] = array(
+				'label' => t('Community'),
+				'url' => 'community/local',
+				'sel' => $content == 'local' ? 'active' : '',
+				'title' => t('Posts from local users on this server'),
+				'id' => 'community-local-tab',
+				'accesskey' => 'l'
+			);
+		}
+
+		if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) {
+			$tabs[] = array(
+				'label' => t('Global Timeline'),
+				'url' => 'community/global',
+				'sel' => $content == 'global' ? 'active' : '',
+				'title' => t('Posts from users of the federated network'),
+				'id' => 'community-global-tab',
+				'accesskey' => 'g'
+			);
+		}
+
+		$tab_tpl = get_markup_template('common_tabs.tpl');
+		$o .= replace_macros($tab_tpl, array('$tabs' => $tabs));
+
 		nav_set_selected('community');
+
+		// We need the editor here to be able to reshare an item.
+		if (local_user()) {
+			$x = array(
+				'is_owner' => true,
+				'allow_location' => $a->user['allow_location'],
+				'default_location' => $a->user['default-location'],
+				'nickname' => $a->user['nickname'],
+				'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
+				'acl' => populate_acl($a->user, true),
+				'bang' => '',
+				'visitor' => 'block',
+				'profile_uid' => local_user(),
+			);
+			$o .= status_editor($a, $x, 0, true);
+		}
 	}
 
 	if (Config::get('system', 'comment_public')) {
 		// check if we serve a mobile device and get the user settings
 		// accordingly
 		if ($a->is_mobile) {
-			$itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network', 20);
+			$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20);
 		} else {
-			$itemspage_network = PConfig::get(local_user(),'system','itemspage_network', 40);
+			$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40);
 		}
 
 		// now that we have the user settings, see if the theme forces
@@ -85,7 +135,7 @@ function community_content(App $a, $update = 0) {
 		return $o;
 	}
 
-	$maxpostperauthor = Config::get('system','max_author_posts_community_page');
+	$maxpostperauthor = (int) Config::get('system', 'max_author_posts_community_page');
 
 	if (($maxpostperauthor != 0) && ($content == 'local')) {
 		$count = 1;
@@ -94,7 +144,7 @@ function community_content(App $a, $update = 0) {
 		$s = array();
 
 		do {
-			foreach ($r AS $row=>$item) {
+			foreach ($r as $item) {
 				if ($previousauthor == $item["author-link"]) {
 					++$numposts;
 				} else {
@@ -102,49 +152,52 @@ function community_content(App $a, $update = 0) {
 				}
 				$previousauthor = $item["author-link"];
 
-				if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
+				if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) {
 					$s[] = $item;
 				}
 			}
-			if (sizeof($s) < $a->pager['itemspage']) {
+			if (count($s) < $a->pager['itemspage']) {
 				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content);
 			}
-		} while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
+		} while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0));
 	} else {
 		$s = $r;
 	}
 
 	$o .= conversation($a, $s, 'community', $update);
 
-	$o .= alt_pager($a, count($r));
+	if (!$update) {
+		$o .= alt_pager($a, count($r));
+	}
 
 	$t = get_markup_template("community.tpl");
 	return replace_macros($t, array(
 		'$content' => $o,
-		'$header' => $content == 'global' ? t("Global Timeline") : t("Community"),
+		'$header' => '',
 		'$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
 		'$global_community_hint' => t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.")
 	));
 }
 
-function community_getitems($start, $itemspage, $content) {
+function community_getitems($start, $itemspage, $content)
+{
 	if ($content == 'local') {
-		$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
+		$r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
 			INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
 			AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''".
-			item_joins()." AND `contact`.`self`
+			AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''" .
+			item_joins() . " AND `contact`.`self`
 			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
 			AND NOT `thread`.`private` AND `thread`.`wall`
-			ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
+			ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
 		);
 		return dba::inArray($r);
 	} elseif ($content == 'global') {
-		$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
-			INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
-			"WHERE `thread`.`uid` = 0 AND `verb` = ?
-			ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
+		$r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
+			INNER JOIN `item` ON `item`.`id` = `thread`.`iid` " . item_joins() .
+				"WHERE `thread`.`uid` = 0 AND `verb` = ?
+			ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage),
 			ACTIVITY_POST
 		);
 		return dba::inArray($r);