Merge https://github.com/friendica/friendica-addons into apull

forumlist/forumlist.php

@@ -99,7 +99,7 @@ function forumlist_profile_advanced($a,&$b) {
 
 	$randomise = true;
 
-	$contacts = forumlist_getforumlist($a->user['uid'],false,$randomise);
+	$contacts = forumlist_getpage($a->user['uid'],false,$randomise);
 
 	$total_shown = 0;
 	$more = false;

remote_permissions/README.md

@@ -0,0 +1,8 @@
+The Remote Permissions plugin enables recipients of private posts to see who else has received the post. This can be beneficial on community servers where people may want to modify the way they speak depending on who can see their comments to the post.
+
+Note that since Friendica is federated, the local hub may have posts that originated elsewhere. In that case, the plugin has no way of knowing all the recipients of the post, and it must settle for finding out who else can see it on the local hub.
+
+The hub admin can specify one of two behaviors for this plugin:
+
+* **Global:** every private post on the local hub will show all recipients (or at least the ones it can discover) of the post to any other users on the local hub
+* **Individual:** only private posts from those users on the local hub who "opt-in" will show the post recipients. None of the private posts that originated elsewhere will show even partial lists of post recipients

remote_permissions/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

remote_permissions/remote_permissions.php

@@ -0,0 +1,206 @@
+<?php
+/**
+ * Name: Remote Permissions
+ * Description: Allow the recipients of private posts to see who else can see the post by clicking the lock icon
+ * Version: 1.0
+ * Author: Zach <https://f.shmuz.in/profile/techcity>
+ * 
+ */
+
+
+function remote_permissions_install() {
+	register_hook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+	register_hook('plugin_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+	register_hook('plugin_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+}
+
+function remote_permissions_uninstall() {
+	unregister_hook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+	unregister_hook('plugin_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+	unregister_hook('plugin_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+}
+
+function remote_permissions_settings(&$a,&$o) {
+
+	if(! local_user())
+		return;
+
+	$global = get_config("remote_perms", "global");
+	if($global == 1)
+		return;
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$remote_perms = get_pconfig(local_user(),'remote_perms','show');
+	
+	/* Add some HTML to the existing form */
+
+	$t = file_get_contents( $a->get_baseurl() . "/addon/remote_permissions/settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$remote_perms_title' => t('Remote Permissions Settings'),
+		'$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'),
+		'$checked' => (($remote_perms == 1) ? 'checked="checked"' : ''),
+		'$submit' => t('Submit')
+	));
+
+}
+
+function remote_permissions_settings_post($a,$post) {
+	if(! local_user() || (! x($_POST,'remote-perms-submit')))
+		return;
+
+	set_pconfig(local_user(),'remote_perms','show',intval($_POST['remote-perms']));
+	info( t('Remote Permissions settings updated.') . EOL);
+}
+
+function remote_permissions_content($a, $item_copy) {
+
+	if($item_copy['uid'] != local_user())
+		return;
+
+	if(get_config('remote_perms','global') == 0) {
+		// Admin has set Individual choice. We need to find
+		// the original poster. First, get the contact's info
+		$r = q("SELECT nick, url FROM contact WHERE id = %d LIMIT 1",
+		       intval($item_copy['contact-id'])
+		);
+		if(! $r) 
+			return;
+
+		// Find out if the contact lives here
+		$baseurl = $a->get_baseurl();
+		$baseurl = substr($baseurl, strpos($baseurl, '://') + 3);
+		if(strpos($r[0]['url'], $baseurl) === false)
+			return;
+
+		// The contact lives here. Get his/her user info
+		$nick = $r[0]['nick'];
+		$r = q("SELECT uid FROM user WHERE nickname = '%s' LIMIT 1",
+		       dbesc($nick)
+		);
+		if(! $r)
+			return;
+
+		if(get_pconfig($r[0]['uid'],'remote_perms','show') == 0)
+			return;
+	}
+
+	if(($item_copy['private'] == 1) && (! strlen($item_copy['allow_cid'])) && (! strlen($item_copy['allow_gid']))
+		&& (! strlen($item_copy['deny_cid'])) && (! strlen($item_copy['deny_gid']))) {
+
+		$allow_names = array();
+
+		// Check for the original post here -- that's the only way
+		// to definitely get all of the recipients
+
+		if($item_copy['uri'] === $item_copy['parent-uri']) {
+			// Lockview for a top-level post
+			$r = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid FROM item WHERE uri = '%s' AND type = 'wall' LIMIT 1",
+				   dbesc($item_copy['uri'])
+			);
+		}
+		else {
+			// Lockview for a comment
+			$r = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid FROM item WHERE uri = '%s'
+			        AND parent = ( SELECT id FROM item WHERE uri = '%s' AND type = 'wall' ) LIMIT 1",
+				   dbesc($item_copy['uri']),
+				   dbesc($item_copy['parent-uri'])
+			);
+		}
+		if($r) {
+
+			$item = $r[0];
+
+			$allowed_users = expand_acl($item['allow_cid']);
+			$allowed_groups = expand_acl($item['allow_gid']);
+			$deny_users = expand_acl($item['deny_cid']);
+			$deny_groups = expand_acl($item['deny_gid']);
+
+			$o = t('Visible to:') . '<br />';
+			$allow = array();
+			$deny = array();
+
+			if(count($allowed_groups)) {
+				$r = q("SELECT DISTINCT `contact-id` FROM group_member WHERE gid IN ( %s )",
+					dbesc(implode(', ', $allowed_groups))
+				);
+				foreach($r as $rr) 
+					$allow[] = $rr['contact-id'];
+			}
+			$allow = array_unique($allow + $allowed_users);
+
+			if(count($deny_groups)) {
+				$r = q("SELECT DISTINCT `contact-id` FROM group_member WHERE gid IN ( %s )",
+					dbesc(implode(', ', $deny_groups))
+				);
+				foreach($r as $rr) 
+					$deny[] = $rr['contact-id'];
+			}
+			$deny = $deny + $deny_users;
+
+			if($allow)
+			{
+				$r = q("SELECT name FROM contact WHERE id IN ( %s )",
+					   dbesc(implode(', ', array_diff($allow, $deny)))
+				);
+				foreach($r as $rr)
+					$allow_names[] = $rr['name'];
+			}
+		}
+		else {
+			// We don't have the original post. Let's try for the next best thing:
+			// checking who else has the post on our own server. Note that comments
+			// that were sent to Diaspora and were relayed to others on our server
+			// will have different URIs than the original. We can match the GUID for
+			// those
+			$r = q("SELECT `uid` FROM item WHERE uri = '%s' OR guid = '%s'",
+				   dbesc($item_copy['uri']),
+			       dbesc($item_copy['guid'])
+			);
+			if(! $r)
+				return;
+
+			$allow = array();
+			foreach($r as $rr)
+				$allow[] = $rr['uid'];
+
+			$r = q("SELECT username FROM user WHERE uid IN ( %s )",
+				dbesc(implode(', ', $allow))
+			);
+			if(! $r)
+				return;
+
+			$o = t('Visible to') . ' (' . t('may only be a partial list') . '):<br />';
+
+			foreach($r as $rr)
+				$allow_names[] = $rr['username'];
+		}
+
+		// Sort the names alphabetically, case-insensitive
+		natcasesort($allow_names);
+		echo $o . implode(', ', $allow_names);
+		killme();
+	}
+
+	return;
+}
+
+function remote_permissions_plugin_admin(&$a, &$o){
+	$t = file_get_contents( $a->get_baseurl() . "/addon/remote_permissions/admin.tpl" );
+	$o = replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'),  get_config('remote_perms', 'global') == 1),
+		'$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'),  get_config('remote_perms', 'global') == 0)
+	));
+}
+
+function remote_permissions_plugin_admin_post(&$a){
+	$choice	=	((x($_POST,'remotepermschoice'))		? notags(trim($_POST['remotepermschoice']))	: '');
+	set_config('remote_perms','global',($choice == 1 ? 1 : 0));
+	info( t('Settings updated.'). EOL );
+}
+

remote_permissions/settings.css

@@ -0,0 +1,16 @@
+
+
+
+#remote-perms-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+	margin-right: 20px;
+	text-align: justify;
+}
+
+#remote-perms {
+	float: left;
+}
+
+

remote_permissions/settings.tpl

@@ -0,0 +1,8 @@
+	<div class="settings-block">
+	<h3>$remote_perms_title</h3>
+	<div id="remote-perms-wrapper">
+	<label id="remote-perms-label" for="remote-perms">$remote_perms_label</label>
+	<input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" $checked />
+	</div><div class="clear"></div>
+	<div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="$submit" /></div></div>
+