Merge remote-tracking branch 'upstream/develop' into ap-forum

src/Console/ServerBlock.php

@@ -48,14 +48,18 @@ class ServerBlock extends Console
 		$help = <<<HELP
 console serverblock - Manage blocked server domain patterns
 Usage
-	bin/console serverblock [-h|--help|-?] [-v]
-	bin/console serverblock add <pattern> <reason> [-h|--help|-?] [-v]
-	bin/console serverblock remove <pattern> [-h|--help|-?] [-v]
+    bin/console serverblock [-h|--help|-?] [-v]
+    bin/console serverblock add <pattern> <reason> [-h|--help|-?] [-v]
+    bin/console serverblock remove <pattern> [-h|--help|-?] [-v]
+    bin/console serverblock export <filename>
+    bin/console serverblock import <filename>
 
 Description
-	With this tool, you can list the current blocked server domain patterns
+    With this tool, you can list the current blocked server domain patterns
     or you can add / remove a blocked server domain pattern from the list.
-    
+    Using the export and import options you can share your server blocklist
+    with other node admins by CSV files.
+
     Patterns are case-insensitive shell wildcard comprising the following special characters:
     - * : Any number of characters
     - ? : Any single character
@@ -87,6 +91,10 @@ HELP;
 				return $this->addBlockedServer($this->config);
 			case 'remove':
 				return $this->removeBlockedServer($this->config);
+			case 'export':
+				return $this->exportBlockedServers($this->config);
+			case 'import':
+				return $this->importBlockedServers($this->config);
 			default:
 				throw new CommandArgsException('Unknown command.');
 				break;
@@ -94,10 +102,73 @@ HELP;
 	}
 
 	/**
-	 * Prints the whole list of blocked domains including the reason
+	 * Exports the list of blocked domains including the reason for the
+	 * block to a CSV file.
 	 *
 	 * @param IConfig $config
 	 */
