Merge pull request #7727 from MrPetovan/task/4090-move-manage-to-src

Move mod/manage to src/Module/Delegation

src/App/Module.php

@@ -7,7 +7,10 @@ use Friendica\BaseObject;
 use Friendica\Core;
 use Friendica\LegacyModule;
 use Friendica\Module\Home;
-use Friendica\Module\PageNotFound;
+use Friendica\Module\HTTPException\MethodNotAllowed;
+use Friendica\Module\HTTPException\PageNotFound;
+use Friendica\Network\HTTPException\MethodNotAllowedException;
+use Friendica\Network\HTTPException\NotFoundException;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -144,38 +147,43 @@ class Module
 	{
 		$printNotAllowedAddon = false;
 
+		$module_class = null;
 		/**
 		 * ROUTING
 		 *
 		 * From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the
 		 * post() and/or content() static methods can be respectively called to produce a data change or an output.
 		 **/
-		$module_class = $router->getModuleClass($args->getCommand());
-
-		// Then we try addon-provided modules that we wrap in the LegacyModule class
-		if (!$module_class && Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
-			//Check if module is an app and if public access to apps is allowed or not
-			$privateapps = $config->get('config', 'private_addons', false);
-			if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
-				$printNotAllowedAddon = true;
-			} else {
-				include_once "addon/{$this->module}/{$this->module}.php";
-				if (function_exists($this->module . '_module')) {
-					LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
-					$module_class = LegacyModule::class;
+		try {
+			$module_class = $router->getModuleClass($args->getCommand());
+		} catch (MethodNotAllowedException $e) {
+			$module_class = MethodNotAllowed::class;
+		} catch (NotFoundException $e) {
+			// Then we try addon-provided modules that we wrap in the LegacyModule class
+			if (Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
+				//Check if module is an app and if public access to apps is allowed or not
+				$privateapps = $config->get('config', 'private_addons', false);
+				if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
+					$printNotAllowedAddon = true;
+				} else {
+					include_once "addon/{$this->module}/{$this->module}.php";
+					if (function_exists($this->module . '_module')) {
+						LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
+						$module_class = LegacyModule::class;
+					}
 				}
 			}
-		}
 
-		/* Finally, we look for a 'standard' program module in the 'mod' directory
-		 * We emulate a Module class through the LegacyModule class
-		 */
-		if (!$module_class && file_exists("mod/{$this->module}.php")) {
-			LegacyModule::setModuleFile("mod/{$this->module}.php");
-			$module_class = LegacyModule::class;
-		}
+			/* Finally, we look for a 'standard' program module in the 'mod' directory
+			 * We emulate a Module class through the LegacyModule class
+			 */
+			if (!$module_class && file_exists("mod/{$this->module}.php")) {
+				LegacyModule::setModuleFile("mod/{$this->module}.php");
+				$module_class = LegacyModule::class;
+			}
 
-		$module_class = !isset($module_class) ? PageNotFound::class : $module_class;
+			$module_class = $module_class ?: PageNotFound::class;
+		}
 
 		return new Module($this->module, $module_class, $this->isBackend, $printNotAllowedAddon);
 	}

src/App/Router.php

@@ -8,7 +8,8 @@ use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
 use FastRoute\RouteParser\Std;
 use Friendica\Core\Hook;
-use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Core\L10n;
+use Friendica\Network\HTTPException;
 
 /**
  * Wrapper for FastRoute\Router
@@ -57,7 +58,7 @@ class Router
 	 *
 	 * @return self The router instance with the loaded routes
 	 *
-	 * @throws InternalServerErrorException In case of invalid configs
+	 * @throws HTTPException\InternalServerErrorException In case of invalid configs
 	 */
 	public function addRoutes(array $routes)
 	{
@@ -71,7 +72,7 @@ class Router
 			} elseif ($this->isRoute($config)) {
 				$routeCollector->addRoute($config[1], $route, $config[0]);
 			} else {
-				throw new InternalServerErrorException("Wrong route config for route '" . print_r($route, true) . "'");
+				throw new HTTPException\InternalServerErrorException("Wrong route config for route '" . print_r($route, true) . "'");
 			}
 		}
 
@@ -96,7 +97,7 @@ class Router
 				} elseif ($this->isRoute($config)) {
 					$routeCollector->addRoute($config[1], $route, $config[0]);
 				}else {
-					throw new InternalServerErrorException("Wrong route config for route '" . print_r($route, true) . "'");
+					throw new HTTPException\InternalServerErrorException("Wrong route config for route '" . print_r($route, true) . "'");
 				}
 			}
 		});
@@ -155,7 +156,11 @@ class Router
 	 *
 	 * @param string $cmd The path component of the request URL without the query string
 	 *
-	 * @return string|null A Friendica\BaseModule-extending class name if a route rule matched
+	 * @return string A Friendica\BaseModule-extending class name if a route rule matched
+	 *
+	 * @throws HTTPException\InternalServerErrorException
+	 * @throws HTTPException\MethodNotAllowedException    If a rule matched but the method didn't
+	 * @throws HTTPException\NotFoundException            If no rule matched
 	 */
 	public function getModuleClass($cmd)
 	{
@@ -171,6 +176,10 @@ class Router
 		$routeInfo  = $dispatcher->dispatch($this->httpMethod, $cmd);
 		if ($routeInfo[0] === Dispatcher::FOUND) {
 			$moduleClass = $routeInfo[1];
+		} elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
+			throw new HTTPException\MethodNotAllowedException(L10n::t('Method not allowed for this module. Allowed method(s): %s', implode(', ', $routeInfo[1])));
+		} else {
+			throw new HTTPException\NotFoundException(L10n::t('Page not found.'));
 		}
 
 		return $moduleClass;

