Add general page links and redirect on login/logout

Author: technicalguru

src/WebApp/Application.php

@@ -248,10 +248,16 @@ public function getAllowedTestType() {
 	*/
 
 	/**
-	 * Used for protected pages: returns the URI where login shall be performed.
-	 * @return the URI or NULL when login is performed on same page.
+	 * Returns special defined page links or URIs for usage in various
+	 * contexts. Mostly used is 'login', 'logout', 'forget_password', 'home'.
+	 * @param string $key - key of the link
+	 * @return the page link, URI or NULL.
 	 */
-	public function getLoginUri() {
+	public function getPageLink($key) {
+		if ($this->config->has('pageLinks')) {
+			$links = $this->config->get('pageLinks');
+			if (isset($links->$key)) return $links->$key;
+		}
 		return NULL;
 	}
 

src/WebApp/BootstrapTheme/DefaultLayout.php

@@ -92,12 +92,13 @@ protected function renderNavbarContent() {
 			}
 			//$rc .= '<span class="navbar-text align-middle">'.$principal->__toString().'<a class="px-2" href="?logout"><i class="fas fa-sign-out-alt fa-lg"></i></a></span>';
 			$rc  .= '</ul>';
-		} else if ($this->app->getLoginUri() != NULL) {
-			$uri = $this->app->request->uri;
-			if ($this->app->request->path == $this->app->getLoginUri()) {
+		} else if ($this->app->getPageLink('login') != NULL) {
+			$uri   = $this->app->request->uri;
+			$login = Utils::getAppPath($this->app->getPageLink('login'));
+			if ($this->app->request->path == $login) {
 				$uri = $this->app->request->path;
 			} else {
-				$uri = $this->app->getLoginUri().'?return='.urlencode($this->app->request->uri);
+				$uri = $login.'?return='.urlencode($this->app->request->uri);
 			}
 			$rc .= '<span class="navbar-text  align-middle"><a class="px-2" href="'.$uri.'">'.I18N::_('login_label').'</a></span>';
 		}

src/WebApp/Page.php

@@ -87,8 +87,13 @@ public function getLayoutName() {
 	public function processRequest() {
 		if ($this->request->getPostParam('action') == 'login') {
 			$this->processLoginAction();
+			return array('redirect', $this->request->path);
 		} else if ($this->request->hasGetParam('logout')) {
 			$this->processLogoutAction();
+			$home = $this->app->getPageLink('home');
+			if ($home == NULL) $home = $this->request->path;
+			else $home = Utils::getAppPath($home);
+			return array('redirect', $home);
 		}
 
 		$requiredRight = $this->getRequiredRight();
@@ -141,9 +146,12 @@ protected function computeDisplayMode() {
 		if ($this->app->getPrincipal() == NULL) {
 			// We need a login
 			$this->display = 'login';
-			$uri           = $this->app->getLoginUri();
-			if (($uri != NULL) && ($uri != $this->request->path)) {
-				return array('redirect', $uri.'?return='.urlencode($this->request->uri));
+			$uri           = $this->app->getPageLink('login');
+			if ($uri != NULL) {
+				$uri = Utils::getAppPath($uri);
+				if ($uri != $this->request->path) {
+					return array('redirect', $uri.'?return='.urlencode($this->request->uri));
+				}
 			}
 		} else if ($this->app->isAuthorized($requiredRight)) {
 			// We can render