+	private function exportBlockedServers(IConfig $config)
+	{
+		$filename = $this->getArgument(1);
+		$blocklist = $config->get('system', 'blocklist', []);
+		$fp = fopen($filename, 'w');
+		if (!$fp) {
+			throw new Exception(sprintf('The file "%s" could not be created.', $filename));
+		}
+		foreach ($blocklist as $domain) {
+			fputcsv($fp, $domain);
+		}
+	}
+	/**
+	 * Imports a list of domains and a reason for the block from a CSV
+	 * file, e.g. created with the export function.
+	 *
+	 * @param IConfig $config
+	 */
+	private function importBlockedServers(IConfig $config)
+	{
+		$filename = $this->getArgument(1);
+		$currBlockList = $config->get('system', 'blocklist', []);
+		$newBlockList = [];
+		if (($fp = fopen($filename, 'r')) !== false) {
+			while (($data = fgetcsv($fp, 1000, ',')) !== false) {
+				$domain = $data[0];
+				if (count($data) == 0) {
+					$reason = self::DEFAULT_REASON;
+				} else {
+					$reason = $data[1];
+				}
+				$data = [
+					'domain' => $domain,
+					'reason' => $reason
+				];
+				if (!in_array($data, $newBlockList)) {
+					$newBlockList[] = $data;
+				}
+			}
+			foreach ($currBlockList as $blocked) {
+				if (!in_array($blocked, $newBlockList)) {
+					$newBlockList[] = $blocked;
+				}
+			}
+			if ($config->set('system', 'blocklist', $newBlockList)) {
+				$this->out(sprintf("Entries from %s that were not blocked before are now blocked", $filename));
+				return 0;
+			} else {
+				$this->out(sprintf("Couldn't save '%s' as blocked server", $domain));
+				return 1;
+			}
+
+		} else {
+			throw new Exception(sprintf('The file "%s" could not be opened for importing', $filename));
+		}
+	}
+
+	/**
+	 * Prints the whole list of blocked domains including the reason
+	 *
+	 /* @param IConfig $config
+	 */
 	private function printBlockedServers(IConfig $config)
 	{
 		$table = new Console_Table();
@@ -127,9 +198,9 @@ HELP;
 
 		$update = false;
 
-		$currBlocklist = $config->get('system', 'blocklist', []);
+		$currBlockList = $config->get('system', 'blocklist', []);
 		$newBlockList = [];
-		foreach ($currBlocklist  as $blocked) {
+		foreach ($currBlockList  as $blocked) {
 			if ($blocked['domain'] === $domain) {
 				$update = true;
 				$newBlockList[] = [
@@ -178,9 +249,9 @@ HELP;
 
 		$found = false;
 
-		$currBlocklist = $config->get('system', 'blocklist', []);
+		$currBlockList = $config->get('system', 'blocklist', []);
 		$newBlockList = [];
-		foreach ($currBlocklist as $blocked) {
+		foreach ($currBlockList as $blocked) {
 			if ($blocked['domain'] === $domain) {
 				$found = true;
 			} else {

src/Core/Cache/RedisCache.php

@@ -139,7 +139,9 @@ class RedisCache extends BaseCache implements IMemoryCache
 	public function delete($key)
 	{
 		$cachekey = $this->getCacheKey($key);
-		return ($this->redis->del($cachekey) > 0);
+		$this->redis->del($cachekey);
+		// Redis doesn't have an error state for del()
+		return true;
 	}
 
 	/**

src/Module/Profile/Contacts.php

@@ -51,14 +51,14 @@ class Contacts extends Module\BaseProfile
 			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
 		}
 
-		if (!empty($a->profile['hide-friends'])) {
+		$is_owner = $a->profile['uid'] == local_user();
+
+		if (!empty($a->profile['hide-friends']) && !$is_owner) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 
 		Nav::setSelected('home');
 
-		$is_owner = $a->profile['uid'] == local_user();
-
 		$o = self::getTabsHTML($a, 'contacts', $is_owner, $nickname);
 
 		$tabs = self::getContactFilterTabs('profile/' . $nickname, $type, Session::isAuthenticated() && $a->profile['uid'] != local_user());

tests/src/Console/ServerBlockConsoleTest.php

@@ -334,14 +334,18 @@ CONS;
 		$help = <<<HELP
 console serverblock - Manage blocked server domain patterns
 Usage
-	bin/console serverblock [-h|--help|-?] [-v]
-	bin/console serverblock add <pattern> <reason> [-h|--help|-?] [-v]
-	bin/console serverblock remove <pattern> [-h|--help|-?] [-v]
+    bin/console serverblock [-h|--help|-?] [-v]
+    bin/console serverblock add <pattern> <reason> [-h|--help|-?] [-v]
+    bin/console serverblock remove <pattern> [-h|--help|-?] [-v]
+    bin/console serverblock export <filename>
+    bin/console serverblock import <filename>
 
 Description
-	With this tool, you can list the current blocked server domain patterns
+    With this tool, you can list the current blocked server domain patterns
     or you can add / remove a blocked server domain pattern from the list.
-    
+    Using the export and import options you can share your server blocklist
+    with other node admins by CSV files.
+
     Patterns are case-insensitive shell wildcard comprising the following special characters:
     - * : Any number of characters
     - ? : Any single character

view/js/autocomplete.js

@@ -202,16 +202,17 @@ function string2bb(element) {
 	// jQuery wrapper for yuku/old-textcomplete
 	// uses a local object directory to avoid recreating Textcomplete objects
 	$.fn.textcomplete = function (strategies, options) {
-		if (!(this.data('textcompleteId') in textcompleteObjects)) {
-			let editor = new Textcomplete.editors.Textarea(this.get(0));
+		return this.each(function () {
+			let $this = $(this);
+			if (!($this.data('textcompleteId') in textcompleteObjects)) {
+				let editor = new Textcomplete.editors.Textarea($this.get(0));
 
-			this.data('textcompleteId', textcompleteObjects.length);
-			textcompleteObjects.push(new Textcomplete(editor, options));
-		}
+				$this.data('textcompleteId', textcompleteObjects.length);
+				textcompleteObjects.push(new Textcomplete(editor, options));
+			}
 
-		textcompleteObjects[this.data('textcompleteId')].register(strategies);
-
-		return this;
+			textcompleteObjects[$this.data('textcompleteId')].register(strategies);
+		});
 	};
 
 	/**
@@ -293,7 +294,7 @@ function string2bb(element) {
 		};
 
 		this.attr('autocomplete','off');
-		this.textcomplete([contacts, forums, smilies, tags], {className:'acpopup', zIndex:10000});
+		this.textcomplete([contacts, forums, smilies, tags], {dropdown: {className:'acpopup'}});
 		this.fixTextcompleteEscape();
 
 		return this;
@@ -328,7 +329,7 @@ function string2bb(element) {
 		};
 
 		this.attr('autocomplete', 'off');
-		this.textcomplete([contacts, community, tags], {className:'acpopup', maxCount:100, zIndex: 10000, appendTo:'nav'});
+		this.textcomplete([contacts, community, tags], {dropdown: {className:'acpopup', maxCount:100}});
 		this.fixTextcompleteEscape();
 		this.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
 
@@ -349,7 +350,7 @@ function string2bb(element) {
 		};
 
 		this.attr('autocomplete','off');
-		this.textcomplete([names], {className:'acpopup', zIndex:10000});
+		this.textcomplete([names], {dropdown: {className:'acpopup'}});
 		this.fixTextcompleteEscape();
 
 		if(autosubmit) {
@@ -399,7 +400,7 @@ function string2bb(element) {
 		};
 
 		this.attr('autocomplete','off');
-		this.textcomplete([bbco], {className:'acpopup', zIndex:10000});
+		this.textcomplete([bbco], {dropdown: {className:'acpopup'}});
 		this.fixTextcompleteEscape();
 
 		this.on('textComplete:select', function(e, value, strategy) { value; });

view/php/minimal.php

@@ -7,7 +7,9 @@
 </head>
 <body class="minimal">
 	<section><?php if(!empty($page['content'])) echo $page['content']; ?>
-		<div id="page-footer"></div>
+		<div id="page-footer">
+			<?php echo $page['footer'] ?? ''; ?>
+		</div>
 	</section>
 </body>
 </html>

view/theme/frio/php/minimal.php

@@ -10,7 +10,9 @@
 		<div  class="generic-page-wrapper">
 			<?php if(!empty($page['content'])) echo $page['content']; ?>
 		</div>
-		<div id="page-footer"></div>
+		<div id="page-footer">
+			<?php echo $page['footer'] ?? ''; ?>
+		</div>
 	</section>
 	<!-- Modal  -->
 	<div id="modal" class="modal fade" tabindex="-1" role="dialog">