Merge remote-tracking branch 'origin/master'

# Conflicts: # composer.json # src/Controller/AuthController.php # src/Model/User.php # src/Module.php
OnePlc · Apr 19, 2021 · e06b552 · e06b552
2 parents f4ba04b + ee85602
commit e06b552
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to oneplace-event will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.28] - 
+
+### Added
+
 ## [1.0.27] - 2021-04-01
 
 ### Fixed

diff --git a/data/structure.sql b/data/structure.sql
@@ -204,6 +204,17 @@ ALTER TABLE `user_registration`
 ALTER TABLE `user_registration`
     MODIFY `Registration_ID` int(11) NOT NULL AUTO_INCREMENT;
 
+CREATE TABLE `user_session` (
+    `user_idfs` int(11) NOT NULL,
+    `ipaddress` varchar(30) NOT NULL,
+    `browser` text NOT NULL,
+    `date_created` datetime NOT NULL,
+    `date_last_login` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `user_session`
+    ADD PRIMARY KEY (`user_idfs`);
+
 --
 -- Save
 --

diff --git a/src/Model/UserTable.php b/src/Model/UserTable.php
@@ -150,6 +150,12 @@ public function saveSingle(User $user)
         if(isset($user->contact_idfs)) {
             $data['contact_idfs'] = $user->contact_idfs;
         }
+        if(isset($user->ref_user_idfs)) {
+            $data['ref_user_idfs'] = $user->ref_user_idfs;
+        }
+        if(isset($user->telegram_chatid)) {
+            $data['telegram_chatid'] = $user->telegram_chatid;
+        }
 
         $iCreatorID = (isset(CoreController::$oSession->oUser)) ? CoreController::$oSession->oUser->getID() : 1;
 

diff --git a/view/layout/login.phtml b/view/layout/login.phtml
@@ -60,7 +60,7 @@ use Application\Controller\CoreController;
                     <hr>
                     <footer>
                         <p>&copy; <?= date('Y') ?>
-                            <a href="<?=CoreController::$aGlobalSettings['app-url']?>/impressum" target="_blank">
+                            <a href="<?=CoreController::$aGlobalSettings['app-url']?>" target="_blank">
                                 <?=CoreController::$aGlobalSettings['app-copyright']?>
                             </a>. <?=$this->translate('All rights reserved')?>.</p>
                     </footer>

diff --git a/view/one-place/user/auth/forgot.phtml b/view/one-place/user/auth/forgot.phtml
@@ -1,4 +1,5 @@
 <?php
+use Application\Controller\CoreController;
 ?>
 <form action="" method="POST">
     <h2>Forgot Password</h2>
@@ -19,6 +20,12 @@
         <input type="text" id="plc_login_user" name="plc_login_user" value="" class="form-control" />
         <label for="plc_login_user"><?=$this->translate('Username or E-Mail')?></label>
     </div>
+        <?php if(isset(CoreController::$aGlobalSettings['recaptcha-forgot-sitekey'])) { ?>
+            <div class="md-form">
+                <div class="g-recaptcha" data-sitekey="<?=CoreController::$aGlobalSettings['recaptcha-forgot-sitekey']?>"></div>
+            </div>
+        <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+    <?php } ?>
     <div class="md-form">
         <button type="submit" value="Login" class="btn-floating btn btn-dark">
             <?=$this->translate('Get Password Reset Link')?>