Merge branch 'fronkdev' into 'master'

Added 2fa warning in UserProfile

See merge request fronk/thetool!207

Layout/default/UserProfile/Index.php

@@ -130,6 +130,9 @@ if ($userprofile->twofactor == 0) {
                             <div class="w-100 border-bottom"></div>
                             <h4 class="form-group mb-2 mt-3">2FA</h4>
                             <?php if (!$verification || $verification == 0): ?>
+                                <?php if(!$userprofile->twofactor): ?>
+                                    <div class="alert alert-danger"><i class="fas fa-exclamation-circle"></i> Derzeit ist keine Methode für die Zwei-Faktor-Authentifizerung aktiviert. Bitte aktivieren Sie eine Zwei-Faktor-Authentifizerungsmethode!</div>
+                                <?php endif; ?>
                                 <form class="form-horizontal" method="post"
                                       action="<?= self::getUrl("UserProfile", $twoFactorFormaction) ?>">
                                     <div class="form-group row">

lib/mvcfronk/mfRouter/mfRouter.php

@@ -210,6 +210,22 @@ class mfRouter {
         session_name(MFAPPNAME."_session");
         session_start();
       }
+      
+      /*$user = new User();
+      $user->loadMe();
+      
+      if($user->twofactor < 1 && $classname != "mfLoginController" && $classname != "UserProfileController" && $this->action != "logout" && $this->action != "Logout") {
+        //$this->mod = "UserProfile";
+        //$this->action = "Index";
+        if(MFUSEFANCYURLS) {
+          header("Location: $baseurl/UserProfile");
+          exit;
+        } else {
+          header("Location: $baseurl?Mod=UserProfile");
+          exit;
+        }
+      }*/
+      
     }
 		
     $request['mod'] = ucfirst($this->mod);