src/Content/Nav.php

@@ -29,7 +29,7 @@ class Nav
 		'directory' => null,
 		'settings'  => null,
 		'contacts'  => null,
-		'manage'    => null,
+		'delegation'=> null,
 		'events'    => null,
 		'register'  => null
 	];
@@ -257,11 +257,9 @@ class Nav
 			$nav['messages']['new'] = ['message/new', L10n::t('New Message'), '', L10n::t('New Message')];
 
 			if (is_array($a->identities) && count($a->identities) > 1) {
-				$nav['manage'] = ['manage', L10n::t('Manage'), '', L10n::t('Manage other pages')];
+				$nav['delegation'] = ['delegation', L10n::t('Delegation'), '', L10n::t('Manage other pages')];
 			}
 
-			$nav['delegations'] = ['settings/delegation', L10n::t('Delegations'), '', L10n::t('Delegate Page Management')];
-
 			$nav['settings'] = ['settings', L10n::t('Settings'), '', L10n::t('Account settings')];
 
 			if (Feature::isEnabled(local_user(), 'multi_profiles')) {

src/Module/Delegation.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException\ForbiddenException;
+
+/**
+ * Switches current user between delegates/parent user
+ */
+class Delegation extends BaseModule
+{
+	public static function post()
+	{
+		if (!local_user()) {
+			return;
+		}
+
+		$uid = local_user();
+		$orig_record = self::getApp()->user;
+
+		if (Session::get('submanage')) {
+			$user = User::getById(Session::get('submanage'));
+			if (DBA::isResult($user)) {
+				$uid = intval($user['uid']);
+				$orig_record = $user;
+			}
+		}
+
+		$identity = intval($_POST['identity'] ?? 0);
+		if (!$identity) {
+			return;
+		}
+
+		$limited_id = 0;
+		$original_id = $uid;
+
+		$manages = DBA::selectToArray('manage', ['mid'], ['uid' => $uid]);
+		foreach ($manages as $manage) {
+			if ($identity == $manage['mid']) {
+				$limited_id = $manage['mid'];
+				break;
+			}
+		}
+
+		if ($limited_id) {
+			$user = User::getById($limited_id);
+		} else {
+			// Check if the target user is one of our children
+			$user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['uid']]);
+
+			// Check if the target user is one of our siblings
+			if (!DBA::isResult($user) && ($orig_record['parent-uid'] != 0)) {
+				$user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['parent-uid']]);
+			}
+
+			// Check if it's our parent or our own user
+			if (!DBA::isResult($user)
+				&& (
+					$orig_record['parent-uid'] != 0 && $orig_record['parent-uid'] == $identity
+					||
+					$orig_record['uid'] != 0 && $orig_record['uid'] == $identity
+				)
+			) {
+				$user = User::getById($identity);
+			}
+		}
+
+		if (!DBA::isResult($user)) {
+			return;
+		}
+
+		Session::clear();
+
+		Session::setAuthenticatedForUser(self::getApp(), $user, true, true);
+
+		if ($limited_id) {
+			Session::set('submanage', $original_id);
+		}
+
+		$ret = [];
+		Hook::callAll('home_init', $ret);
+
+		self::getApp()->internalRedirect('profile/' . self::getApp()->user['nickname']);
+		// NOTREACHED
+	}
+
+	public static function content()
+	{
+		if (!local_user()) {
+			throw new ForbiddenException(L10n::t('Permission denied.'));
+		}
+
+		$identities = self::getApp()->identities;
+
+		//getting additinal information for each identity
+		foreach ($identities as $key => $identity) {
+			$thumb = Contact::selectFirst(['thumb'], ['uid' => $identity['uid'], 'self' => true]);
+			if (!DBA::isResult($thumb)) {
+				continue;
+			}
+
+			$identities[$key]['thumb'] = $thumb['thumb'];
+
+			$identities[$key]['selected'] = ($identity['nickname'] === self::getApp()->user['nickname']);
+
+			$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
+			$params = ['distinct' => true, 'expression' => 'parent'];
+			$notifications = DBA::count('notify', $condition, $params);
+
+			$params = ['distinct' => true, 'expression' => 'convid'];
+			$notifications += DBA::count('mail', ['uid' => $identity['uid'], 'seen' => false], $params);
+
+			$notifications += DBA::count('intro', ['blocked' => false, 'ignore' => false, 'uid' => $identity['uid']]);
+
+			$identities[$key]['notifications'] = $notifications;
+		}
+
+		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegation.tpl'), [
+			'$title'      => L10n::t('Manage Identities and/or Pages'),
+			'$desc'       => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
+			'$choose'     => L10n::t('Select an identity to manage: '),
+			'$identities' => $identities,
+			'$submit'     => L10n::t('Submit'),
+		]);
+
+		return $o;
+	}
+}

src/Module/HTTPException/MethodNotAllowed.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Friendica\Module\HTTPException;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Network\HTTPException;
+
+class MethodNotAllowed extends BaseModule
+{
+	public static function content()
+	{
+		throw new HTTPException\MethodNotAllowedException(L10n::t('Method Not Allowed.'));
+	}
+}

src/Module/HTTPException/PageNotFound.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Module;
+namespace Friendica\Module\HTTPException;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;