Deprecation-Fehler bei TOTP-Login behoben (9754787) - webinterface.git

Deprecation-Fehler bei TOTP-Login behoben

Bernd Wurst commited on 2023-11-27 17:11:23
Zeige 3 geänderte Dateien mit 20 Einfügungen und 12 Löschungen.

modules/email/vmailoverview.php b9831f6..a61b73c
session/start.php b27116d..9f715fd
themes/default/page-webmailtotp-login.tpl.php f163b47..f06ef4c

@@ -39,9 +39,15 @@ $content .= '<p>' . other_icon('go.png') . " Ablegen in Ihrer Mailbox</p>";
 if ($acc['autoresponder']) {
     $now = date('Y-m-d H:i:s');
     $valid_from = $acc['autoresponder']['valid_from'];
-    $valid_from_string = date('d.m.Y', strtotime($acc['autoresponder']['valid_from']));
+    $valid_from_string = '';
+    if ($valid_from) {
+        $valid_from_string = date('d.m.Y', strtotime($valid_from));
+    }
     $valid_until = $acc['autoresponder']['valid_until'];
-    $valid_until_string = date('d.m.Y', strtotime($acc['autoresponder']['valid_until']));
+    $valid_until_string = '';
+    if ($valid_until) {
+        $valid_until_string = date('d.m.Y', strtotime($valid_until));
+    }
     if ($valid_from == null) {
         // Autoresponder abgeschaltet
         //$content .= '<p>'.other_icon('go.png')." Es wird keine automatische Antwort versendet</p>";

session/start.php

Zeige Datei @ 9754787

@@ -43,7 +43,7 @@ if (have_module('webmailtotp') && isset($_POST['webinterface_totpcode']) && isse
     unset($_SESSION['totp_username']);
 }
 
-if (isset($_POST['webinterface_username']) && isset($_POST['webinterface_password'])) {
+if (isset($_POST['webinterface_username']) && $_POST['webinterface_username'] != '' && isset($_POST['webinterface_password']) && $_POST['webinterface_password'] != '') {
     check_input_types($_POST, ['webinterface_username' => 'string', 'webinterface_password' => 'string']);
     $role = find_role($_POST['webinterface_username'], $_POST['webinterface_password']);
     if ($role === null) {

themes/default/page-webmailtotp-login.tpl.php

Zeige Datei @ 9754787

@@ -10,13 +10,12 @@ This code is published under a 0BSD license.
 
 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.
 */
-?><?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
+?><!DOCTYPE html>
+<html lang="de">
 <head>
 
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
 <?php
 if ($title) {
     echo "<title>$title - Administration</title>";
@@ -32,13 +31,16 @@ if ($title) {
 <body onload="javascript:document.getElementById('code').focus();">
 <div><a href="#content" style="display: none;">Zum Inhalt</a></div>
 
-<div class="menu">
-<a href="<?php echo $BASE_PATH; ?>"><img src="<?php echo $THEME_PATH; ?>images/schokokeks.png" width="190" height="141" alt="schokokeks.org Hosting" /></a>
+<a href="javascript:void(0);" class="menuicon" id="showmenu" onclick="showMenu()"><img src="<?php echo $THEME_PATH; ?>images/bars.svg" alt=""><span id="showmenutext">Menü</span></a>
+<a href="<?php echo $BASE_PATH; ?>" class="logo"><img src="<?php echo $THEME_PATH; ?>images/schokokeks.png" width="190" height="141" alt="schokokeks.org Hosting" /></a>
+<div class="sidebar" id="sidebar">
 
+<div class="menu">
 <?php echo $menu; ?>
-
+</div>
+<div class="userinfo">
 <?php echo $userinfo; ?>
-
+</div>
 </div>
 
 <div class="content">


...	...	@@ -43,7 +43,7 @@ if (have_module('webmailtotp') && isset($_POST['webinterface_totpcode']) && isse
43	43	unset($_SESSION['totp_username']);
44	44	}
45	45
46		-if (isset($_POST['webinterface_username']) && isset($_POST['webinterface_password'])) {
	46	+if (isset($_POST['webinterface_username']) && $_POST['webinterface_username'] != '' && isset($_POST['webinterface_password']) && $_POST['webinterface_password'] != '') {
47	47	check_input_types($_POST, ['webinterface_username' => 'string', 'webinterface_password' => 'string']);
48	48	$role = find_role($_POST['webinterface_username'], $_POST['webinterface_password']);
49	49	if ($role === null) {

...	...	@@ -39,9 +39,15 @@ $content .= '<p>' . other_icon('go.png') . " Ablegen in Ihrer Mailbox</p>";
39	39	if ($acc['autoresponder']) {
40	40	$now = date('Y-m-d H:i:s');
41	41	$valid_from = $acc['autoresponder']['valid_from'];
42		- $valid_from_string = date('d.m.Y', strtotime($acc['autoresponder']['valid_from']));
	42	+ $valid_from_string = '';
	43	+ if ($valid_from) {
	44	+ $valid_from_string = date('d.m.Y', strtotime($valid_from));
	45	+ }
43	46	$valid_until = $acc['autoresponder']['valid_until'];
44		- $valid_until_string = date('d.m.Y', strtotime($acc['autoresponder']['valid_until']));
	47	+ $valid_until_string = '';
	48	+ if ($valid_until) {
	49	+ $valid_until_string = date('d.m.Y', strtotime($valid_until));
	50	+ }
45	51	if ($valid_from == null) {
46	52	// Autoresponder abgeschaltet
47	53	//$content .= '<p>'.other_icon('go.png')." Es wird keine automatische Antwort versendet</p>";

...	...	@@ -10,13 +10,12 @@ This code is published under a 0BSD license.
10	10
11	11	Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.
12	12	*/
13		-?><?xml version="1.0" encoding="utf-8"?>
14		-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
15		- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
16		-
17		-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de">
	13	+?><!DOCTYPE html>
	14	+<html lang="de">
18	15	<head>
19	16
	17	+<meta name="viewport" content="width=device-width, initial-scale=1.0">
	18	+
20	19	<?php
21	20	if ($title) {
22	21	echo "<title>$title - Administration</title>";
...	...	@@ -32,13 +31,16 @@ if ($title) {
32	31	<body onload="javascript:document.getElementById('code').focus();">
33	32	<div><a href="#content" style="display: none;">Zum Inhalt</a></div>
34	33
35		-<div class="menu">
36		-<a href="<?php echo $BASE_PATH; ?>"><img src="<?php echo $THEME_PATH; ?>images/schokokeks.png" width="190" height="141" alt="schokokeks.org Hosting" /></a>
	34	+<a href="javascript:void(0);" class="menuicon" id="showmenu" onclick="showMenu()"><img src="<?php echo $THEME_PATH; ?>images/bars.svg" alt=""><span id="showmenutext">Menü</span></a>
	35	+<a href="<?php echo $BASE_PATH; ?>" class="logo"><img src="<?php echo $THEME_PATH; ?>images/schokokeks.png" width="190" height="141" alt="schokokeks.org Hosting" /></a>
	36	+<div class="sidebar" id="sidebar">
37	37
	38	+<div class="menu">
38	39	<?php echo $menu; ?>
39		-
	40	+</div>
	41	+<div class="userinfo">
40	42	<?php echo $userinfo; ?>
41		-
	43	+</div>
42	44	</div>
43	45
44	46	<div class="content">
45	47