Merge remote-tracking branch 'upstream/develop' into separated-confirm

src/Module/Bookmarklet.php

@@ -12,7 +12,7 @@ use Friendica\Util\Strings;
  * Creates a bookmarklet
  * Shows either a editor browser or adds the given bookmarklet to the current user
  */
-class BookMarklet extends BaseModule
+class Bookmarklet extends BaseModule
 {
 	public static function content()
 	{

src/Module/Filer/RemoveTag.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Friendica\Module\Filer;
+
+use Friendica\BaseModule;
+use Friendica\Model\FileTag;
+use Friendica\Network\HTTPException;
+use Friendica\Util\XML;
+
+/**
+ * Remove a tag from a file
+ */
+class RemoveTag extends BaseModule
+{
+	public static function content()
+	{
+		if (!local_user()) {
+			throw new HTTPException\ForbiddenException();
+		}
+
+		$app = self::getApp();
+		$logger = $app->getLogger();
+
+		$item_id = (($app->argc > 1) ? intval($app->argv[1]) : 0);
+
+		$term = XML::unescape(trim(defaults($_GET, 'term', '')));
+		$cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
+
+		$category = (($cat) ? true : false);
+
+		if ($category) {
+			$term = $cat;
+		}
+
+		$logger->info('Filer - Remove Tag', [
+			'term'     => $term,
+			'item'     => $item_id,
+			'category' => ($category ? 'true' : 'false')
+		]);
+
+		if ($item_id && strlen($term)) {
+			if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
+				info('Item removed');
+			}
+		} else {
+			info('Item was not deleted');
+		}
+
+		$app->internalRedirect('/network?f=&file=' . rawurlencode($term));
+	}
+}

src/Module/Filer/SaveTag.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\Filer;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
@@ -12,7 +12,7 @@ use Friendica\Util\XML;
 /**
  * Shows a dialog for adding tags to a file
  */
-class Filer extends BaseModule
+class SaveTag extends BaseModule
 {
 	public static function init()
 	{

src/Module/Friendica.php

@@ -0,0 +1,166 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Addon;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Model\User;
+
+/**
+ * Prints information about the current node
+ * Either in human readable form or in JSON
+ */
+class Friendica extends BaseModule
+{
+	public static function content()
+	{
+		$app = self::getApp();
+		$config = $app->getConfig();
+
+		$visibleAddonList = Addon::getVisibleList();
+		if (!empty($visibleAddonList)) {
+
+			$sorted = $visibleAddonList;
+			sort($sorted);
+
+			$sortedAddonList = '';
+
+			foreach ($sorted as $addon) {
+				if (strlen($addon)) {
+					if (strlen($sortedAddonList)) {
+						$sortedAddonList .= ', ';
+					}
+					$sortedAddonList .= $addon;
+				}
+			}
+			$addon = [
+				'title' => L10n::t('Installed addons/apps:'),
+				'list'  => $sortedAddonList,
+			];
+		} else {
+			$addon = [
+				'title' => L10n::t('No installed addons/apps'),
+			];
+		}
+
+		$tos = ($config->get('system', 'tosdisplay')) ?
+			L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', $app->getBaseURL()) :
+			'';
+
+		$blockList = $config->get('system', 'blocklist');
+
+		if (!empty($blockList)) {
+			$blocked = [
+				'title'  => L10n::t('On this server the following remote servers are blocked.'),
+				'header' => [
+					L10n::t('Blocked domain'),
+					L10n::t('Reason for the block'),
+				],
+				'list'   => $blockList,
+			];
+		} else {
+			$blocked = null;
+		}
+
+		$hooked = '';
+
+		Hook::callAll('about_hook', $hooked);
+
+		$tpl = Renderer::getMarkupTemplate('friendica.tpl');
+
+		return Renderer::replaceMacros($tpl, [
+			'about'     => L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+				'<strong>' . FRIENDICA_VERSION . '</strong>',
+				$app->getBaseURL(),
+				'<strong>' . DB_UPDATE_VERSION . '</strong>',
+				'<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
+			'friendica' => L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
+			'bugs'      => L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . L10n::t('the bugtracker at github') . '</a>',
+			'info'      => L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
+
+			'visible_addons' => $addon,
+			'tos'            => $tos,
+			'block_list'     => $blocked,
+			'hooked'         => $hooked,
+		]);
+	}
+
+	public static function rawContent()
+	{
+		$app = self::getApp();
+
+		// @TODO: Replace with parameter from router
+		if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
+			return;
+		}
+
+		$config = $app->getConfig();
+
+		$register_policies = [
+			Register::CLOSED  => 'REGISTER_CLOSED',
+			Register::APPROVE => 'REGISTER_APPROVE',
+			Register::OPEN    => 'REGISTER_OPEN'
+		];
+
+		$register_policy_int = intval($config->get('config', 'register_policy'));
+		if ($register_policy_int !== Register::CLOSED && $config->get('config', 'invitation_only')) {
+			$register_policy = 'REGISTER_INVITATION';
+		} else {
+			$register_policy = $register_policies[$register_policy_int];
+		}
+
+		$condition = [];
+		$admin = false;
+		if (!empty($config->get('config', 'admin_nickname'))) {
+			$condition['nickname'] = $config->get('config', 'admin_nickname');
+		}
+		if (!empty($config->get('config', 'admin_email'))) {
+			$adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
+			$condition['email'] = $adminList[0];
+			$administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
+			if (!empty($administrator)) {
+				$admin = [
+					'name'    => $administrator['username'],
+					'profile' => $app->getBaseURL() . '/profile/' . $administrator['nickname'],
+				];
+			}
+		}
+
+		$visible_addons = Addon::getVisibleList();
+
+		$config->load('feature_lock');
+		$locked_features = [];
+		$featureLocks = $config->get('config', 'feature_lock');
+		if (isset($featureLocks)) {
+			foreach ($featureLocks as $feature => $lock) {
+				if ($feature === 'config_loaded') {
+					continue;
+				}
+
+				$locked_features[$feature] = intval($lock);
+			}
+		}
+
+		$data = [
+			'version'          => FRIENDICA_VERSION,
+			'url'              => $app->getBaseURL(),
+			'addons'           => $visible_addons,
+			'locked_features'  => $locked_features,
+			'explicit_content' => intval($config->get('system', 'explicit_content', 0)),
+			'language'         => $config->get('system', 'language'),
+			'register_policy'  => $register_policy,
+			'admin'            => $admin,
+			'site_name'        => $config->get('config', 'sitename'),
+			'platform'         => FRIENDICA_PLATFORM,
+			'info'             => $config->get('config', 'info'),
+			'no_scrape_url'    => $app->getBaseURL() . '/noscrape',
+		];
+
+		header('Content-type: application/json; charset=utf-8');
+		echo json_encode($data);
+		exit();
+	}
+}

src/Module/ItemBody.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Model\Item;
+use Friendica\Network\HTTPException;
+
+/**
+ * Print the body of an Item
+ */
+class ItemBody extends BaseModule
+{
+	public static function content()
+	{
+		if (!local_user()) {
+			throw new HTTPException\UnauthorizedException(L10n::t('Access denied.'));
+		}
+
+		$app = self::getApp();
+
+		// @TODO: Replace with parameter from router
+		$itemId = (($app->argc > 1) ? intval($app->argv[1]) : 0);
+
+		if (!$itemId) {
+			throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
+		}
+
+		$item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $itemId]);
+
+		if (!empty($item)) {
+			if ($app->isAjax()) {
+				echo str_replace("\n", '<br />', $item['body']);
+				exit();
+			} else {
+				return str_replace("\n", '<br />', $item['body']);
+			}
+		} else {
+			throw new HTTPException\NotFoundException(L10n::t('Item not found.'));
+		}
+	}
+}

