Add Forget Password Link

Author: technicalguru

src/WebApp/Application.php

@@ -46,7 +46,7 @@ public function init() {
 	protected function initVault() {
 		if ($this->config->has('vault')) {
 			$this->vault = \TgVault\VaultFactory::create($this->config->get('vault'));
-			// TODO $this->vault->setLogger(new WLogger());
+			// TODO $this->vault->setLogger(Log::instance());
 		}
 	}
 
@@ -183,16 +183,6 @@ public function getCssFiles() {
 		return array();
 	}
 
-	/** TODO */
-	protected function createRestPage() {
-		return new RestPage($this);
-	}
-
-	/** TODO */
-	public function getRestService($serviceName, $restPath) {
-		return NULL;
-	}
-
 	public function getPrincipal() {
 		// Retrieve from session
 		if (($this->principal == NULL) && isset($_SESSION['principal'])) {
@@ -237,16 +227,6 @@ public function getJavascript() {
 		return array();
 	}
 
-	/** TODO Unclear where it is used 
-	public function getAllowedTestType() {
-		$rc = 'none';
-		if (isset($this->config['allowedTestType'])) {
-			$rc = $this->config['allowedTestType'];
-		}
-		return $rc;
-	}
-	*/
-
 	/**
 	 * Returns special defined page links or URIs for usage in various
 	 * contexts. Mostly used is 'login', 'logout', 'forget_password', 'home'.

src/WebApp/BootstrapTheme/DefaultLayout.php

@@ -80,7 +80,10 @@ protected function renderNavbarContent() {
 			if ($userMenu == NULL) {
 				$userMenu = array();
 				$userItem = new \WebApp\Component\MenuItem($this, $principal->__toString(), '#');
-				$userMenu[] = new \WebApp\Component\MenuItem($userItem, 'logout_label', '?logout');
+				$logoutLink = $this->app->getPageLink('logout');
+				if ($logoutLink != NULL) $logoutLink = Utils::getAppPath($logoutLink);
+				else                     $logoutLink = '';
+				$userMenu[] = new \WebApp\Component\MenuItem($userItem, 'logout_label', $logoutLink.'?logout');
 				$userMenu = array($userItem);
 			}
 			if (($userMenu != NULL) && is_array($userMenu)) {

src/WebApp/BootstrapTheme/LoginPage.php

@@ -3,6 +3,7 @@
 namespace WebApp\BootstrapTheme;
 
 use WebApp\Component\Alert;
+use WebApp\Utils;
 
 class LoginPage extends \WebApp\Page\LoginPage {
 
@@ -67,6 +68,13 @@ protected function getLoginForm() {
 		$submit->addClass('btn-primary');
 
 		$rc[] = $form;
+		if ($this->app->getPageLink('forgot_password') != NULL) {
+			$link = Utils::getAppPath($this->app->getPageLink('forgot_password'));
+			$forgot = new \WebApp\Component\Div($this, new \WebApp\Component\Link($this, $link, 'Passwort vergessen?'));
+			$forgot->addClass('small');
+			$forgot->setStyle('margin-top', '1em');
+			$rc[] = $forgot;
+		}
 		return $rc;
 	}
 }

src/WebApp/Component/Div.php

@@ -4,8 +4,8 @@
 
 class Div extends Container {
 
-	public function __construct($parent, string $text = NULL) {
-		parent::__construct($parent, $text);
+	public function __construct($parent, $child = NULL) {
+		parent::__construct($parent, $child);
 	}
 
 }

src/WebApp/Component/Paragraph.php

@@ -4,8 +4,8 @@
 
 class Paragraph extends Container {
 
-	public function __construct($parent, string $text = NULL) {
-		parent::__construct($parent, $text);
+	public function __construct($parent, $child = NULL) {
+		parent::__construct($parent, $child);
 	}
 
 }