delight-im/auth updated, required field added via db migration

schnoog · schnoog · commit 0f00d1684793 · 2022-10-30T12:27:52.000+01:00
diff --git a/app/SETUP/005_UserTable_ForceLockout.sql b/app/SETUP/005_UserTable_ForceLockout.sql
@@ -0,0 +1 @@
+ALTER TABLE `users` ADD `force_logout` MEDIUMINT(7) NOT NULL DEFAULT '0' AFTER `last_login`;
diff --git a/app/pages/login.php b/app/pages/login.php
@@ -44,7 +44,8 @@
 
 if ($_POST['action'] == "logout") {
     if ($auth->isLoggedIn()) {
-        $auth->logOutAndDestroySession();
+        $auth->logOut();
+        $auth->destroySession();
     }
     forwartTo();
 }
diff --git a/app/templates/navigation.tpl b/app/templates/navigation.tpl
@@ -75,9 +75,9 @@
             								 </form>
             							</div>
             							<div class="bottom text-center">
-                                        {if $navdata.showreg == true}
+                                        {if isset($navdata.showreg)}{if $navdata.showreg == true}
             								{'New here ?'|gettext} <a href="{$navdata.login.registerlink}"><b>{'Join Us'|gettext}</b></a>
-                                        {/if}
+                                        {/if}{/if}
             							</div>
                     </div>
             </li>
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "require": {
 	        "smarty/smarty": "^4",
 			"sergeytsalkov/meekrodb": "^2.4",
-			"delight-im/auth": "^7.2",
+			"delight-im/auth": "*",
 			"phpmailer/phpmailer": "^6.0",
 			"voku/anti-xss": "^3.1",
 			"werx/validation": "^1.3",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ALTER TABLE `users` ADD `force_logout` MEDIUMINT(7) NOT NULL DEFAULT '0' AFTER `last_login`;
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@`
`44`	`44`
`45`	`45`	`if ($_POST['action'] == "logout") {`
`46`	`46`	`if ($auth->isLoggedIn()) {`
`47`		`- $auth->logOutAndDestroySession();`
	`47`	`+ $auth->logOut();`
	`48`	`+ $auth->destroySession();`
`48`	`49`	`}`
`49`	`50`	`forwartTo();`
`50`	`51`	`}`