src/Module/Maintenance.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Network\HTTPException;
+use Friendica\Util\Strings;
+
+/**
+ * Shows the maintenance reason
+ * or redirects to the alternate location
+ */
+class Maintenance extends BaseModule
+{
+	public static function content()
+	{
+		$config = self::getApp()->getConfig();
+
+		$reason = $config->get('system', 'maintenance_reason');
+
+		if ((substr(Strings::normaliseLink($reason), 0, 7) === 'http://') ||
+			(substr(Strings::normaliseLink($reason), 0, 8) === 'https://')) {
+			System::externalRedirect($reason, 307);
+		}
+
+		$exception = new HTTPException\ServiceUnavailableException($reason);
+		$exception->httpdesc = L10n::t('System down for maintenance');
+		throw $exception;
+	}
+}

src/Module/PublicRSAKey.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Friendica\Module;
+
+use ASN_BASE;
+use Friendica\BaseModule;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException\BadRequestException;
+
+/**
+ * prints the public RSA key of a user
+ */
+class PublicRSAKey extends BaseModule
+{
+	public static function rawContent()
+	{
+		$app = self::getApp();
+
+		// @TODO: Replace with parameter from router
+		if ($app->argc !== 2) {
+			throw new BadRequestException();
+		}
+
+		// @TODO: Replace with parameter from router
+		$nick = $app->argv[1];
+
+		$user = User::getByNickname($nick, ['spubkey']);
+		if (empty($user) || empty($user['spubkey'])) {
+			throw new BadRequestException();
+		}
+
+		$lines = explode("\n", $user['spubkey']);
+		unset($lines[0]);
+		unset($lines[count($lines)]);
+
+		$asnString = base64_decode(implode('', $lines));
+		$asnBase = ASN_BASE::parseASNString($asnString);
+
+		$m = $asnBase[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
+		$e = $asnBase[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
+
+		header('Content-type: application/magic-public-key');
+		echo 'RSA' . '.' . $m . '.' . $e;
+
+		exit();
+	}
+}

src/Module/ReallySimpleDiscovery.php

@@ -3,7 +3,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Renderer;
+use Friendica\Util\XML;
 
 /**
  * Prints the rsd.xml
@@ -13,9 +13,43 @@ class ReallySimpleDiscovery extends BaseModule
 {
 	public static function rawContent()
 	{
-		header ('Content-Type: text/xml');
-		$tpl = Renderer::getMarkupTemplate('rsd.tpl');
-		echo Renderer::replaceMacros($tpl);
+		header('Content-Type: text/xml');
+
+		$app = self::getApp();
+		$xml = null;
+		echo XML::fromArray([
+			'rsd' => [
+				'@attributes' => [
+					'version' => '1.0',
+					'xmlns'   => 'http://archipelago.phrasewise.com/rsd',
+				],
+				'service'     => [
+					'engineName' => 'Friendica',
+					'engineLink' => 'http://friendica.com',
+					'apis'       => [
+						'api' => [
+							'@attributes' => [
+								'name'      => 'Twitter',
+								'preferred' => 'true',
+								'apiLink'   => $app->getBaseURL(),
+								'blogID'    => '',
+							],
+							'settings'    => [
+								'docs'    => [
+									'http://status.net/wiki/TwitterCompatibleAPI',
+								],
+								'setting' => [
+									'@attributes' => [
+										'name' => 'OAuth',
+									],
+									'false',
+								],
+							],
+						]
+					],
+				],
+			],
+		], $xml);
 		exit();
 	}
 }

src/Module/RobotsTxt.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+
+/**
+ * Return the default robots.txt
+ */
+class RobotsTxt extends BaseModule
+{
+	public static function rawContent()
+	{
+		$allDisalloweds = [
+			'/settings/',
+			'/admin/',
+			'/message/',
+		];
+
+		header('Content-Type: text/plain');
+		echo 'User-agent: *' . PHP_EOL;
+		foreach ($allDisalloweds as $disallowed) {
+			echo 'Disallow: ' . $disallowed . PHP_EOL;
+		}
+		exit();
+	}
+}

src/Module/Special/HTTPException.php

@@ -52,14 +52,14 @@ class HTTPException
 			$message = defaults($explanation, $e->getCode(), '');
 		}
 
-		return ['$title' => $title, '$description' => $message];
+		return ['$title' => $title, '$message' => $message, '$back' => L10n::t('Go back')];
 	}
 
 	/**
 	 * Displays a bare message page with no theming at all.
 	 *
 	 * @param \Friendica\Network\HTTPException $e
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
 	public static function rawContent(\Friendica\Network\HTTPException $e)
 	{
@@ -78,7 +78,7 @@ class HTTPException
 	 *
 	 * @param \Friendica\Network\HTTPException $e
 	 * @return string
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
 	public static function content(\Friendica\Network\HTTPException $e)
 	{

src/Module/ThemeDetails.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Theme;
+
+/**
+ * Prints theme specific details as a JSON string
+ */
+class ThemeDetails extends BaseModule
+{
+	public static function rawContent()
+	{
+		if (!empty($_REQUEST['theme'])) {
+			$theme = $_REQUEST['theme'];
+			$info = Theme::getInfo($theme);
+
+			// Unfortunately there will be no translation for this string
+			$description = defaults($info, 'description', '');
+			$version     = defaults($info, 'version'    , '');
+			$credits     = defaults($info, 'credits'    , '');
+
+			echo json_encode([
+				'img'     => Theme::getScreenshot($theme),
+				'desc'    => $description,
+				'version' => $version,
+				'credits' => $credits,
+			]);
+		}
+		exit();
+	}
+}